package network::network; # $Id$wir

#-######################################################################################
#- misc imports
#-######################################################################################

use strict;

use Socket;
use common;
use detect_devices;
use run_program;
use network::tools;
use any;
use vars qw(@ISA @EXPORT);
use log;

@ISA = qw(Exporter);
@EXPORT = qw(add2hosts addDefaultRoute configureNetwork2 dns dnsServers findIntf gateway guessHostname is_ip is_ip_forbidden masked_ip netmask read_all_conf read_conf read_interface_conf read_resolv_conf resolv sethostname write_conf write_resolv_conf);

#-######################################################################################
#- Functions
#-######################################################################################
sub read_conf {
    my ($file) = @_;
    +{ getVarsFromSh($file) };
}

sub read_resolv_conf_raw {
    my ($file) = @_;
    $file ||= "$::prefix/etc/resolv.conf";
    { nameserver => [ cat_($file) =~ /^\s*nameserver\s+(\S+)/mg ],
      search => [ if_(cat_($file) =~ /^\s*search\s+(.*)/m, split(' ', $1)) ] };
}

sub read_resolv_conf {
    my ($file) = @_;
    my $resolv_conf = read_resolv_conf_raw($file);
    +{
      (mapn { $_[0] => $_[1] } [ qw(dnsServer dnsServer2 dnsServer3) ], $resolv_conf->{nameserver}),
      (mapn { $_[0] => $_[1] } [ qw(DOMAINNAME DOMAINNAME2 DOMAINNAME3) ], $resolv_conf->{search}),
     };
}

sub read_interface_conf {
    my ($file) = @_;
    my %intf = getVarsFromSh($file);

    $intf{BOOTPROTO} ||= 'static';
    $intf{isPtp} = $intf{NETWORK} eq '255.255.255.255';
    $intf{isUp} = 1;
    \%intf;
}

sub read_dhcpd_conf {
    my ($file) = @_;
    $file ||= "$::prefix/etc/dhcpd.conf";
    { option_routers => [ cat_($file) =~ /^\s*option routers\s+(\S+);/mg ],
      subnet_mask => [ if_(cat_($file) =~ /^\s*option subnet-mask\s+(.*);/mg, split(' ', $1)) ],
      domain_name => [ if_(cat_($file) =~ /^\s*option domain-name\s+"(.*)";/mg, split(' ', $1)) ],
      domain_name_servers => [ if_(cat_($file) =~ /^\s*option domain-name-servers\s+(.*);/m, split(' ', $1)) ],
      dynamic_bootp => [ if_(cat_($file) =~ /^\s*range dynamic-bootp\s+\S+\.(\d+)\s+\S+\.(\d+)\s*;/m, split(' ', $1)) ],
      default_lease_time => [ if_(cat_($file) =~ /^\s*default-lease-time\s+(.*);/m, split(' ', $1)) ],
      max_lease_time => [ if_(cat_($file) =~ /^\s*max-lease-time\s+(.*);/m, split(' ', $1)) ] };
}

sub read_squid_conf {
    my ($file) = @_;
    $file ||= "$::prefix/etc/squid/squid.conf";
    { http_port => [ cat_($file) =~ /^\s*http_port\s+(.*)/mg ],
      cache_size => [ if_(cat_($file) =~ /^\s*cache_dir diskd\s+(.*)/mg, split(' ', $1)) ],
      admin_mail => [ if_(cat_($file) =~ /^\s*err_html_text\s+(.*)/mg, split(' ', $1)) ] };
}

sub read_tmdns_conf {
    my ($file) = @_;
    local *F; open F, $file or die "cannot open file $file: $!";
    local $_;
    my %outf;

    while (<F>) {
	($outf{ZEROCONF_HOSTNAME}) = /^\s*hostname\s*=\s*(\w+)/ and return \%outf;
    }
    
    \%outf;
}

sub write_conf {
    my ($file, $netc) = @_;

    if ($netc->{HOSTNAME} && $netc->{HOSTNAME} =~ /\.(.+)$/) {
	$netc->{DOMAINNAME} = $1;
    }
    $netc->{NETWORKING} = 'yes';

    setVarsInSh($file, $netc, qw(HOSTNAME NETWORKING GATEWAY GATEWAYDEV NISDOMAIN));
}

sub write_zeroconf {
    my ($file, $zhostname) = @_;
    eval { substInFile { s/^\s*(hostname)\s*=.*/$1 = $zhostname/ } $file };
}

sub write_resolv_conf {
    my ($file, $netc) = @_;

    my %new = (
        search => [ grep { $_ } uniq(@$netc{'DOMAINNAME', 'DOMAINNAME2', 'DOMAINNAME3'}) ],
        nameserver => [ grep { $_ } uniq(@$netc{'dnsServer', 'dnsServer2', 'dnsServer3'}) ],
    );

    my (%prev, @unknown);
    foreach (cat_($file)) {
	s/\s+$//;
	s/^[#\s]*//;

	if (my ($key, $val) = /^(search|nameserver)\s+(.*)$/) {
	    push @{$prev{$key}}, $val;
	} elsif (/^ppp temp entry$/) {
	} elsif (/\S/) {
	    push @unknown, $_;
	}
    }
    unlink $file;  #- workaround situation when /etc/resolv.conf is an absolute link to /etc/ppp/resolv.conf or whatever

    if (@{$new{search}} || @{$new{nameserver}}) {
	$prev{$_} = [ difference2($prev{$_} || [], $new{$_}) ] foreach keys %new;

	my @search = do {
	    my @new = if_(@{$new{search}}, "search " . join(' ', @{$new{search}}) . "\n");
	    my @old = if_(@{$prev{search}}, "# search " . join(' ', @{$prev{search}}) . "\n");
	    @new, @old;
	};
	my @nameserver = do {
	    my @new = map { "nameserver $_\n" } @{$new{nameserver}};
	    my @old = map { "# nameserver $_\n" } @{$prev{nameserver}};
	    @new, @old;
	};
	output_with_perm($file, 0644, @search, @nameserver, (map { "# $_\n" } @unknown), "\n# ppp temp entry\n");

	#-res_init();		# reinit the resolver so DNS changes take affect
	1;
    } else {
	log::explanations("neither domain name nor dns server are configured");
	0;
    }
}

sub write_interface_conf {
    my ($file, $intf, $_netc, $_prefix) = @_;

    if ($intf->{HWADDR} && -e "$::prefix/sbin/ip") {
	$intf->{HWADDR} = undef;
	if (my $s = `LC_ALL= LANG= $::prefix/sbin/ip -o link show $intf->{DEVICE} 2>/dev/null`) {
	    if ($s =~ m|.*link/ether\s([0-9a-z:]+)\s|) {
		$intf->{HWADDR} = $1;
	    }
	}
    }
    my @ip = split '\.', $intf->{IPADDR};
    my @mask = split '\.', $intf->{NETMASK};

    add2hash($intf, {
		     BROADCAST => join('.', mapn { int($_[0]) | ((~int($_[1])) & 255) } \@ip, \@mask),
		     NETWORK   => join('.', mapn { int($_[0]) &        $_[1]          } \@ip, \@mask),
		     ONBOOT => bool2yesno(!member($intf->{DEVICE}, map { $_->{device} } detect_devices::pcmcia_probe())),
		    });

    $intf->{BOOTPROTO} =~ s/dhcp.*/dhcp/;

    setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST ONBOOT HWADDR MII_NOT_SUPPORTED), 
                qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV),
                if_($intf->{BOOTPROTO} eq "dhcp", qw(DHCP_HOSTNAME NEEDHOSTNAME))
               );
    log::explanations("written $intf->{DEVICE} interface configuration in $file");
}

sub add2hosts {
    my ($file, $hostname, @ips) = @_;

    my %l = map { if_(/\s*(\S+)(.*)/, $1 => $2) }
            grep { !/\s+\Q$hostname\E\s*$/ } cat_($file);

    my $sub_hostname = $hostname =~ /(.*?)\./ ? " $1" : '';
    $l{$_} = "\t\t$hostname$sub_hostname" foreach grep { $_ } @ips;

    log::explanations("writing host information to $file");
    output($file, map { "$_$l{$_}\n" } keys %l);
}

# The interface/gateway needs to be configured before this will work!
sub guessHostname {
    my ($_prefix, $netc, $intf) = @_;

    $intf->{isUp} && dnsServers($netc) or return 0;
    $netc->{HOSTNAME} && $netc->{DOMAINNAME} and return 1;

    write_resolv_conf("$::prefix/etc/resolv.conf", $netc);

    my $name = gethostbyaddr(Socket::inet_aton($intf->{IPADDR}), Socket::AF_INET()) or log::explanations("reverse name lookup failed"), return 0;

    log::explanations("reverse name lookup worked");

    add2hash($netc, { HOSTNAME => $name });
    1;
}

sub addDefaultRoute {
    my ($netc) = @_;
    c::addDefaultRoute($netc->{GATEWAY}) if $netc->{GATEWAY};
}

sub sethostname {
    my ($netc) = @_;
    my $text;
    syscall_("sethostname", $netc->{HOSTNAME}, length $netc->{HOSTNAME}) ? ($text="set sethostname to $netc->{HOSTNAME}") : ($text="sethostname failed: $!");
    log::explanations($text);
}

sub resolv($) {
    my ($name) = @_;
    is_ip($name) and return $name;
    my $a = join(".", unpack "C4", (gethostbyname $name)[4]);
    #-log::explanations("resolved $name in $a");
    $a;
}

sub dnsServers {
    my ($netc) = @_;
    my %used_dns; @used_dns{$netc->{dnsServer}, $netc->{dnsServer2}, $netc->{dnsServer3}} = (1, 2, 3);
    sort { $used_dns{$a} <=> $used_dns{$b} } grep { $_ } keys %used_dns;
}

sub findIntf {
    my ($intf, $device) = @_;
    $intf->{$device}{DEVICE} = $device;
    $intf->{$device};
}

my $ip_regexp = qr/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/;

sub is_ip {
    my ($ip) = @_;
    my @fields = $ip =~ $ip_regexp or return;
    every { 0 <= $_ && $_ <= 255 } @fields or return;
    @fields;
}

sub ip_compare {
    my ($ip1, $ip2) = @_;
    my (@ip1_fields) = $ip1 =~ $ip_regexp;
    my (@ip2_fields) = $ip2 =~ $ip_regexp;
    
    every { $ip1_fields[$_] eq $ip2_fields[$_] } (0 .. 3);
}

sub is_ip_forbidden {
    my ($ip) = @_;
    my @forbidden = ('127.0.0.1', '255.255.255.255');
    
    any { ip_compare($ip, $_) } @forbidden;
}

sub is_domain_name {
    my ($name) = @_;
    my @fields = split /\./, $name;
    $name !~ /\.$/ && @fields > 0 && @fields == grep { /^[[:alnum:]](?:[\-[:alnum:]]{0,61}[[:alnum:]])?$/ } @fields;
}

sub netmask {
    my ($ip) = @_;
    return "255.255.255.0" unless is_ip($ip);
    $ip =~ $ip_regexp or warn "IP_regexp failed\n" and return "255.255.255.0";
    if ($1 >= 1 && $1 < 127) {
	"255.0.0.0";    #-1.0.0.0 to 127.0.0.0
    } elsif ($1  >= 128 && $1 <= 191) {
	"255.255.0.0";  #-128.0.0.0 to 191.255.0.0
    } elsif ($1 >= 192 && $1 <= 223) {
	"255.255.255.0";
    } else {
	"255.255.255.255"; #-experimental classes
    }
}

sub masked_ip {
    my ($ip) = @_;
    my @ip = is_ip($ip) or return '';
    my @mask = netmask($ip) =~ $ip_regexp;
    for (my $i = 0; $i < @ip; $i++) {
	$ip[$i] &= int $mask[$i];
    }
    join(".", @ip);
}

sub dns {
    my ($ip) = @_;
    my @masked = masked_ip($ip) =~ $ip_regexp;
    $masked[3]  = 2;
    join(".", @masked);

}

sub gateway {
    my ($ip) = @_;
    my @masked = masked_ip($ip) =~ $ip_regexp;
    $masked[3]  = 1;
    join(".", @masked);
}

sub miscellaneous_choose {
    my ($in, $u) = @_;

    $in->ask_from('',
       N("Proxies configuration"),
       [ { label => N("HTTP proxy"), val => \$u->{http_proxy} },
         { label => N("FTP proxy"),  val => \$u->{ftp_proxy} },
       ],
       complete => sub {
	   $u->{http_proxy} =~ m,^($|http://), or $in->ask_warn('', N("Proxy should be http://...")), return 1,0;
	   $u->{ftp_proxy} =~ m,^($|ftp://|http://), or $in->ask_warn('', N("URL should begin with 'ftp:' or 'http:'")), return 1,1;
	   0;
       }
    ) or return;
    1;
}

sub proxy_configure {
    my ($u) = @_;
    setExportedVarsInSh("$::prefix/etc/profile.d/proxy.sh",  $u, qw(http_proxy ftp_proxy));
    chmod 0755, "$::prefix/etc/profile.d/proxy.sh";
    setExportedVarsInCsh("$::prefix/etc/profile.d/proxy.csh", $u, qw(http_proxy ftp_proxy));
    chmod 0755, "$::prefix/etc/profile.d/proxy.csh";
}

sub read_all_conf {
    my ($_prefix, $netc, $intf, $o_netcnx) = @_;
    $netc ||= {}; $intf ||= {};
    my $netcnx = $o_netcnx || {};
    add2hash($netc, read_conf("$::prefix/etc/sysconfig/network")) if -r "$::prefix/etc/sysconfig/network";
    add2hash($netc, read_resolv_conf());
    add2hash($netc, read_tmdns_conf("$::prefix/etc/tmdns.conf")) if -r "$::prefix/etc/tmdns.conf";
    foreach (all("$::prefix/etc/sysconfig/network-scripts")) {
	if (/^ifcfg-(\w+)$/ && $1 ne 'lo') {
	    my $intf = findIntf($intf, $1);
	    add2hash($intf, { getVarsFromSh("$::prefix/etc/sysconfig/network-scripts/$_") });
	}
    }
    $netcnx->{type} or probe_netcnx_type($::prefix, $netc, $intf, $netcnx);
}

sub probe_netcnx_type {
    my ($_prefix, $_netc, $intf, $netcnx) = @_;
    #- try to probe $netcnx->{type} which is used almost everywhere.
    unless ($netcnx->{type}) {
	#- ugly hack to determine network type (avoid saying not configured in summary).
	-e "$::prefix/etc/ppp/peers/adsl" and $netcnx->{type} ||= 'adsl'; # enough ?
	-e "$::prefix/etc/ppp/ioptions1B" || -e "$::prefix/etc/ppp/ioptions2B" and $netcnx->{type} ||= 'isdn'; # enough ?
	$intf->{ppp0} and $netcnx->{type} ||= 'modem';
	$intf->{eth0} and $netcnx->{type} ||= 'lan';
    }
}

sub easy_dhcp {
    my ($netc, $intf) = @_;

    return if text2bool($netc->{NETWORKING});

    require modules;
    require network::ethernet;
    modules::load_category('network/main|gigabit|usb');
    my @all_cards = network::ethernet::conf_network_card_backend();

    #- only for a single network card
    (any { $_->[0] eq 'eth0' } @all_cards) && (every { $_->[0] ne 'eth1' } @all_cards) or return;

    log::explanations("easy_dhcp: found eth0");

    network::ethernet::conf_network_card_backend($netc, $intf, 'dhcp', 'eth0');

    put_in_hash($netc, { 
			NETWORKING => "yes",
			DHCP => "yes",
		       });
    1;
}

#- configureNetwork2 : configure the network interfaces.
#- input
#-  $prefix
#-  $netc
#-  $intf
#- $netc input
#-  NETWORKING : networking flag : string : "yes" by default
#-  FORWARD_IPV4 : forward IP flag : string : "false" by default
#-  HOSTNAME : hostname : string : "localhost.localdomain" by default
#-  DOMAINNAME : domainname : string : $netc->{HOSTNAME} =~ /\.(.*)/ by default
#-  DOMAINNAME2 : well it's another domainname : have to look further why we used 2
#-  The following are facultatives
#-  DHCP_HOSTNAME : If you have a dhcp and want to set the hostname
#-  GATEWAY : gateway
#-  GATEWAYDEV : gateway interface
#-  NISDOMAIN : nis domain
#-  $netc->{dnsServer} : dns server 1
#-  $netc->{dnsServer2} : dns server 2
#-  $netc->{dnsServer3} : dns server 3 : note that we uses the dns1 for the LAN, and the 2 others for the internet conx
#- $intf input: for each $device (for example ethx)
#-  $intf->{$device}{IPADDR} : IP address
#-  $intf->{$device}{NETMASK} : netmask
#-  $intf->{$device}{DEVICE} : DEVICE = $device
#-  $intf->{$device}{BOOTPROTO} : boot prototype : "bootp" or "dhcp" or "pump" or ...
sub configureNetwork2 {
    my ($in, $_prefix, $netc, $intf) = @_;
    my $etc = "$::prefix/etc";
    if (!$::testing) {
        $netc->{wireless_eth} and $in->do_pkgs->ensure_is_installed('wireless-tools', '/sbin/iwconfig', 'auto');
        write_conf("$etc/sysconfig/network", $netc);
        write_resolv_conf("$etc/resolv.conf", $netc) if ! $netc->{DHCP};
        write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_, $netc, $::prefix) foreach grep { $_->{DEVICE} ne 'ppp0' } values %$intf;
        add2hosts("$etc/hosts", $netc->{HOSTNAME}, map { $_->{IPADDR} } values %$intf) if $netc->{HOSTNAME} && !$netc->{DHCP};
        add2hosts("$etc/hosts", "localhost", "127.0.0.1");
        
        any { $_->{BOOTPROTO} eq "dhcp" } values %$intf and $in->do_pkgs->install($netc->{dhcp_client} || 'dhcp-client');
        if ($netc->{ZEROCONF_HOSTNAME}) {
            $in->do_pkgs->ensure_is_installed('tmdns', '/sbin/tmdns', 'auto') if !$in->do_pkgs->is_installed('bind');
            $in->do_pkgs->ensure_is_installed('zcip', '/sbin/zcip', 'auto');
            write_zeroconf("$etc/tmdns.conf", $netc->{ZEROCONF_HOSTNAME}); 
        } else { run_program::rooted($::prefix, "chkconfig", "--del", $_) foreach qw(tmdns zcip) }  # disable zeroconf
        any { $_->{BOOTPROTO} =~ /^(pump|bootp)$/ } values %$intf and $in->do_pkgs->install('pump');
    }
}

1;
0&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/cs.po</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.3%;'/><td class='rem' style='width: 34.3%;'/><td class='none' style='width: 31.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/cy.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/cy.po</a></td><td class='right'>492</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 35.0%;'/><td class='rem' style='width: 35.0%;'/><td class='none' style='width: 29.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/da.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/da.po</a></td><td class='right'>690</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 49.1%;'/><td class='rem' style='width: 49.1%;'/><td class='none' style='width: 1.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/de.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/de.po</a></td><td class='right'>496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 35.3%;'/><td class='rem' style='width: 35.3%;'/><td class='none' style='width: 29.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/el.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/el.po</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.4%;'/><td class='rem' style='width: 21.4%;'/><td class='none' style='width: 57.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/eo.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/eo.po</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.5%;'/><td class='rem' style='width: 19.5%;'/><td class='none' style='width: 61.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/es.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/es.po</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 35.8%;'/><td class='rem' style='width: 35.8%;'/><td class='none' style='width: 28.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/et.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/et.po</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.8%;'/><td class='rem' style='width: 34.8%;'/><td class='none' style='width: 30.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/eu.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/eu.po</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.6%;'/><td class='rem' style='width: 34.6%;'/><td class='none' style='width: 30.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/fa.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/fa.po</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.7%;'/><td class='rem' style='width: 19.7%;'/><td class='none' style='width: 60.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/fi.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/fi.po</a></td><td class='right'>624</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 44.4%;'/><td class='rem' style='width: 44.4%;'/><td class='none' style='width: 11.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/fr.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/fr.po</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 36.3%;'/><td class='rem' style='width: 36.3%;'/><td class='none' style='width: 27.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/fur.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/fur.po</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.2%;'/><td class='rem' style='width: 19.2%;'/><td class='none' style='width: 61.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/ga.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ga.po</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.4%;'/><td class='rem' style='width: 18.4%;'/><td class='none' style='width: 63.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/gl.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/gl.po</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 28.2%;'/><td class='rem' style='width: 28.2%;'/><td class='none' style='width: 43.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/he.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/he.po</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.8%;'/><td class='rem' style='width: 19.8%;'/><td class='none' style='width: 60.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/help-de.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/help-de.pot</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 85.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/help-es.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/help-es.pot</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 7.4%;'/><td class='none' style='width: 85.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/help-fr.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/help-fr.pot</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 86.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/help-it.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/help-it.pot</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 85.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/help-ru.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/help-ru.pot</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 86.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/help-zh_CN.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/help-zh_CN.pot</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/hi.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/hi.po</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.2%;'/><td class='rem' style='width: 22.2%;'/><td class='none' style='width: 55.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/hr.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/hr.po</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.8%;'/><td class='rem' style='width: 24.8%;'/><td class='none' style='width: 50.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/hu.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/hu.po</a></td><td class='right'>540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 38.5%;'/><td class='rem' style='width: 38.5%;'/><td class='none' style='width: 23.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/id.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/id.po</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.8%;'/><td class='rem' style='width: 34.8%;'/><td class='none' style='width: 30.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/is.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/is.po</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.4%;'/><td class='rem' style='width: 23.4%;'/><td class='none' style='width: 53.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/it.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/it.po</a></td><td class='right'>494</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 35.2%;'/><td class='rem' style='width: 35.2%;'/><td class='none' style='width: 29.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/ja.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ja.po</a></td><td class='right'>480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.2%;'/><td class='rem' style='width: 34.2%;'/><td class='none' style='width: 31.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/ko.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ko.po</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.8%;'/><td class='rem' style='width: 17.8%;'/><td class='none' style='width: 64.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/ky.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ky.po</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.8%;'/><td class='rem' style='width: 21.8%;'/><td class='none' style='width: 56.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/lt.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/lt.po</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.4%;'/><td class='rem' style='width: 19.4%;'/><td class='none' style='width: 61.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/ltg.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ltg.po</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.1%;'/><td class='rem' style='width: 24.1%;'/><td class='none' style='width: 51.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/lv.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/lv.po</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.8%;'/><td class='rem' style='width: 22.8%;'/><td class='none' style='width: 54.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/mk.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/mk.po</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.2%;'/><td class='rem' style='width: 22.2%;'/><td class='none' style='width: 55.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/mn.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/mn.po</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.7%;'/><td class='rem' style='width: 17.7%;'/><td class='none' style='width: 64.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/ms.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ms.po</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.2%;'/><td class='rem' style='width: 19.2%;'/><td class='none' style='width: 61.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/mt.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/mt.po</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 32.1%;'/><td class='rem' style='width: 32.1%;'/><td class='none' style='width: 35.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/nb.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/nb.po</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.9%;'/><td class='rem' style='width: 34.9%;'/><td class='none' style='width: 30.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/nl.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/nl.po</a></td><td class='right'>702</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 50.0%;'/><td class='rem' style='width: 50.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/nn.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/nn.po</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.5%;'/><td class='rem' style='width: 17.5%;'/><td class='none' style='width: 65.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/pa_IN.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/pa_IN.po</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.9%;'/><td class='rem' style='width: 17.9%;'/><td class='none' style='width: 64.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/pl.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/pl.po</a></td><td class='right'>494</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 35.2%;'/><td class='rem' style='width: 35.2%;'/><td class='none' style='width: 29.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/pt.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/pt.po</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.9%;'/><td class='rem' style='width: 34.9%;'/><td class='none' style='width: 30.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/pt_BR.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/pt_BR.po</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 35.9%;'/><td class='rem' style='width: 35.9%;'/><td class='none' style='width: 28.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/ro.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ro.po</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.5%;'/><td class='rem' style='width: 22.5%;'/><td class='none' style='width: 55.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/ru.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ru.po</a></td><td class='right'>496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 35.3%;'/><td class='rem' style='width: 35.3%;'/><td class='none' style='width: 29.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/sc.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sc.po</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.8%;'/><td class='rem' style='width: 18.8%;'/><td class='none' style='width: 62.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/sk.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sk.po</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 33.3%;'/><td class='rem' style='width: 33.3%;'/><td class='none' style='width: 33.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/sl.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sl.po</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 33.2%;'/><td class='rem' style='width: 33.2%;'/><td class='none' style='width: 33.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/sq.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sq.po</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.4%;'/><td class='rem' style='width: 25.4%;'/><td class='none' style='width: 49.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/sr.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sr.po</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.5%;'/><td class='rem' style='width: 25.5%;'/><td class='none' style='width: 49.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/sr@Latn.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sr@Latn.po</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.4%;'/><td class='rem' style='width: 25.4%;'/><td class='none' style='width: 49.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/sv.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sv.po</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.9%;'/><td class='rem' style='width: 34.9%;'/><td class='none' style='width: 30.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/ta.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ta.po</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.7%;'/><td class='rem' style='width: 21.7%;'/><td class='none' style='width: 56.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/tg.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/tg.po</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 39.5%;'/><td class='rem' style='width: 39.5%;'/><td class='none' style='width: 21.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/th.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/th.po</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.2%;'/><td class='rem' style='width: 20.2%;'/><td class='none' style='width: 59.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/tl.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/tl.po</a></td><td class='right'>614</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 43.7%;'/><td class='rem' style='width: 43.7%;'/><td class='none' style='width: 12.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/tr.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/tr.po</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.6%;'/><td class='rem' style='width: 26.6%;'/><td class='none' style='width: 46.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/uk.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/uk.po</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.9%;'/><td class='rem' style='width: 24.9%;'/><td class='none' style='width: 50.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/uz.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/uz.po</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.5%;'/><td class='rem' style='width: 23.5%;'/><td class='none' style='width: 53.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/uz@Latn.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/uz@Latn.po</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.5%;'/><td class='rem' style='width: 23.5%;'/><td class='none' style='width: 53.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/vi.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/vi.po</a></td><td class='right'>476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 33.9%;'/><td class='rem' style='width: 33.9%;'/><td class='none' style='width: 32.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/wa.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/wa.po</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 32.8%;'/><td class='rem' style='width: 32.8%;'/><td class='none' style='width: 34.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/zh_CN.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/zh_CN.po</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.9%;'/><td class='rem' style='width: 34.9%;'/><td class='none' style='width: 30.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx/diff/perl-install/share/po/zh_TW.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/zh_TW.po</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.9%;'/><td class='rem' style='width: 23.9%;'/><td class='none' style='width: 52.1%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>77 files changed, 14452 insertions, 14452 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot<br/>index 8baa1f292..cc164c9c8 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/DrakX.pot?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/DrakX.pot</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/DrakX.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/DrakX.pot</a></div><div class='hunk'>@@ -57,7 +57,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -76,7 +76,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +84,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -92,7 +92,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +158,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1088,7 +1088,7 @@ msgstr ""</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3252,7 +3252,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3354,7 +3354,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3365,11 +3365,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3475,10 +3475,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='ctx'> "the listed services and they will be started automatically at boot time. !!\n"</div><div class='hunk'>@@ -3583,7 +3583,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -3681,12 +3681,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -3713,7 +3713,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -3722,7 +3722,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -3849,7 +3849,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -3863,7 +3863,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -3891,7 +3891,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -3907,7 +3907,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -3993,7 +3993,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4037,7 +4037,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4046,13 +4046,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4093,7 +4093,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4248,7 +4248,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4269,7 +4269,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4368,7 +4368,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4385,7 +4385,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4446,7 +4446,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4743,7 +4743,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_interactive.pm:163</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrakelinux installation."</div><div class='add'>+msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrivalinux installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -4845,16 +4845,16 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='del'>-"The operating system and the different components available in the Mandrakelinux distribution \n"</div><div class='add'>+"The operating system and the different components available in the Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this License. \n"</div><div class='ctx'> "If you disagree with any portion of the License, you are not allowed to install, duplicate or use \n"</div><div class='hunk'>@@ -4869,21 +4869,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,\n"</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without limitation damages for loss of \n"</div><div class='ctx'> "business, interruption of business, financial loss, legal fees and penalties resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or occurrence of such \n"</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, in no circumstances, be \n"</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever (including without \n"</div><div class='ctx'> "limitation damages for loss of business, interruption of business, financial loss, legal fees \n"</div><div class='ctx'> "and penalties resulting from a court judgment, or any other consequential loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some countries by local laws.\n"</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong cryptography components \n"</div><div class='ctx'> "included in the Software Products.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4895,9 +4895,9 @@ msgid ""</div><div class='ctx'> "Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use, \n"</div><div class='ctx'> "duplicate, adapt or redistribute the components which they cover. Please read carefully the terms \n"</div><div class='ctx'> "and conditions of the license agreement for each component before using any component. Any question \n"</div><div class='del'>-"on a component license should be addressed to the component author and not to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the documentation for \n"</div><div class='add'>+"on a component license should be addressed to the component author and not to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. Documentation written \n"</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4905,9 +4905,9 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "All rights to the components of the Software Products belong to their respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n"</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -4918,7 +4918,7 @@ msgid ""</div><div class='ctx'> "The terms and conditions of this License are governed by the Laws of France.\n"</div><div class='ctx'> "All disputes on the terms of this license will preferably be settled out of court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4974,7 +4974,7 @@ msgid ""</div><div class='ctx'> "Remove the boot media and press return to reboot.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"For information on fixes which are available for this release of Mandrakelinux,\n"</div><div class='add'>+"For information on fixes which are available for this release of Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4982,7 +4982,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5016,7 +5016,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For this,\n"</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5500,7 +5500,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+msgid "Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -5692,7 +5692,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -8236,7 +8236,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -11471,7 +11471,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share your scanner on the network.\n"</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> ""</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13035,22 +13035,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even think of."</div><div class='add'>+msgid "Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even think of."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='add'>+msgid "Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -13065,7 +13065,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux is committed to the open source model. This means that this new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux contributors."</div><div class='add'>+msgid "Mandrivalinux is committed to the open source model. This means that this new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='hunk'>@@ -13080,7 +13080,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Most of the software included in the distribution and all of the Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+msgid "Most of the software included in the distribution and all of the Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -13100,7 +13100,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and developers. The role of such a community is very wide, ranging from bug reporting to the development of new applications. The community plays a &lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+msgid "Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and developers. The role of such a community is very wide, ranging from bug reporting to the development of new applications. The community plays a &lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -13115,7 +13115,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -13135,7 +13135,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:23</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other Mandrakesoft products either."</div><div class='add'>+msgid "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -13145,7 +13145,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -13160,12 +13160,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular to the most advanced."</div><div class='add'>+msgid "PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:13</div><div class='hunk'>@@ -13175,7 +13175,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -13185,17 +13185,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; products."</div><div class='add'>+msgid "&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -13215,52 +13215,52 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making the most of your 64-bit processor."</div><div class='add'>+msgid "\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft has developed two products that allow you to use Mandrakelinux &lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='add'>+msgid "Mandriva has developed two products that allow you to use Mandrivalinux &lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a bootable CD-ROM."</div><div class='add'>+msgid "\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."</div><div class='add'>+msgid "\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional needs&lt;/b&gt;:"</div><div class='add'>+msgid "Below are the Mandriva products designed to meet the &lt;b&gt;professional needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -13290,7 +13290,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+msgid "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -13305,7 +13305,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-b.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+msgid "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -13410,7 +13410,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for &lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='add'>+msgid "In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for &lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -13615,12 +13615,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of Mandrakelinux-specific utilities designed to simplify the configuration of your computer."</div><div class='add'>+msgid "The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of Mandrivalinux-specific utilities designed to simplify the configuration of your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -13635,7 +13635,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/26.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Like all computer programming, open source software &lt;b&gt;requires time and people&lt;/b&gt; for development. In order to respect the open source philosophy, Mandrakesoft sells added value products and services to &lt;b&gt;keep improving Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of our products or services!"</div><div class='add'>+msgid "Like all computer programming, open source software &lt;b&gt;requires time and people&lt;/b&gt; for development. In order to respect the open source philosophy, Mandriva sells added value products and services to &lt;b&gt;keep improving Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -13645,7 +13645,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "To learn more about Mandrakesoft products and services, you can visit our &lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='add'>+msgid "To learn more about Mandriva products and services, you can visit our &lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -13665,17 +13665,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux product.."</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+msgid "Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -13690,27 +13690,27 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+msgid "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to offer its customers!"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+msgid "Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -13730,27 +13730,27 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+msgid "\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on &lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='add'>+msgid "Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on &lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save a lot of time."</div><div class='add'>+msgid "Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "For any question related to Mandrakelinux, you have the possibility to purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='add'>+msgid "For any question related to Mandrivalinux, you have the possibility to purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -14030,7 +14030,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -14127,7 +14127,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -14171,7 +14171,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='del'>-"  --no-confirmation      do not ask first confirmation question in MandrakeUpdate mode\n"</div><div class='add'>+"  --no-confirmation      do not ask first confirmation question in Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='hunk'>@@ -16609,12 +16609,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -16634,7 +16634,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -16679,7 +16679,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -17072,14 +17072,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -17130,7 +17130,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -17413,7 +17413,7 @@ msgstr ""</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -17860,7 +17860,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='hunk'>@@ -17890,7 +17890,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -20833,7 +20833,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -21336,7 +21336,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='head'>diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po<br/>index a79cb4300..817826e30 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/af.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/af.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/af.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/af.po</a></div><div class='hunk'>@@ -66,7 +66,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dit blyk dat die USB-stafie lees alleen is, ons kan dit nie huidiglik met\n"</div><div class='ctx'> "veiligheid uitprop nie.\n"</div><div class='hunk'>@@ -74,7 +74,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Klik op die herlaai knoppie om die rekenaar te herlaai, prop dit uit,\n"</div><div class='ctx'> "verwyder die skryf-beskerming, prop dit weer in, en loods\n"</div><div class='del'>-"dan weer Mandrake Move."</div><div class='add'>+"dan weer Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -92,7 +92,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "U USB-stafie het nie enige geldige Windows (FAT) partisies nie.\n"</div><div class='hunk'>@@ -108,7 +108,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -116,11 +116,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ons kon nie enige USB-stafies opspoor nie. U het nou\n"</div><div class='del'>-"die geleentheid op een in te prop. Mandrake Move het die\n"</div><div class='add'>+"die geleentheid op een in te prop. Mandriva Move het die\n"</div><div class='ctx'> "vermoë op u data in u tuisgids, asook die konfigurasie van die\n"</div><div class='ctx'> "rekenaar daarop te stoor. Dis vind alles deursigtig plaas.\n"</div><div class='ctx'> "Aandag: Indien u nou 'n USB-stafie inprop, wag asseblief paar\n"</div><div class='hunk'>@@ -255,7 +255,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1303,7 +1303,7 @@ msgstr "selfdoen"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "U kan ander tale selekteer wat na installasie beskikbaar sal wees."</div><div class='hunk'>@@ -3707,12 +3707,12 @@ msgstr "laat radio ondersteuning toe"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Voordat u voortgaan, lees asb die lisensieterme noukeurig deur. Dit dek\n"</div><div class='del'>-"die hele Mandrakelinux distribusie. Indien u saamstem met al die\n"</div><div class='add'>+"die hele Mandrivalinux distribusie. Indien u saamstem met al die\n"</div><div class='ctx'> "voorwaardes daarin, merk die \"%s\" boksie. Indien nie, kan u op die\n"</div><div class='ctx'> "\"%s\" knoppie druk om teherlaai."</div><div class='ctx'> </div><div class='hunk'>@@ -3898,13 +3898,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Die Mandrakelinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"</div><div class='add'>+"Die Mandrivalinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"</div><div class='ctx'> "weet wanneer 'n gekose pakket op 'n ander CD-ROM is. DrakX sal in so\n"</div><div class='ctx'> "geval die huidige CD uitskop en aandui watter een benodig word."</div><div class='ctx'> </div><div class='hunk'>@@ -3912,11 +3912,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3968,12 +3968,12 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nou moet u spesifiseer watter programme u op die rekenaar wil\n"</div><div class='del'>-"installeer. Daar is duisende pakkette beskikbaar vir Mandrakelinux, en\n"</div><div class='add'>+"installeer. Daar is duisende pakkette beskikbaar vir Mandrivalinux, en\n"</div><div class='ctx'> "om alles meer eenvoudig te maak, is die pakkette gegroepeer onder\n"</div><div class='ctx'> "groepe van selfde tipe programme.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Die groepe is so saamgestel dat dit saamval met die tipe gebruik van u\n"</div><div class='del'>-"rekenaar. Mandrakelinux het vier vooraf gespesifseerde installasies\n"</div><div class='add'>+"rekenaar. Mandrivalinux het vier vooraf gespesifseerde installasies\n"</div><div class='ctx'> "beskikbaar. Dink aan hierdie tipes as houers met verskillende pakkette.\n"</div><div class='ctx'> "U kan wel uit die verskillende houers, verskillende pakkette kies.\n"</div><div class='ctx'> "Dus kan u \"Werkstasie\" ook programme uit die \"Ontwikkeling\"\n"</div><div class='hunk'>@@ -4066,10 +4066,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4099,7 +4099,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Indien u 'n diensprogram kies, of dit nou deel is van 'n groepe pakkette of\n"</div><div class='ctx'> "'n enkel een, sal u gevra word om die installasie daarvan te bevestig.\n"</div><div class='del'>-"Mandrakelinux sal by verstek alle bediener-programme afskop nadat u die\n"</div><div class='add'>+"Mandrivalinux sal by verstek alle bediener-programme afskop nadat u die\n"</div><div class='ctx'> "rekenaar aangeskakel het. Hierdie bediener-programme is verpak sonder\n"</div><div class='ctx'> "enige probleme bekend. Dit kon intussen verander het, nadat sekuriteits-"</div><div class='ctx'> "gate\n"</div><div class='hunk'>@@ -4242,7 +4242,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4410,12 +4410,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4442,7 +4442,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4451,7 +4451,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4471,11 +4471,11 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandrakelinux\n"</div><div class='add'>+"Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandrivalinux\n"</div><div class='ctx'> "wil installeer. Indien u 'n leë hardeskyf het, of indien 'n bestaande\n"</div><div class='ctx'> "bedryfstelsel al die beskikbare spasie gebruik, sal u partisies moet\n"</div><div class='ctx'> "skep. Om 'n partisie te skep veroorsaak dat u die hardeskyf logies\n"</div><div class='del'>-"verdeel, om spasie te skep vir u nuwe Mandrakelinux bedryfstelsel.\n"</div><div class='add'>+"verdeel, om spasie te skep vir u nuwe Mandrivalinux bedryfstelsel.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Indien u 'n onervare gebruiker is, kan die skep van partisies vreemd en\n"</div><div class='ctx'> "intimiderend wees.\n"</div><div class='hunk'>@@ -4505,14 +4505,14 @@ msgstr ""</div><div class='ctx'> "geskied\n"</div><div class='ctx'> "sonner verlies van data, mits u die partisie gedefragmenteer het.Ons beveel "</div><div class='ctx'> "ten sterkste aan dat u 'n rugsteun maak van u data. Hierdie is\n"</div><div class='del'>-"die beste metode indien u beide Mandrakelinux en Microsoft Windows op die\n"</div><div class='add'>+"die beste metode indien u beide Mandrivalinux en Microsoft Windows op die\n"</div><div class='ctx'> "rekenaar wil gebruik.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Neem tog kennis dat dit die beskikbare oop spasie in Microsoft Windows sal\n"</div><div class='ctx'> "verminder, aangesien ons plek moet maak vir Linux op die hardeskyf.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Indien u alle data op alle partisies op u hardeskyf wil uitwis,\n"</div><div class='del'>-"en dit dan vervang met Mandrakelinux, kan u hierdie opsie kies.\n"</div><div class='add'>+"en dit dan vervang met Mandrivalinux, kan u hierdie opsie kies.\n"</div><div class='ctx'> "Wees versigtig die opsie is onomkeerbaar!\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! Net weer waarsku: alle data op die skyf sal vernietig word. !! \n"</div><div class='hunk'>@@ -4664,7 +4664,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4704,7 +4704,7 @@ msgstr "Vorige"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4716,7 +4716,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Teen die tyd wat u Mandrakelinux installeer, is dit hoogs waarskynlik\n"</div><div class='add'>+"Teen die tyd wat u Mandrivalinux installeer, is dit hoogs waarskynlik\n"</div><div class='ctx'> "dat van die pakkette intussen opgedateer is. Foute kom reggestel wees,\n"</div><div class='ctx'> "of sekuriteits probleme is dalk opgelos. Om voordeel hieruit te put, kan\n"</div><div class='ctx'> "u hulle nou van die Internet aflaai. Merk \"%s\" indien u 'n werkende\n"</div><div class='hunk'>@@ -4743,7 +4743,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4756,7 +4756,7 @@ msgstr ""</div><div class='ctx'> "dit algemene gebruik op die rekenaar moeiliker maak.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Indien u onseker is oor wat om te kies, bly by die verstek opsie. U\n"</div><div class='del'>-"kan altyd later die vlak verander deur draksec in die Mandrakelinux Control\n"</div><div class='add'>+"kan altyd later die vlak verander deur draksec in die Mandrivalinux Control\n"</div><div class='ctx'> "Center te grbruik.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Die \"%s\" veld kan boodskappe stuur na 'n gekose persoon wat\n"</div><div class='hunk'>@@ -4772,7 +4772,7 @@ msgstr "Sekuriteits-admin:"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4843,7 +4843,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nou moet u asseblief besluit watter partisie(s) u gaan gebruik vir die\n"</div><div class='del'>-"installasie van u Mandrakelinux rekenaar.Indien die partisies reeds\n"</div><div class='add'>+"installasie van u Mandrivalinux rekenaar.Indien die partisies reeds\n"</div><div class='ctx'> "geskep is gedurende 'n vorige GNU/Linux installasie of deur 'n ander\n"</div><div class='ctx'> "partisie-program, kan u hulle gebruik.Indien nie, moet u eerstens\n"</div><div class='ctx'> "partisies skep.\n"</div><div class='hunk'>@@ -4927,7 +4927,7 @@ msgstr "Skakel tussen normale/kenner modus"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4957,7 +4957,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ons het meer as een Microsoft-partisie op u hardeskyf gevind.\n"</div><div class='ctx'> "Kies dan nou die een wie se grootte u wil verander, om plek te maak\n"</div><div class='del'>-"vir u nuwe Mandrakelinux bedryfstelsel.\n"</div><div class='add'>+"vir u nuwe Mandrivalinux bedryfstelsel.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Elke partisie is as volg gelys: \"Linux-naam\", \"Windows-naam\"\n"</div><div class='ctx'> "\"Kapasiteit\".\n"</div><div class='hunk'>@@ -5006,7 +5006,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5015,19 +5015,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Hierdie stap word slegs gedoen indien ou GNU/Linux partisies op die\n"</div><div class='ctx'> "rekenaar gevind is.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX moet nou weet of u 'n nuwe installasie of 'n opgradering van 'n\n"</div><div class='del'>-"bestaande Mandrakelinux wil doen:\n"</div><div class='add'>+"bestaande Mandrivalinux wil doen:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Hierdie deel word grootliks gebruik vir 'n hele nuwe "</div><div class='ctx'> "installasie.\n"</div><div class='hunk'>@@ -5036,7 +5036,7 @@ msgstr ""</div><div class='ctx'> "van u partisies se data wil behou.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": hierdie tipe installasie laat u toe om pakkette op te dateer\n"</div><div class='del'>-"wat deel uitmaak van u huidige Mandrakelinux installasie. Die partisies\n"</div><div class='add'>+"wat deel uitmaak van u huidige Mandrivalinux installasie. Die partisies\n"</div><div class='ctx'> "en gebruiker se data bly onveranderd. Ander stappe is baie dieselfde as\n"</div><div class='ctx'> "'n normale installasie.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5095,7 +5095,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5349,7 +5349,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5370,11 +5370,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dit is nou tyd om u drukkerstelsel te kies. Ander bedryfstelsels sal\n"</div><div class='del'>-"seker net een aan u bied, maar Mandrakelinux gee twee. Elk van hulle\n"</div><div class='add'>+"seker net een aan u bied, maar Mandrivalinux gee twee. Elk van hulle\n"</div><div class='ctx'> "is beter as die ander in sekere gevalle.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- wat vir \"print, do not queue\" staan. Kies dit indien u\n"</div><div class='hunk'>@@ -5393,7 +5393,7 @@ msgstr ""</div><div class='ctx'> "opsies te keis en drukkers te bestuur.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Sou u die keuse nou, later wil verander, gaan gerus na 'PrinterDrake'\n"</div><div class='del'>-"in die 'Mandrakelinux Control Center' en klik op die \"Kenner\" knoppie."</div><div class='add'>+"in die 'Mandrivalinux Control Center' en klik op die \"Kenner\" knoppie."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5511,7 +5511,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5528,7 +5528,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5640,10 +5640,10 @@ msgstr "Dienste"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kies die hardeskyf wat u wil wis, om u nuwe Mandrakelinux\n"</div><div class='add'>+"Kies die hardeskyf wat u wil wis, om u nuwe Mandrivalinux\n"</div><div class='ctx'> "te kan installeer. Wees tog versigtig, alle huidige data op daardie\n"</div><div class='ctx'> "partisie sal vernietig word!"</div><div class='ctx'> </div><div class='hunk'>@@ -5990,7 +5990,7 @@ msgstr "Bereken die grootte van die Windowspartisie"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr "U Windows-partisie is te gefragmenteer. Loop eers 'defrag' asb."</div><div class='ctx'> </div><div class='hunk'>@@ -6105,19 +6105,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6139,7 +6139,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6147,14 +6147,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6164,7 +6164,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6184,10 +6184,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6198,11 +6198,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6218,7 +6218,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -6310,7 +6310,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6318,13 +6318,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Geluk, installasie is afgehandel.\n"</div><div class='ctx'> "Verwyder die herlaaimedium en druk 'enter' om te herlaai.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Vir inligting oor hierdie vrystelling van Mandrakelinux,\n"</div><div class='add'>+"Vir inligting oor hierdie vrystelling van Mandrivalinux,\n"</div><div class='ctx'> "bekyk die errata beskikbaar op\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6332,7 +6332,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Inligting oor stelskonfigurasie is beskikbaar in die postinstallasie-\n"</div><div class='del'>-"hoofstuk in die Offisiële Mandrakelinux Gebruikersgids."</div><div class='add'>+"hoofstuk in die Offisiële Mandrivalinux Gebruikersgids."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6367,13 +6367,13 @@ msgstr "Gaan stap '%s' binne\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "U stelsel het min hulpbronne beskikbaar. U mag dalk probleme\n"</div><div class='ctx'> "ondervind met die installering\n"</div><div class='del'>-"van Mandrakelinux. In so 'n geval probeer eerder die teksinstallasie.\n"</div><div class='add'>+"van Mandrivalinux. In so 'n geval probeer eerder die teksinstallasie.\n"</div><div class='ctx'> "Daarvoor moet u\n"</div><div class='ctx'> "'F1' druk wanneer u vanaf die CDROM herlaai en dan 'text' op die\n"</div><div class='ctx'> "instruksielyn intik."</div><div class='hunk'>@@ -6912,8 +6912,8 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='del'>-msgstr "Kontak Mandrakelinux se webwerf vir 'n lys van spieëlwebplekke...."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='add'>+msgstr "Kontak Mandrivalinux se webwerf vir 'n lys van spieëlwebplekke...."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7135,8 +7135,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux Installasie %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux Installasie %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9727,13 +9727,13 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall konfigurasie\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Hiermee stel u 'n persoonlike vuurmuur op vir die Mandrakelinux\n"</div><div class='add'>+"Hiermee stel u 'n persoonlike vuurmuur op vir die Mandrivalinux\n"</div><div class='ctx'> "rekenaar. Indien u 'n kragtige en toegewyde vuurmuur verlang, kyk\n"</div><div class='ctx'> "dan gerus na die 'MandrakeSecurity Firewall'."</div><div class='ctx'> </div><div class='hunk'>@@ -13773,7 +13773,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14046,7 +14046,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Die netwerk, soos opgestel gedurende die installasie, kom nie aan die gang "</div><div class='ctx'> "nie. Maak tog seker die netwerk is tot u beskikking, en gaan u konfigurasie "</div><div class='del'>-"na deur die 'Mandrakelinux Control Center' te gebruik. "</div><div class='add'>+"na deur die 'Mandrivalinux Control Center' te gebruik. "</div><div class='ctx'> </div><div class='ctx'> #: printer/printerdrake.pm:4196</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15674,18 +15674,18 @@ msgstr "Stop"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Wat is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Wat is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Welkom by &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Welkom by &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15694,11 +15694,11 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux is 'n Oopbron bedryfstelsel wat duisende van die keurigste "</div><div class='del'>-"programme beskikbaar in die Oopbron wêreld bevat. Mandrakelinux is een van "</div><div class='add'>+"Mandrivalinux is 'n Oopbron bedryfstelsel wat duisende van die keurigste "</div><div class='add'>+"programme beskikbaar in die Oopbron wêreld bevat. Mandrivalinux is een van "</div><div class='ctx'> "die gewildste in die wereld!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -15714,13 +15714,13 @@ msgstr "Welkom by die wêreld van Oopbron sagteware!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux is toegewyd aan die Oopbron manier van dinge doen. Hierdie "</div><div class='del'>-"vrystelling is die reslutaat van samewerking tussen Mandrakesoft se span "</div><div class='add'>+"Mandrivalinux is toegewyd aan die Oopbron manier van dinge doen. Hierdie "</div><div class='add'>+"vrystelling is die reslutaat van samewerking tussen Mandriva se span "</div><div class='ctx'> "ontwikkelaars en 'n wereldwye gemeenskap wan mense wat bydraes lewer."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='hunk'>@@ -15741,7 +15741,7 @@ msgstr "&lt;b&gt;Neem Kennis&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15762,15 +15762,15 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Join the Community&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Sluit aan by die Mandrakelinux gemeenskap!&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Sluit aan by die Mandrivalinux gemeenskap!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15784,13 +15784,13 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Download Version&lt;/b&gt;"</div><div class='del'>-msgstr "Hierdie is die Mandrakelinux &lt;b&gt;Download weergawe&lt;/b&gt;."</div><div class='add'>+msgstr "Hierdie is die Mandrivalinux &lt;b&gt;Download weergawe&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15817,7 +15817,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15827,7 +15827,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15849,17 +15849,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack is Mandrakesoft se uitblinker werkstasie-produk. Buiten dat dit "</div><div class='add'>+"PowerPack is Mandriva se uitblinker werkstasie-produk. Buiten dat dit "</div><div class='ctx'> "die maklikste is om te ken gebruik, sluit dit duisende programme in van die "</div><div class='ctx'> "mees gewildste tot die mees tegnieste."</div><div class='ctx'> </div><div class='hunk'>@@ -15870,7 +15870,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15887,20 +15887,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux Updates Applet"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux Updates Applet"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15920,61 +15920,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr "Vind meer uit rakende &lt;b&gt;Personal Solutions&lt;/n&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -16012,7 +16012,7 @@ msgstr "&lt;b&gt;Kies u grafiese werksomgewing!&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -16033,7 +16033,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16153,10 +16153,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Die kieslys in Mandrakelinux het gebruikersvriendelike programme vir alle "</div><div class='add'>+"Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "</div><div class='ctx'> "behoefdes:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16398,17 +16398,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Die \"Mandrakelinux Control Center\" is 'n versameling nutsprogramme wat die "</div><div class='add'>+"Die \"Mandrivalinux Control Center\" is 'n versameling nutsprogramme wat die "</div><div class='ctx'> "opstel van u rekenaar vergemaklik."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16432,9 +16432,9 @@ msgstr "&lt;b&gt;Die KDE Keuse&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16446,10 +16446,10 @@ msgstr "&lt;b&gt;MandrakeStore&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Hier kan u alle Mandrakesoft produkte en dienste vind. &lt;b&gt;Mandrakestore&lt;/b&gt; "</div><div class='add'>+"Hier kan u alle Mandriva produkte en dienste vind. &lt;b&gt;Mandriva Store&lt;/b&gt; "</div><div class='ctx'> "--ons ten volle toegeruste e-handel platvorm."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16471,20 +16471,20 @@ msgstr "Gaan draai sommer vandag by &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Hierdie is meer as net 'n gemeenskap, hier kry u ekstra waarde deur produkte "</div><div class='ctx'> "en dienste wat die volgende insluit:"</div><div class='hunk'>@@ -16494,7 +16494,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Special discounts&lt;/b&gt; on products and services of our online store "</div><div class='ctx'> "&lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Spesiale afslag vir produkte en dienste by \"Mandrakestore\""</div><div class='add'>+msgstr "\t* Spesiale afslag vir produkte en dienste by \"Mandriva Store\""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:21</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16505,33 +16505,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr "\t* Deel in die aanlyn kletzkamers met &lt;b&gt;Kopete&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16554,32 +16554,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16883,8 +16883,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -17033,7 +17033,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17047,7 +17047,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrake Terminal Server Configurator\n"</div><div class='add'>+"Mandriva Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17103,7 +17103,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17111,7 +17111,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -19891,13 +19891,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux Bug Report Tool"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Control Center"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19917,8 +19917,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19963,7 +19963,7 @@ msgstr "Konfigurasie-assistente"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr "Mandrake Bug Report Tool"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -20389,20 +20389,20 @@ msgstr "Gelaai tydens herlaaityd"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Hierdie koppelvlak is nog nie opgestel nie.\n"</div><div class='del'>-"Loods die \"Add an interface\"-assistent vanuit die Mandrakelinux Control "</div><div class='add'>+"Loods die \"Add an interface\"-assistent vanuit die Mandrivalinux Control "</div><div class='ctx'> "Center"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Hierdie koppelvlak is nog nie opgestel nie.\n"</div><div class='del'>-"Loods die \"%s\"-assistent vanuit die Mandrakelinux Control Center"</div><div class='add'>+"Loods die \"%s\"-assistent vanuit die Mandrivalinux Control Center"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20452,7 +20452,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -20750,7 +20750,7 @@ msgstr "Trek in"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20759,7 +20759,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21303,14 +21303,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Kopiereg © 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Kopiereg © 2003-2004 Mandriva.\n"</div><div class='ctx'> "Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21339,8 +21339,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux Hulp Sentrum"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux Hulp Sentrum"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24858,8 +24858,8 @@ msgstr "Die verandering is aangebring, maar u moet eers afteken"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux Tools Logs"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25369,10 +25369,10 @@ msgstr "Voltooide konneksie."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Probleme met die Konneksie\n"</div><div class='del'>-"Maak tog seker van u konfigurasie in die 'Mandrakelinux Control Center'."</div><div class='add'>+"Maak tog seker van u konfigurasie in die 'Mandrivalinux Control Center'."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26395,13 +26395,13 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ msgstr "Fout om %s in skryfmodus te open: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Hierdie is HardDrake,'n Mandrakelinux program vir hardewarekonfigurasie.\n"</div><div class='add'>+#~ "Hierdie is HardDrake,'n Mandrivalinux program vir hardewarekonfigurasie.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Weergawe:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Skrywer&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -26805,8 +26805,8 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Probleme om drukker \"%s\" uit Star Office/OpenOffice.org/GIMP te verwyder"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Congratulations for choosing Mandrakelinux!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Veels Geluk met u puik keuse van Mandrakelinux! ;-)&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Congratulations for choosing Mandrivalinux!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Veels Geluk met u puik keuse van Mandrivalinux! ;-)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "We would like to thank everyone who participated in the development of "</div><div class='hunk'>@@ -26905,12 +26905,12 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Bekyk en redigeer foto's en grafika deur &lt;b&gt;GQview&lt;/b&gt;en&lt;b&gt;The Gimp!&lt;/b&gt;"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Become a &lt;b&gt;Mandrakeclub&lt;/b&gt; member!"</div><div class='del'>-#~ msgstr "Sluit aan by die &lt;b&gt;&lt;Mandrakeclub!&lt;/b&gt;"</div><div class='add'>+#~ msgid "Become a &lt;b&gt;Mandriva Club&lt;/b&gt; member!"</div><div class='add'>+#~ msgstr "Sluit aan by die &lt;b&gt;&lt;Mandriva Club!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Take advantage of valuable benefits, products and services by joining "</div><div class='del'>-#~ "Mandrakeclub, such as:"</div><div class='add'>+#~ "Mandriva Club, such as:"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Hierdie is meer as net 'n gemeenskap, hier kry u ekstra waarde deur "</div><div class='ctx'> #~ "produkte en dienste wat die volgende insluit:"</div><div class='hunk'>@@ -26919,14 +26919,14 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ msgstr "\t* Volle toegang na komersiele sagteware"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"</div><div class='add'>+#~ "\t* Special download mirror list exclusively for Mandriva Club Members"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Spesiale spieel bedieners wat uitsluitlik vir \"Mandrakeclub\" se "</div><div class='add'>+#~ "\t* Spesiale spieel bedieners wat uitsluitlik vir \"Mandriva Club\" se "</div><div class='ctx'> #~ "lede is"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Voting for software to put in Mandrakelinux"</div><div class='add'>+#~ msgid "\t* Voting for software to put in Mandrivalinux"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Stemreg om te kan se watter sagteware u in Mandrakelinux wil sien"</div><div class='add'>+#~ "\t* Stemreg om te kan se watter sagteware u in Mandrivalinux wil sien"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Plus much more"</div><div class='ctx'> #~ msgstr "\t* Plus veel meer"</div><div class='hunk'>@@ -26937,14 +26937,14 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ msgid "Do you require assistance?"</div><div class='ctx'> #~ msgstr "Verlang u bystand?"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt; is the primary source for technical support."</div><div class='del'>-#~ msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt; is die hoofbron van tegniese bystand."</div><div class='add'>+#~ msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt; is the primary source for technical support."</div><div class='add'>+#~ msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt; is die hoofbron van tegniese bystand."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "If you have Linux questions, subscribe to Mandrakeexpert at &lt;b&gt;www."</div><div class='add'>+#~ "If you have Linux questions, subscribe to Mandriva Expert at &lt;b&gt;www."</div><div class='ctx'> #~ "mandrakeexpert.com&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Sou u enige Linux tipe vrae het, sluit aan by Mandrakeexpert &lt;b&gt;www. "</div><div class='add'>+#~ "Sou u enige Linux tipe vrae het, sluit aan by Mandriva Expert &lt;b&gt;www. "</div><div class='ctx'> #~ "mandrakeexpert.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -26962,22 +26962,22 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "mandrake- linux.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "</div><div class='add'>+#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "</div><div class='ctx'> #~ "the latest versions of the most popular Open Source applications."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinux sluit die bekende KDEen GNOME grafiese werkskerms, asook "</div><div class='add'>+#~ "Mandrivalinux sluit die bekende KDEen GNOME grafiese werkskerms, asook "</div><div class='ctx'> #~ "die nuutste weergawes van die mees gewilde Oopbron programme in."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "</div><div class='add'>+#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "</div><div class='ctx'> #~ "to install and easy to use Linux distribution."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinux word deur meeste mense as die gebruikervriendelikste Linux "</div><div class='add'>+#~ "Mandrivalinux word deur meeste mense as die gebruikervriendelikste Linux "</div><div class='ctx'> #~ "beskou. Dit is maklik om te installeer en maklik om te gebruik."</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='add'>+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Vind uit oor Mandrakelinux op 'n selflaai CD - &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='add'>+#~ "\t* Vind uit oor Mandrivalinux op 'n selflaai CD - &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "</div><div class='hunk'>@@ -27024,7 +27024,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "&lt;b&gt;MandrakeClustering&lt;/b&gt;: the power and speed of a Linux cluster "</div><div class='ctx'> #~ "combined with the stability and easy-of-use of the world-famous "</div><div class='del'>-#~ "Mandrakelinux distribution. A unique blend for incomparable HPC "</div><div class='add'>+#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "</div><div class='ctx'> #~ "performance."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "&lt;b&gt;MandrakeClustering&lt;/b&gt;: die krag en spoed van 'n Linux-trosrekenaar "</div><div class='hunk'>@@ -27040,14 +27040,14 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "aankoop waar ons dan 'n probleem per geval hanteer. daar is "</div><div class='ctx'> #~ "verskeidenheid hoveelhede vir elke behoefde!"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Become a Mandrakeclub member!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Word 'n lid van die Mandrakeclub!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Become a Mandriva Club member!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Word 'n lid van die Mandriva Club!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Do you require assistance?&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Benodig u bystand?&lt;/b&gt;"</div><div class='ctx'> </div><div class='del'>-#~ msgid "This is the Mandrakelinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='del'>-#~ msgstr "Hierdie is die Mandrakelinux &lt;b&gt;Download weergawe&lt;/b&gt;."</div><div class='add'>+#~ msgid "This is the Mandrivalinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='add'>+#~ msgstr "Hierdie is die Mandrivalinux &lt;b&gt;Download weergawe&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "The free download version does not include commercial software, and "</div><div class='hunk'>@@ -27071,25 +27071,25 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "'n volledige keuse wereldklas bediener aplikasies in te sluit."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "It is the only Mandrakelinux product that includes the groupware solution."</div><div class='add'>+#~ "It is the only Mandrivalinux product that includes the groupware solution."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Dit is die enigste Mandrakelinux produk wat die \"groupware\" oplossing "</div><div class='add'>+#~ "Dit is die enigste Mandrivalinux produk wat die \"groupware\" oplossing "</div><div class='ctx'> #~ "bevat."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "When you log into your Mandrakelinux system for the first time, you can "</div><div class='add'>+#~ "When you log into your Mandrivalinux system for the first time, you can "</div><div class='ctx'> #~ "choose between several popular graphical desktops environments, "</div><div class='ctx'> #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Sodra u die eerste keer inteken op u Mandrakelinux rekenaar, het u 'n "</div><div class='add'>+#~ "Sodra u die eerste keer inteken op u Mandrivalinux rekenaar, het u 'n "</div><div class='ctx'> #~ "keuse watter grafiese werksomgewing om te gebruik. Keuses sluit KDE, "</div><div class='ctx'> #~ "GNOME, WindowMaker, IceWM, en ander in."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "</div><div class='add'>+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "</div><div class='ctx'> #~ "of your tasks:"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Die kieslys in Mandrakelinux het gebruikersvriendelike programme vir alle "</div><div class='add'>+#~ "Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "</div><div class='ctx'> #~ "behoefdes:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27134,12 +27134,12 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ msgstr "\t* Adresboek (kliënt en bediener)"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux distribution is the result of collaborative "</div><div class='del'>-#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "</div><div class='add'>+#~ "Your new Mandrivalinux distribution is the result of collaborative "</div><div class='add'>+#~ "efforts between Mandriva developers and Mandrivalinux contributors "</div><div class='ctx'> #~ "throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "U nuwe Mandrakelinux bedryfstelsel met al sy programme is die resultaat "</div><div class='del'>-#~ "van 'n wereldwye gemeenskap, wat Mandrakesoft se ontwikkelaars, asook "</div><div class='add'>+#~ "U nuwe Mandrivalinux bedryfstelsel met al sy programme is die resultaat "</div><div class='add'>+#~ "van 'n wereldwye gemeenskap, wat Mandriva se ontwikkelaars, asook "</div><div class='ctx'> #~ "mense in Sonnige Suid-Afrika insluit!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27208,13 +27208,13 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Before continuing, you should carefully read the terms of the license. "</div><div class='ctx'> #~ "It\n"</div><div class='del'>-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "</div><div class='add'>+#~ "covers the entire Mandrivalinux distribution. If you do agree with all "</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"</div><div class='ctx'> #~ "will reboot your computer."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Voordat u voortgaan, lees asb die lisensieterme noukeurig deur. Dit dek\n"</div><div class='del'>-#~ "die hele Mandrakelinux distribusie. Indien u saamstem met al die\n"</div><div class='add'>+#~ "die hele Mandrivalinux distribusie. Indien u saamstem met al die\n"</div><div class='ctx'> #~ "voorwaardes daarin, merk die \"%s\" boksie. Indien nie, kan u op die\n"</div><div class='ctx'> #~ "\"%s\" knoppie druk om teherlaai."</div><div class='ctx'> </div><div class='hunk'>@@ -27326,25 +27326,25 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "nie. "</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+#~ "The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> #~ "selected package is located on another CD-ROM, DrakX will eject the "</div><div class='ctx'> #~ "current\n"</div><div class='ctx'> #~ "CD and ask you to insert the correct CD as required."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Die Mandrakelinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"</div><div class='add'>+#~ "Die Mandrivalinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"</div><div class='ctx'> #~ "weet wanneer 'n gekose pakket op 'n ander CD-ROM is. DrakX sal in so\n"</div><div class='ctx'> #~ "geval die huidige CD uitskop en aandui watter een benodig word."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "It is now time to specify which programs you wish to install on your\n"</div><div class='del'>-#~ "system. There are thousands of packages available for Mandrakelinux, and\n"</div><div class='add'>+#~ "system. There are thousands of packages available for Mandrivalinux, and\n"</div><div class='ctx'> #~ "to make it simpler to manage the packages have been placed into groups "</div><div class='ctx'> #~ "of\n"</div><div class='ctx'> #~ "similar applications.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Packages are sorted into groups corresponding to a particular use of "</div><div class='ctx'> #~ "your\n"</div><div class='del'>-#~ "machine. Mandrakelinux sorts packages groups in four categories. You can\n"</div><div class='add'>+#~ "machine. Mandrivalinux sorts packages groups in four categories. You can\n"</div><div class='ctx'> #~ "mix and match applications from the various categories, so a\n"</div><div class='ctx'> #~ "``Workstation'' installation can still have applications from the\n"</div><div class='ctx'> #~ "``Development'' category installed.\n"</div><div class='hunk'>@@ -27397,12 +27397,12 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "updating an existing system."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Nou moet u spesifiseer watter programme u op die rekenaar wil\n"</div><div class='del'>-#~ "installeer. Daar is duisende pakkette beskikbaar vir Mandrakelinux, en\n"</div><div class='add'>+#~ "installeer. Daar is duisende pakkette beskikbaar vir Mandrivalinux, en\n"</div><div class='ctx'> #~ "om alles meer eenvoudig te maak, is die pakkette gegroepeer onder\n"</div><div class='ctx'> #~ "groepe van selfde tipe programme.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Die groepe is so saamgestel dat dit saamval met die tipe gebruik van u\n"</div><div class='del'>-#~ "rekenaar. Mandrakelinux het vier vooraf gespesifseerde installasies\n"</div><div class='add'>+#~ "rekenaar. Mandrivalinux het vier vooraf gespesifseerde installasies\n"</div><div class='ctx'> #~ "beskikbaar. Dink aan hierdie tipes as houers met verskillende pakkette.\n"</div><div class='ctx'> #~ "U kan wel uit die verskillende houers, verskillende pakkette kies.\n"</div><div class='ctx'> #~ "Dus kan u \"Werkstasie\" ook programme uit die \"Ontwikkeling\"\n"</div><div class='hunk'>@@ -27458,11 +27458,11 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "chose the individual package or because it was part of a group of "</div><div class='ctx'> #~ "packages,\n"</div><div class='ctx'> #~ "you will be asked to confirm that you really want those servers to be\n"</div><div class='del'>-#~ "installed. By default Mandrakelinux will automatically start any "</div><div class='add'>+#~ "installed. By default Mandrivalinux will automatically start any "</div><div class='ctx'> #~ "installed\n"</div><div class='ctx'> #~ "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> #~ "the time the distribution was shipped, it is entirely possible that that\n"</div><div class='del'>-#~ "security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+#~ "security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> #~ "finalized. If you do not know what a particular service is supposed to "</div><div class='ctx'> #~ "do\n"</div><div class='ctx'> #~ "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"</div><div class='hunk'>@@ -27501,7 +27501,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "Indien u 'n diensprogram kies, of dit nou deel is van 'n groepe pakkette "</div><div class='ctx'> #~ "of\n"</div><div class='ctx'> #~ "'n enkel een, sal u gevra word om die installasie daarvan te bevestig.\n"</div><div class='del'>-#~ "Mandrakelinux sal by verstek alle bediener-programme afskop nadat u die\n"</div><div class='add'>+#~ "Mandrivalinux sal by verstek alle bediener-programme afskop nadat u die\n"</div><div class='ctx'> #~ "rekenaar aangeskakel het. Hierdie bediener-programme is verpak sonder\n"</div><div class='ctx'> #~ "enige probleme bekend. Dit kon intussen verander het, nadat sekuriteits-"</div><div class='ctx'> #~ "gate\n"</div><div class='hunk'>@@ -27530,7 +27530,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "You will now set up your Internet/network connection. If you wish to\n"</div><div class='ctx'> #~ "connect your computer to the Internet or to a local network, click \"%s"</div><div class='ctx'> #~ "\".\n"</div><div class='del'>-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"</div><div class='add'>+#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"</div><div class='ctx'> #~ "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"</div><div class='ctx'> #~ "configure the network, or to do it later, in which case clicking the \"%s"</div><div class='ctx'> #~ "\"\n"</div><div class='hunk'>@@ -27551,7 +27551,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "modems\n"</div><div class='ctx'> #~ "that require additional software to work compared to Normal modems. Some "</div><div class='ctx'> #~ "of\n"</div><div class='del'>-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"</div><div class='add'>+#~ "those modems actually work under Mandrivalinux, some others do not. You\n"</div><div class='ctx'> #~ "can consult the list of supported modems at LinModems.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You can consult the ``Starter Guide'' chapter about Internet connections\n"</div><div class='hunk'>@@ -27562,7 +27562,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "U kan nou die Internet/netwerk konneksie opstel. Indien u graag die "</div><div class='ctx'> #~ "rekenaar\n"</div><div class='ctx'> #~ "aan die Internet of plaaslike netwerk wil koppel, kies \"%s\".\n"</div><div class='del'>-#~ "Mandrakelinux sal poog om u netwerk toestelle en modems te outospeur.\n"</div><div class='add'>+#~ "Mandrivalinux sal poog om u netwerk toestelle en modems te outospeur.\n"</div><div class='ctx'> #~ "Indien\n"</div><div class='ctx'> #~ "dit onsuksesvol was, probeer waar \"%s\" nie gemerk is nie. U kan ook "</div><div class='ctx'> #~ "kies\n"</div><div class='hunk'>@@ -27689,7 +27689,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "X (for X Window System) is the heart of the GNU/Linux graphical "</div><div class='ctx'> #~ "interface\n"</div><div class='ctx'> #~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-#~ "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You will be presented with a list of different parameters to change to "</div><div class='ctx'> #~ "get\n"</div><div class='hunk'>@@ -27874,7 +27874,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "have to partition the drive. Basically, partitioning a hard drive "</div><div class='ctx'> #~ "consists\n"</div><div class='ctx'> #~ "of logically dividing it to create the space needed to install your new\n"</div><div class='del'>-#~ "Mandrakelinux system.\n"</div><div class='add'>+#~ "Mandrivalinux system.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> #~ "and can lead to lost data if there is an existing operating system "</div><div class='hunk'>@@ -27913,7 +27913,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> #~ "data, provided you have previously defragmented the Windows partition.\n"</div><div class='ctx'> #~ "Backing up your data is strongly recommended.. Using this option is\n"</div><div class='del'>-#~ "recommended if you want to use both Mandrakelinux and Microsoft Windows "</div><div class='add'>+#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "</div><div class='ctx'> #~ "on\n"</div><div class='ctx'> #~ "the same computer.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -27923,7 +27923,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "Windows to store your data or to install new software.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": if you want to delete all data and all partitions present on\n"</div><div class='del'>-#~ "your hard drive and replace them with your new Mandrakelinux system,\n"</div><div class='add'>+#~ "your hard drive and replace them with your new Mandrivalinux system,\n"</div><div class='ctx'> #~ "choose this option. Be careful, because you will not be able to undo "</div><div class='ctx'> #~ "your\n"</div><div class='ctx'> #~ "choice after you confirm.\n"</div><div class='hunk'>@@ -27948,11 +27948,11 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "refer to the ``Managing Your Partitions'' section in the ``Starter "</div><div class='ctx'> #~ "Guide''."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandrakelinux\n"</div><div class='add'>+#~ "Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandrivalinux\n"</div><div class='ctx'> #~ "wil installeer. Indien u 'n leë hardeskyf het, of indien 'n bestaande\n"</div><div class='ctx'> #~ "bedryfstelsel al die beskikbare spasie gebruik, sal u partisies moet\n"</div><div class='ctx'> #~ "skep. Om 'n partisie te skep veroorsaak dat u die hardeskyf logies\n"</div><div class='del'>-#~ "verdeel, om spasie te skep vir u nuwe Mandrakelinux bedryfstelsel.\n"</div><div class='add'>+#~ "verdeel, om spasie te skep vir u nuwe Mandrivalinux bedryfstelsel.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Indien u 'n onervare gebruiker is, kan die skep van partisies vreemd en\n"</div><div class='ctx'> #~ "intimiderend wees.\n"</div><div class='hunk'>@@ -27988,7 +27988,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "geskied\n"</div><div class='ctx'> #~ "sonner verlies van data, mits u die partisie gedefragmenteer het.Ons "</div><div class='ctx'> #~ "beveel ten sterkste aan dat u 'n rugsteun maak van u data. Hierdie is\n"</div><div class='del'>-#~ "die beste metode indien u beide Mandrakelinux en Microsoft Windows op "</div><div class='add'>+#~ "die beste metode indien u beide Mandrivalinux en Microsoft Windows op "</div><div class='ctx'> #~ "die\n"</div><div class='ctx'> #~ "rekenaar wil gebruik.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -27998,7 +27998,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": Indien u alle data op alle partisies op u hardeskyf wil "</div><div class='ctx'> #~ "uitwis,\n"</div><div class='del'>-#~ "en dit dan vervang met Mandrakelinux, kan u hierdie opsie kies.\n"</div><div class='add'>+#~ "en dit dan vervang met Mandrivalinux, kan u hierdie opsie kies.\n"</div><div class='ctx'> #~ "Wees versigtig die opsie is onomkeerbaar!\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "   !! Net weer waarsku: alle data op die skyf sal vernietig word. !! \n"</div><div class='hunk'>@@ -28105,7 +28105,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "Click on \"%s\" when you are ready to format the partitions.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-#~ "Mandrakelinux operating system installation.\n"</div><div class='add'>+#~ "Mandrivalinux operating system installation.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click on \"%s\" if you wish to select partitions that will be checked "</div><div class='ctx'> #~ "for\n"</div><div class='hunk'>@@ -28135,7 +28135,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "getoets moet word."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "At the time you are installing Mandrakelinux, it is likely that some\n"</div><div class='add'>+#~ "At the time you are installing Mandrivalinux, it is likely that some\n"</div><div class='ctx'> #~ "packages will have been updated since the initial release. Bugs may have\n"</div><div class='ctx'> #~ "been fixed, security issues resolved. To allow you to benefit from these\n"</div><div class='ctx'> #~ "updates, you are now able to download them from the Internet. Check \"%s"</div><div class='hunk'>@@ -28150,7 +28150,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "selected package(s), or \"%s\" to abort."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Teen die tyd wat u Mandrakelinux installeer, is dit hoogs waarskynlik\n"</div><div class='add'>+#~ "Teen die tyd wat u Mandrivalinux installeer, is dit hoogs waarskynlik\n"</div><div class='ctx'> #~ "dat van die pakkette intussen opgedateer is. Foute kom reggestel wees,\n"</div><div class='ctx'> #~ "of sekuriteits probleme is dalk opgelos. Om voordeel hieruit te put, kan\n"</div><div class='ctx'> #~ "u hulle nou van die Internet aflaai. Merk \"%s\" indien u 'n werkende\n"</div><div class='hunk'>@@ -28213,7 +28213,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "DrakX now needs to know if you want to perform a new install or an "</div><div class='ctx'> #~ "upgrade\n"</div><div class='del'>-#~ "of an existing Mandrakelinux system:\n"</div><div class='add'>+#~ "of an existing Mandrivalinux system:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": For the most part, this completely wipes out the old system. "</div><div class='ctx'> #~ "If\n"</div><div class='hunk'>@@ -28225,21 +28225,21 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "written.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": this installation class allows you to update the packages\n"</div><div class='del'>-#~ "currently installed on your Mandrakelinux system. Your current\n"</div><div class='add'>+#~ "currently installed on your Mandrivalinux system. Your current\n"</div><div class='ctx'> #~ "partitioning scheme and user data is not altered. Most of other\n"</div><div class='ctx'> #~ "configuration steps remain available, similar to a standard "</div><div class='ctx'> #~ "installation.\n"</div><div class='ctx'> #~ "\n"</div><div class='del'>-#~ "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> #~ "running version \"8.1\" or later. Performing an Upgrade on versions "</div><div class='ctx'> #~ "prior\n"</div><div class='del'>-#~ "to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+#~ "to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Hierdie stap word slegs gedoen indien ou GNU/Linux partisies op die\n"</div><div class='ctx'> #~ "rekenaar gevind is.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "DrakX moet nou weet of u 'n nuwe installasie of 'n opgradering van 'n\n"</div><div class='del'>-#~ "bestaande Mandrakelinux wil doen:\n"</div><div class='add'>+#~ "bestaande Mandrivalinux wil doen:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": Hierdie deel word grootliks gebruik vir 'n hele nuwe "</div><div class='ctx'> #~ "installasie.\n"</div><div class='hunk'>@@ -28250,7 +28250,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "van u partisies se data wil behou.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": hierdie tipe installasie laat u toe om pakkette op te dateer\n"</div><div class='del'>-#~ "wat deel uitmaak van u huidige Mandrakelinux installasie. Die partisies\n"</div><div class='add'>+#~ "wat deel uitmaak van u huidige Mandrivalinux installasie. Die partisies\n"</div><div class='ctx'> #~ "en gebruiker se data bly onveranderd. Ander stappe is baie dieselfde as\n"</div><div class='ctx'> #~ "'n normale installasie.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28315,7 +28315,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "About UTF-8 (unicode) support: Unicode is a new character encoding meant "</div><div class='ctx'> #~ "to\n"</div><div class='ctx'> #~ "cover all existing languages. Though full support for it in GNU/Linux is\n"</div><div class='del'>-#~ "still under development. For that reason, Mandrakelinux will be using it\n"</div><div class='add'>+#~ "still under development. For that reason, Mandrivalinux will be using it\n"</div><div class='ctx'> #~ "or not depending on the user choices:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * If you choose a languages with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -28571,7 +28571,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "checking this box.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"</div><div class='del'>-#~ "\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"</div><div class='add'>+#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"</div><div class='ctx'> #~ "system! Be sure you know what you are doing before changing any of the\n"</div><div class='ctx'> #~ "options. !!\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28703,7 +28703,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Now, it's time to select a printing system for your computer. Other OSs "</div><div class='ctx'> #~ "may\n"</div><div class='del'>-#~ "offer you one, but Mandrakelinux offers two. Each of the printing "</div><div class='add'>+#~ "offer you one, but Mandrivalinux offers two. Each of the printing "</div><div class='ctx'> #~ "systems\n"</div><div class='ctx'> #~ "is best suited to particular types of configuration.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28739,7 +28739,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "Center and clicking the expert button."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Dit is nou tyd om u drukkerstelsel te kies. Ander bedryfstelsels sal\n"</div><div class='del'>-#~ "seker net een aan u bied, maar Mandrakelinux gee twee. Elk van hulle\n"</div><div class='add'>+#~ "seker net een aan u bied, maar Mandrivalinux gee twee. Elk van hulle\n"</div><div class='ctx'> #~ "is beter as die ander in sekere gevalle.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\" -- wat vir \"print, do not queue\" staan. Kies dit indien u\n"</div><div class='hunk'>@@ -29253,10 +29253,10 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "opstel van u rekenaar vergemaklik."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='add'>+#~ "Find all Mandriva products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='ctx'> #~ "our full service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Hier kan u alle Mandrakesoft produkte en dienste vind. &lt;b&gt;MandrakeStore&lt;/"</div><div class='add'>+#~ "Hier kan u alle Mandriva produkte en dienste vind. &lt;b&gt;MandrakeStore&lt;/"</div><div class='ctx'> #~ "b&gt; --ons ten volle toegeruste e-handel platvorm."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "Become a &lt;b&gt;MandrakeClub&lt;/b&gt; member!"</div><div class='hunk'>@@ -29278,25 +29278,25 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ msgid "\t* Special discounts for products and services at MandrakeStore"</div><div class='ctx'> #~ msgstr "\t* Spesiale afslag vir produkte en dienste by \"MandrakeStore\""</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with &lt;b&gt;MandrakeMove&lt;/b&gt;"</div><div class='add'>+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with &lt;b&gt;Mandriva Move&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Vind uit oor Mandrakelinux op 'n selflaai CD - &lt;b&gt;MandrakeMove&lt;/b&gt;"</div><div class='add'>+#~ "\t* Vind uit oor Mandrivalinux op 'n selflaai CD - &lt;b&gt;Mandriva Move&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products at &lt;b&gt;MandrakeStore&lt;/b&gt; -- our full "</div><div class='add'>+#~ "Find all Mandriva products at &lt;b&gt;MandrakeStore&lt;/b&gt; -- our full "</div><div class='ctx'> #~ "service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakesoft se produkte is by &lt;b&gt;MandrakeStore&lt;/b&gt; -- ons volledige e-"</div><div class='add'>+#~ "Mandriva se produkte is by &lt;b&gt;MandrakeStore&lt;/b&gt; -- ons volledige e-"</div><div class='ctx'> #~ "handel winkel."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Become a MandrakeClub member!&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Word 'n lid van die MandrakeClub!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "</div><div class='add'>+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "</div><div class='ctx'> #~ "tasks:"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Die kieslys in Mandrakelinux het gebruikersvriendelike programme vir alle "</div><div class='add'>+#~ "Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "</div><div class='ctx'> #~ "behoefdes:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -29334,7 +29334,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "[OPTIONS]...\n"</div><div class='del'>-#~ "Mandrake Terminal Server Configurator\n"</div><div class='add'>+#~ "Mandriva Terminal Server Configurator\n"</div><div class='ctx'> #~ "--enable         : enable MTS\n"</div><div class='ctx'> #~ "--disable        : disable MTS\n"</div><div class='ctx'> #~ "--start          : start MTS\n"</div><div class='hunk'>@@ -29349,7 +29349,7 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "address, IP, nbi image name)"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "[OPTIONS]...\n"</div><div class='del'>-#~ "Mandrake Terminal Server Configurator\n"</div><div class='add'>+#~ "Mandriva Terminal Server Configurator\n"</div><div class='ctx'> #~ "--enable         : enable MTS\n"</div><div class='ctx'> #~ "--disable        : disable MTS\n"</div><div class='ctx'> #~ "--start          : start MTS\n"</div><div class='hunk'>@@ -29363,8 +29363,8 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> #~ "--delclient      : delete a client machine from MTS (requires MAC "</div><div class='ctx'> #~ "address, IP, nbi image name)"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "This interface has not been configured yet.\n"</div><div class='hunk'>@@ -29487,8 +29487,8 @@ msgstr "Installasie het gefaal!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Take advantage of valuable benefits, products and services by joining "</div><div class='del'>-#~ "Mandrake Club, such as:"</div><div class='del'>-#~ msgstr "Slaan munt uit die voordele wat Mandrake Club u bied, dinge soos:"</div><div class='add'>+#~ "Mandriva Club, such as:"</div><div class='add'>+#~ msgstr "Slaan munt uit die voordele wat Mandriva Club u bied, dinge soos:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "TCP/IP"</div><div class='ctx'> #~ msgstr "TCP/IP"</div><div class='head'>diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po<br/>index 073769026..97def7d54 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/am.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/am.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/am.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/am.po</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> # Latest versions of po files are at http://www.mandrakelinux.com/l10n/am.php3</div><div class='del'>-# Copyright (C) 2004 Mandrakesoft SA</div><div class='add'>+# Copyright (C) 2004 Mandriva SA</div><div class='ctx'> # Alemayehu Gemeda &lt;alemayehu@gmx.at&gt;, 2004.</div><div class='ctx'> #</div><div class='ctx'> msgid ""</div><div class='hunk'>@@ -58,7 +58,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -77,7 +77,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +85,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -93,7 +93,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -217,7 +217,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1199,7 +1199,7 @@ msgstr "የመመሪያ ገጾች"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3438,7 +3438,7 @@ msgstr "የሬዲዮ ድጋፍ አስቻል"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3548,7 +3548,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3559,11 +3559,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3670,10 +3670,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3782,7 +3782,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -3880,12 +3880,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -3912,7 +3912,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -3921,7 +3921,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4050,7 +4050,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4068,7 +4068,7 @@ msgstr "የቀድሞው"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4097,7 +4097,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4113,7 +4113,7 @@ msgstr "የደህንነት ተቆጣጣሪ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4199,7 +4199,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4244,7 +4244,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4253,13 +4253,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4300,7 +4300,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4457,7 +4457,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4478,7 +4478,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4578,7 +4578,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4595,7 +4595,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4657,7 +4657,7 @@ msgstr "አገልግሎት"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4965,7 +4965,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5069,19 +5069,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5103,7 +5103,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5111,14 +5111,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5128,7 +5128,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5148,10 +5148,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5162,11 +5162,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5182,7 +5182,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5239,7 +5239,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5247,7 +5247,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5279,7 +5279,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -5781,7 +5781,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -5986,8 +5986,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "የMandrakelinux ተከላ %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "የMandrivalinux ተከላ %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -8546,7 +8546,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12102,7 +12102,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13766,18 +13766,18 @@ msgstr "አቁም"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr "ትርጉሙ &amp;ጅምር ነው"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "ወደ &lt;b&gt;Mandrakelinux&lt;/b&gt;! እንኳን ደህና መጡ"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "ወደ &lt;b&gt;Mandrivalinux&lt;/b&gt;! እንኳን ደህና መጡ"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -13786,7 +13786,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -13803,9 +13803,9 @@ msgstr ""</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -13825,7 +13825,7 @@ msgstr "ማስታወሻ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -13851,10 +13851,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -13873,8 +13873,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -13901,7 +13901,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -13911,7 +13911,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -13930,13 +13930,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13948,7 +13948,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -13962,19 +13962,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;የMandrakelinux ባለሞያ&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;የMandrivalinux ባለሞያ&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -13995,61 +13995,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14087,7 +14087,7 @@ msgstr "&lt;b&gt;የእድገት አካባቢዎች&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14108,7 +14108,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14225,7 +14225,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14460,14 +14460,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "አንቀጹን መሀል ኩልኩል አድርግ"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14489,21 +14489,21 @@ msgstr "Name=ኬዲኢ 1"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Online Store&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14526,20 +14526,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;የMandrakelinux ክለብ&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;የMandrivalinux ክለብ&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -14558,33 +14558,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -14607,32 +14607,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;የMandrakelinux ባለሞያ&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;የMandrivalinux ባለሞያ&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14923,8 +14923,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "&lt;b&gt;የMandrakelinux ባለሞያ&lt;/b&gt;"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "&lt;b&gt;የMandrivalinux ባለሞያ&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -15019,7 +15019,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15067,7 +15067,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17520,13 +17520,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "አንቀጹን መሀል ኩልኩል አድርግ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "የMandrakelinux ቁጥጥር ማእከል"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "የMandrivalinux ቁጥጥር ማእከል"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -17546,8 +17546,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17591,7 +17591,7 @@ msgstr "የማስተካከያው አራሚ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -17995,14 +17995,14 @@ msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -18053,7 +18053,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18338,7 +18338,7 @@ msgstr "ከውጭ አስገባ"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -18796,7 +18796,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -18823,7 +18823,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "አንቀጹን መሀል ኩልኩል አድርግ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -21797,7 +21797,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "/መሣሪያዎች/የነበረው ቀለሞች"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -22301,7 +22301,7 @@ msgstr "የቅርብ መረብ ማገናኛ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='head'>diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po<br/>index 0294842d3..335c10b3f 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/ar.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/ar.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/ar.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ar.po</a></div><div class='hunk'>@@ -71,13 +71,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "يبدو أن مفتاح USB محميّ من الكتابة عليه، إلّا أنّنا لانستطيع فكّ توصيله الآن.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "اضغط الزّر لإعادة تشغيل الجهاز، فُكّ توصيله، أزل حماية الكتابة،\n"</div><div class='del'>-"صِلْ المفتاح مرّة أخرى، وشغّل Mandrake Move مرّة أخرى."</div><div class='add'>+"صِلْ المفتاح مرّة أخرى، وشغّل Mandriva Move مرّة أخرى."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "مفتاح USB لا يحتوي على أي تجزيئات ويندوز (FAT).\n"</div><div class='hunk'>@@ -106,13 +106,13 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "يمكنك أيضاً التقدّم دون مفتاح USB - سوف لا تزال تكون\n"</div><div class='del'>-"قادراً على استخدام Mandrake Move كنظام تشغيل ماندريك حيّ."</div><div class='add'>+"قادراً على استخدام Mandriva Move كنظام تشغيل ماندريك حيّ."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -120,11 +120,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "لم نتمكّن من العثور على أي مفتاح USB على نظامك. إن قمت\n"</div><div class='del'>-"بوصْل مفتاح USB الآن، سوف يقدر Mandrake Move\n"</div><div class='add'>+"بوصْل مفتاح USB الآن، سوف يقدر Mandriva Move\n"</div><div class='ctx'> "أن يحفظ البيانات بدليلك المنزل بشفافية\n"</div><div class='ctx'> "وإعدادات النّظام العامّة، وذلك عند الإقلاع التّالي على هذا الجهاز\n"</div><div class='ctx'> "أو إقلاع آخر. ملاحظة: إن قمت بتوصيل مفتاح الآن، انتظر عدّة\n"</div><div class='hunk'>@@ -132,7 +132,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "يمكنك أيضاً التّقدّم بلا مفتاح USB - سوف تكون لا تزال\n"</div><div class='del'>-"قادراً على استخدام Mandrake Move كنظام تشغيل\n"</div><div class='add'>+"قادراً على استخدام Mandriva Move كنظام تشغيل\n"</div><div class='ctx'> "ماندريك حيّ."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -257,7 +257,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -273,7 +273,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "قد يحدث هذا بسبب ملفّات تهيئة النّظام الفاسدة\n"</div><div class='ctx'> "على مفتاح USB، في هذه الحالة فإن إزالتها ومن ثمّ\n"</div><div class='del'>-"إعادة تشغيل Mandrake Move قد يُصلح هذه المشكلة. كي تقوم\n"</div><div class='add'>+"إعادة تشغيل Mandriva Move قد يُصلح هذه المشكلة. كي تقوم\n"</div><div class='ctx'> "بذلك، اضغط على الزرّ المعنيّ.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1302,7 +1302,7 @@ msgstr "خيار اللغة"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3693,7 +3693,7 @@ msgstr "تمكين دعم الراديو"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3873,7 +3873,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3888,11 +3888,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4052,10 +4052,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4239,7 +4239,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4413,12 +4413,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4445,7 +4445,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4454,7 +4454,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4674,7 +4674,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4713,7 +4713,7 @@ msgstr "السابق "</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4753,7 +4753,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4782,7 +4782,7 @@ msgstr "مدير الأمن"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4940,7 +4940,7 @@ msgstr "التغيير إلى الوضع العادي/وضع الخبير"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5017,7 +5017,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5026,13 +5026,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "يتم تنشيط هذه الخطوة فقط إذا عُثر على تجزيء جنو/لينكس موجود\n"</div><div class='ctx'> "على ماكينتك.\n"</div><div class='hunk'>@@ -5110,7 +5110,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5394,7 +5394,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5415,7 +5415,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "الآن، حان وقت اختيار نظام الطباعة لحاسبك. قد توفّر أنظمة التشغيل الأخرى\n"</div><div class='hunk'>@@ -5560,7 +5560,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5577,7 +5577,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5706,7 +5706,7 @@ msgstr "الخدمات"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "اختر القرص الصلب الذي تريد محوه لتثبيت تجزيء\n"</div><div class='hunk'>@@ -6060,7 +6060,7 @@ msgstr "جاري حساب مساحة تجزيء ويندوز"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "تجزيء ويندوز الخاصّ بك كثير التجزّئات. رجاء أعد تشغيل جهازك إلى ويندوز، شغّل "</div><div class='hunk'>@@ -6179,19 +6179,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6213,7 +6213,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6221,14 +6221,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6238,7 +6238,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6258,10 +6258,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6272,11 +6272,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6292,7 +6292,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "مقدّمة\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6371,7 +6371,7 @@ msgstr ""</div><div class='ctx'> "تحتفظ ماندريكسوفت ش.م. بحقّها في تعديل أو تكييف المنتجات البرمجيّة، "</div><div class='ctx'> "بحذافيرها \n"</div><div class='ctx'> "أو أجزاء معيّنة منها، بشتّى الطّرق ولسائر الأغراض.\n"</div><div class='del'>-"\"Mandrake\" و \"Mandrakelinux\" والشّعارات المتعلّقة هي علاماتٌ تجاريّة "</div><div class='add'>+"\"Mandriva\" و \"Mandrivalinux\" والشّعارات المتعلّقة هي علاماتٌ تجاريّة "</div><div class='ctx'> "لماندريكسوفت ش.م. \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6476,7 +6476,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6484,7 +6484,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "تهانينا، التثبيت قد انتهى.\n"</div><div class='ctx'> "أزل وسيط الإقلاع و اضغط زر الإدخال لإعادة التشغيل.\n"</div><div class='hunk'>@@ -6532,7 +6532,7 @@ msgstr "الانتقال للخطوة `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -7072,7 +7072,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr "جاري الإتصال بموقع ماندريكلينكس للحصول على قائمة بالمرايا المتوفرة..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7293,7 +7293,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr "تثبيت ماندريكلينكس %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -9889,7 +9889,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13890,7 +13890,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15789,18 +15789,18 @@ msgstr "إيقاف"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ما هو ماندريكلينكس؟&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "أهلا بك في &lt;b&gt;ماندريكلينكس&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15812,7 +15812,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ماندريكلينكس هي توزيعة لينكس &lt;b&gt;الأسهل استخداماً&lt;/b&gt; حالياً. إنها أيضاً واحدة "</div><div class='hunk'>@@ -15831,9 +15831,9 @@ msgstr "أهلاً بك في &lt;b&gt;عالم المصدر المفتوح&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ماندريكلينكس هو نظام مخلص لنموذج المصدر المفتوح. هذا يعني أن هذا الإصدار "</div><div class='hunk'>@@ -15856,7 +15856,7 @@ msgstr "&lt;b&gt;رخصة GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "معظم البرامج المرفقة مع هذه التوزيعة وكل أدوات ماندريكلينكس مرخّصة ضمن "</div><div class='ctx'> "&lt;b&gt;الرخصة العموميّة الشاملة&lt;/b&gt;."</div><div class='hunk'>@@ -15889,10 +15889,10 @@ msgstr "&lt;b&gt;انضمّ إلى المجتمع&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "لدى ماندريكلينكس أحد &lt;b&gt;أكبر المجتمعات&lt;/b&gt; من المستخدمين والمطورين. دور "</div><div class='ctx'> "مجتمع كهذا هو واسع جداً، بدءً من تقرير العيوب البرمجية ووصولاً إلى تطوير "</div><div class='hunk'>@@ -15917,10 +15917,10 @@ msgstr "&lt;b&gt;نسخة التّنزيل&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"تقوم الآن بتثبيت &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. هذه هي النسخة المجانية التي "</div><div class='add'>+"تقوم الآن بتثبيت &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. هذه هي النسخة المجانية التي "</div><div class='ctx'> "تريد ماندريكسوفت إبقائها &lt;b&gt;متوفّرة للجميع&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15950,7 +15950,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "لن تستطيع الوصول إلى &lt;b&gt;الخدمات المرفقة&lt;/b&gt; في منتجات ماندريك الأخرى أيضاً."</div><div class='ctx'> </div><div class='hunk'>@@ -15961,8 +15961,8 @@ msgstr "&lt;b&gt;Discovery، سطح مكتب لينكس الأول&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "تقوم الآن بتثبيت &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "تقوم الآن بتثبيت &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15983,13 +15983,13 @@ msgstr "&lt;b&gt;PowerPack، سطح المكتب المُطلق للينكس&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "تقوم الآن بتثبيت &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "تقوم الآن بتثبيت &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16004,8 +16004,8 @@ msgstr "&lt;b&gt;PowerPack+، الحلّ لأسطح المكتب والخادمات&lt;/b</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "تقوم الآن بتثبيت &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "تقوم الآن بتثبيت &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16021,20 +16021,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;منتجات ماندريكسوفت&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "قامت &lt;b&gt;ماندريكسوفت&lt;/b&gt; بتطوير تشكيلة واسعة من منتجات &lt;b&gt;ماندريكلينكس&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr "منتجات ماندريكلينكس هي:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -16055,7 +16055,7 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;، حلّ لينكس لأسطح المكتب وال</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;ماندريكلينكس لأنظمة x86-64&lt;/b&gt;، حلّ ماندريكلينكس للحصول على أفضل نتيجة "</div><div class='hunk'>@@ -16063,13 +16063,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;منتجات ماندريكسوفت (منتجات نوماد)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "قامت ماندريكلينكس بتطوير منتجين يسمحان لك باستخدام ماندريكلينكس &lt;b&gt;على أي "</div><div class='hunk'>@@ -16078,14 +16078,14 @@ msgstr ""</div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr "\t* &lt;b&gt;Move&lt;/b&gt;، توزيعة ماندريكلينكس تشتغل بالكامل من قرص إقلاع مدمج."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;جلوب تروتر&lt;/b&gt;، وهي توزيعة ماندريكلينكس مُتثبيتة مسبقاً على “قرص لاسي "</div><div class='hunk'>@@ -16093,30 +16093,30 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;منتجات ماندريكسوفت (الحلول الاحترافيّة)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "أدناه هي منتجات ماندريكسوفت المُصمّمة لملائمة &lt;b&gt;احتياجاتك الاحترافيّة&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr "\t* &lt;b&gt;سطح المكتب المؤسّساتي&lt;/b&gt;، وهو سطح مكتب ماندريكلينكس للأعمال."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr "\t* &lt;b&gt;الخادم المؤسّساتي&lt;/b&gt;، وهو حلّ خادم ماندريكلينكس."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr "\t* &lt;b&gt;الجدار الناري للشبكات المتعدّدة&lt;/b&gt;، حلّ الأمن من ماندريكلينكس."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -16160,7 +16160,7 @@ msgstr "&lt;b&gt;اختر بيئة سطح مكتبك المفضّلة&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "مع PowerPack، سوف يكون لديك خيار &lt;b&gt;بيئة سطح المكتب الرسوميّة&lt;/b&gt;. اختارت "</div><div class='ctx'> "ماندريكسوفت &lt;b&gt;كيدي&lt;/b&gt; كبيئة افتراضيّة."</div><div class='hunk'>@@ -16187,7 +16187,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "باستخدام PowerPack+، سيتوفر لك خيار &lt;b&gt;سطح المكتب الرسومي&lt;/b&gt;. اختارت "</div><div class='ctx'> "ماندريكسوفت &lt;b&gt;كيدي&lt;/b&gt; كإفتراضي."</div><div class='hunk'>@@ -16314,7 +16314,7 @@ msgstr "&lt;b&gt;استمتع بالتشكيلة الواسعة من التطبيقا�</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "في قائمة ماندريكلينكس ستجد تطبيقات &lt;b&gt;سهلة الاستخدام&lt;/b&gt; ل&lt;b&gt;كل مهامّك&lt;/b&gt;:"</div><div class='hunk'>@@ -16568,14 +16568,14 @@ msgstr "\t* &lt;b&gt;Postfix&lt;/b&gt; و &lt;b&gt;Sendmail&lt;/b&gt;: خوادم البريد الأك�</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;مركز تحكّم ماندريكلينكس&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "&lt;b&gt;مركز تحكم ماندريكلينكس&lt;/b&gt; هي مجموعة أساسيّة من أدوات ماندريكلينكس الخاصّة "</div><div class='hunk'>@@ -16602,9 +16602,9 @@ msgstr "&lt;b&gt;نموذج المصدر المفتوح&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "كسائر ما يتعلّق ببرمجة الحاسبات، البرمجّيات المفتوحة المصدر  &lt;b&gt;تتطلّب وقتاً "</div><div class='hunk'>@@ -16621,7 +16621,7 @@ msgstr "&lt;b&gt;المتجر الآلي&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "للمزيد من المعلومات حول منتجات وخدمات ماندريكسوفت، يمكنك زيارة &lt;b&gt;منصّة "</div><div class='hunk'>@@ -16646,20 +16646,20 @@ msgstr "زُرْنا اليوم على &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr "&lt;b&gt;نادي ماندريك&lt;/b&gt; هو &lt;b&gt;المرافق الأمثل&lt;/b&gt; لمنتجك ماندريكلينكس."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr "اغتنم فرصة &lt;b&gt;الفوائد القيّمة&lt;/b&gt; بالانضمام إلى نادي ماندريك، مثل:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16681,39 +16681,39 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr "\t* الاشتراك في &lt;b&gt;منتديات المستخدمين&lt;/b&gt; لماندريكلينكس."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;وصول مبكّر وممتاز&lt;/b&gt;، قبل الإصدار العام، &lt;b&gt;لصور ISO&lt;/b&gt; لماندريك "</div><div class='ctx'> "لينكس."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; هي خدمة جديدة أولية تفخر ماندريك سوفت بتقديمها "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; هي خدمة جديدة أولية تفخر ماندريك سوفت بتقديمها "</div><div class='ctx'> "لزبائنها!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"يوفر Mandrakeonline تشكيلة واسعة من الخدمات القيّمة &lt;b&gt;للتحديث الميسّر&lt;/b&gt; "</div><div class='add'>+"يوفر Mandriva Online تشكيلة واسعة من الخدمات القيّمة &lt;b&gt;للتحديث الميسّر&lt;/b&gt; "</div><div class='ctx'> "لأنظمة ماندريكلينكس الخاصة بك:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16738,18 +16738,18 @@ msgstr "\t* تحديثات &lt;b&gt;مُجدولة&lt;/b&gt; مرنة."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr "\t* إدارة &lt;b&gt;كل أنظمة ماندريكلينكس خاصتك&lt;/b&gt; باستخدام حساب واحد."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "هل تتطلّب &lt;b&gt;مساعدة؟&lt;/b&gt; قابل خبراء ماندريكسوفت التقنيين على &lt;b&gt;موقع الدعم "</div><div class='hunk'>@@ -16758,7 +16758,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "بفضل مساعدة &lt;b&gt;خبراء ماندريكلينكس الأكفاء&lt;/b&gt;، سوف توفّر الكثير من الوقت."</div><div class='hunk'>@@ -16766,7 +16766,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "لأي سؤال متعلق بماندريكلينكس، يمكن شراء الدعم من خلال &lt;b&gt;store.mandrakesoft."</div><div class='hunk'>@@ -17068,7 +17068,7 @@ msgstr "أدوات مراقبة، محاسبة عمليّات، tcpdump، nmap،</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "مرشدو ماندريكسوفت"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -17220,7 +17220,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17289,14 +17289,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='del'>-"  --no-confirmation      لا تسأل سؤال التّأكيد فيوضع MandrakeUpdate\n"</div><div class='add'>+"  --no-confirmation      لا تسأل سؤال التّأكيد فيوضع Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        لا تتحقّق من توقيعات الحزم\n"</div><div class='ctx'> "  --changelog-first      عرض سجلّ التّغييرات قبل سرد الملفّات في نافذة الوصف\n"</div><div class='ctx'> "  --merge-all-rpmnew     اقترح دمج كلّ ملفّات .rpmnew/.rpmsave المعثور عليها"</div><div class='hunk'>@@ -20041,12 +20041,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "أداة تقرير العيوب في ماندريكلينكس"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "مركز تحكّم ماندريكلينكس"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -20067,8 +20067,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20112,7 +20112,7 @@ msgstr "مرشدو التهيئة"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr "اختيار أداة ماندريكسوفت:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -20537,7 +20537,7 @@ msgstr "يتم تشغيله عند الإقلاع"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "لم تتمّ تهيئة الواجهة بعد.\n"</div><div class='ctx'> "قم بتشغيل مساعد \"أضف واجهة\" من مركز تحكّم ماندريكلينكس"</div><div class='hunk'>@@ -20546,7 +20546,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ليست لديك أية وصلة إنترنت مهيئة.\n"</div><div class='ctx'> "شغّل مساعد \"%s\" من مركز تحكم ماندريكلينكس"</div><div class='hunk'>@@ -20599,7 +20599,7 @@ msgstr "KDM (مدير عرض كيدي("</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr "MdkKDM (مدير عرض ماندريكلينكس("</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -20898,7 +20898,7 @@ msgstr "استيراد"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21446,7 +21446,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21479,7 +21479,7 @@ msgstr " --doc &lt;link&gt;          - رابط بصفحة وب أخرى ( لـWM welc</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "مركز مساعدة ماندريكلينكس"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -25005,7 +25005,7 @@ msgstr "تم عمل التغيير، و لكن ليتم تفعيله يجب عل</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "سجلات أدوات ماندريكلينكس"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -25518,7 +25518,7 @@ msgstr "تم الإتصال."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "فشل الاتّصال.\n"</div><div class='ctx'> "تحقق من تهيئتك في مركز تحكّم ماندريكلينكس."</div><div class='hunk'>@@ -26388,11 +26388,11 @@ msgstr "فشل التّثبيت"</div><div class='ctx'> #~ msgid "http://www.mandrakelinux.com/en/101errata.php3"</div><div class='ctx'> #~ msgstr "http://www.mandrakelinux.com/en/101errata.php3"</div><div class='ctx'> </div><div class='del'>-#~ msgid "The Mandrakelinux 10.1 products are:"</div><div class='add'>+#~ msgid "The Mandrivalinux 10.1 products are:"</div><div class='ctx'> #~ msgstr "منتجات ماندريكلينكس 10.1 هي:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "\t* &lt;b&gt;Mandrakelinux 10.1 for x86-64&lt;/b&gt;, The Mandrakelinux solution for "</div><div class='add'>+#~ "\t* &lt;b&gt;Mandrivalinux 10.1 for x86-64&lt;/b&gt;, The Mandrivalinux solution for "</div><div class='ctx'> #~ "making the most of your 64-bit processor."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "\t* &lt;b&gt;ماندريكلينكس 10.1 لأنظمة x86-64&lt;/b&gt;، حلّ ماندريكلينكس للحصول على "</div><div class='head'>diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po<br/>index c867feae5..c7c8130e8 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/az.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/az.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/az.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/az.po</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # translation of DrakX-az.po to Azerbaijani Turkish</div><div class='ctx'> # DrakX-az.po faylının Azərbaycan dilinə tərcüməsi</div><div class='ctx'> # Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.</div><div class='del'>-# Copyright (c) 2000 Mandrakesoft</div><div class='add'>+# Copyright (c) 2000 Mandriva</div><div class='ctx'> # Vasif Ismailoglu MD&lt;azerb_linux@hotmail.com&gt; , 2000-2001</div><div class='ctx'> # Mətin Əmirov &lt;metin@karegen.com&gt;, 2001-2003, 2004.</div><div class='ctx'> #</div><div class='hunk'>@@ -63,7 +63,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -82,7 +82,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -90,7 +90,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -98,7 +98,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -226,7 +226,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1253,11 +1253,11 @@ msgstr "Dil seçkisi"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux müxtəlif dilləri dəstəkləyir. Qurmaq istədiyiniz\n"</div><div class='add'>+"Mandrivalinux müxtəlif dilləri dəstəkləyir. Qurmaq istədiyiniz\n"</div><div class='ctx'> "dilləri seçin. Onlar qurulum tamamlanandan və sistem yenidən\n"</div><div class='ctx'> "başlayandan sonra istifadəyə hazır olacaqlar."</div><div class='ctx'> </div><div class='hunk'>@@ -3654,12 +3654,12 @@ msgstr "radio dəstəyini fəallaşdır"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Davam etmədən əvvəl, diqqətlə lisenziyanın qaydalarını oxumalısınız. O,\n"</div><div class='del'>-"bütün Mandrakelinux distribusiyasını əhatə edir. Əgər lisenziyadakı bütün\n"</div><div class='add'>+"bütün Mandrivalinux distribusiyasını əhatə edir. Əgər lisenziyadakı bütün\n"</div><div class='ctx'> "qaydalarla razısınızsa, qutusunu \"%s\" işarələyin. Əgər razı deyilsəniz, "</div><div class='ctx'> "sadəcə olaraq kompüterinizi bağlayın."</div><div class='ctx'> </div><div class='hunk'>@@ -3849,13 +3849,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux qurulumu müxtəlif CD-lər üstündə gəlir. DrakX\n"</div><div class='add'>+"Mandrivalinux qurulumu müxtəlif CD-lər üstündə gəlir. DrakX\n"</div><div class='ctx'> "seçili paketlərin hansı CD'də olduğunu bilir ona görə də lazım olanda\n"</div><div class='ctx'> "hazırkı CD-ni çıxardıb sizdən lazım olan CD-ni daxil etməyi istəyəcək.\n"</div><div class='ctx'> "Əgər əlinizin altında istənən CD yoxdursa \"%s\" düyməsinə basın və istənən\n"</div><div class='hunk'>@@ -3865,11 +3865,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3921,11 +3921,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "İndi sisteminizə qurmaq istədiyiniz proqramları müəyyən etmə vaxtıdır.\n"</div><div class='del'>-"Mandrakelinux daxilində minlərcə proqram mövcuddur və idarələrinin\n"</div><div class='add'>+"Mandrivalinux daxilində minlərcə proqram mövcuddur və idarələrinin\n"</div><div class='ctx'> "asan olması üçün onlar bənzər paketlər qruplarına ayrılıblar.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Paketlər sisteminizin xüsusui istifadə sahəsinə görə qruplanıb.\n"</div><div class='del'>-"Mandrakelinuxda dörd əvvəldən müəyyən edilmiş qurulum növü mövcuddur.\n"</div><div class='add'>+"Mandrivalinuxda dörd əvvəldən müəyyən edilmiş qurulum növü mövcuddur.\n"</div><div class='ctx'> "Yalnız siz bu qrupları yenə də qarışdıra bilərsiniz və istədiyiniz əlavə.\n"</div><div class='ctx'> "proqramları seçə bilərsiniz. Misal üçün ''İş Stansiyası'' qurulumu\n"</div><div class='ctx'> "``İnkişaf'' qurulumundakı proqramları daxil edə bilər.\n"</div><div class='hunk'>@@ -4021,10 +4021,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4056,7 +4056,7 @@ msgstr ""</div><div class='ctx'> "verici\n"</div><div class='ctx'> "seçilsə, sizə bu vericini həqiqətən də qurmaq istədiyinizi soruşan və "</div><div class='ctx'> "sizdən\n"</div><div class='del'>-"təsdiq istəyən pəncərə göstəriləcək. Əsas olaraq Mandrakelinux bütün qurulu\n"</div><div class='add'>+"təsdiq istəyən pəncərə göstəriləcək. Əsas olaraq Mandrivalinux bütün qurulu\n"</div><div class='ctx'> "olan xidmətləri açılışda fəal edir. Distribusiyanın çıxdığı vaxt onların "</div><div class='ctx'> "bilinən heç bir\n"</div><div class='ctx'> "xətası ya da təhlükəli yanı olmasa da, mümkündür ki, müəyyən vaxt sonra\n"</div><div class='hunk'>@@ -4067,7 +4067,7 @@ msgstr ""</div><div class='ctx'> "xidmət sisteminizə qurulacaq və sisteminizin açılışında fəal hala "</div><div class='ctx'> "gətiriləcək.\n"</div><div class='ctx'> "Qeyd: Xidmətlərin açılışda fəal olub olmamasını qurulum bitdikdən sonra da\n"</div><div class='del'>-"Mandrakelinux İdarə Mərkəzindən quraşdıra bilərsiniz!!\n"</div><div class='add'>+"Mandrivalinux İdarə Mərkəzindən quraşdıra bilərsiniz!!\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\"%s\" seçimi, bir proqramı seçdiyiniz zaman qurulum proqramının o proqram "</div><div class='ctx'> "ilə\n"</div><div class='hunk'>@@ -4221,7 +4221,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4276,7 +4276,7 @@ msgid ""</div><div class='ctx'> "not successful in getting the display configured."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (X Pəncərə Sistemi) GNU/Linuks qrafiki ara üzünün qəlbidir.\n"</div><div class='del'>-"Mandrakelinuxla bərabər gələn qrafiki mühitlərin hamısı (KDE, \n"</div><div class='add'>+"Mandrivalinuxla bərabər gələn qrafiki mühitlərin hamısı (KDE, \n"</div><div class='ctx'> "GNOME, AfterStep, WindowMaker, vs.) buna bağlıdır.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Optimal görünüşü almaq üçün sizə dəyişdiriləcək fərqli parametrlər\n"</div><div class='hunk'>@@ -4396,12 +4396,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4428,7 +4428,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4437,7 +4437,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4457,10 +4457,10 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Bu nöqtədə Mandrakelinuxi sabit diskinizdə haraya quracağınıza\n"</div><div class='add'>+"Bu nöqtədə Mandrivalinuxi sabit diskinizdə haraya quracağınıza\n"</div><div class='ctx'> "qərar verəcəksiniz. Əgər diskiniz boş isə və ya bir başqa sistem\n"</div><div class='del'>-"bütün yeri doldurmuş isə, o zaman diskinizdə Mandrakelinux üçün\n"</div><div class='del'>-"yer açmalısınız. Bölmələndirmə əsasən diskinizdə Mandrakelinuxu\n"</div><div class='add'>+"bütün yeri doldurmuş isə, o zaman diskinizdə Mandrivalinux üçün\n"</div><div class='add'>+"yer açmalısınız. Bölmələndirmə əsasən diskinizdə Mandrivalinuxu\n"</div><div class='ctx'> "qurmaqməntiqi sürücülər yaratmaqdan ibarətdir.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ümumiyyətlə bölmələndirmənin təsiri geri dönülməzdir və mə'lumat\n"</div><div class='hunk'>@@ -4495,7 +4495,7 @@ msgstr ""</div><div class='ctx'> "'Scandisk' və\n"</div><div class='ctx'> "'Defraq' əmrlərinin icra edilməsinir. Eyni zamanda mə'lumatlarınızın ehtiyat "</div><div class='ctx'> "nüsxəsini almayı\n"</div><div class='del'>-"da qətiyyən unutmayın. Kompüteriniz üstündə həm Mandrakelinux həm də "</div><div class='add'>+"da qətiyyən unutmayın. Kompüteriniz üstündə həm Mandrivalinux həm də "</div><div class='ctx'> "Microsoft\n"</div><div class='ctx'> "Windows ƏS'lərini işlətmək istəyirsinizsə bu seçənəyi seçin. Unutmayın ki "</div><div class='ctx'> "Microsoft\n"</div><div class='hunk'>@@ -4508,7 +4508,7 @@ msgstr ""</div><div class='ctx'> "bölməniz əvvəlkindən daha kiçik olacaq.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": əgər sisteminizdəki bütün mövcud bölmələri silmək və yerinə\n"</div><div class='del'>-"Mandrakelinux sistemini qurmaq istəyirsinizsə bu seçənəyi seçin.\n"</div><div class='add'>+"Mandrivalinux sistemini qurmaq istəyirsinizsə bu seçənəyi seçin.\n"</div><div class='ctx'> "Diqqətli olun, ona görə ki seçiminizi təsdiqlədikdən sonra geri ala "</div><div class='ctx'> "bilməyəcəksiniz.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4670,7 +4670,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4693,7 +4693,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Bölmələri şəkilləndirməyə hazır olanda \"%s\" düyməsini basın.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Yeni Mandrakelinux sisteminizi qurmaq üçün başqa bölmə seçmək\n"</div><div class='add'>+"Yeni Mandrivalinux sisteminizi qurmaq üçün başqa bölmə seçmək\n"</div><div class='ctx'> "istəyirsinizsə \"%s\" düyməsinə basın.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Üstündəki xəsərli blokların yoxlanmasını istədiyiniz bölmələri seçmək\n"</div><div class='hunk'>@@ -4711,7 +4711,7 @@ msgstr "Əvvəlki"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4723,7 +4723,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinuxu qurduğunuz vaxtda çox güman ki bə'zi paketlər \n"</div><div class='add'>+"Mandrivalinuxu qurduğunuz vaxtda çox güman ki bə'zi paketlər \n"</div><div class='ctx'> "ilk çıxışlarından sonra yenilənmiş ola bilər. Bunlarla bir çox xəta "</div><div class='ctx'> "düzəldilmiş\n"</div><div class='ctx'> "ya da təhlükəsizlik qüvvətləndirilmiş ola bilər. Bu yeniləmələrdən istifadə\n"</div><div class='hunk'>@@ -4753,7 +4753,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4777,7 +4777,7 @@ msgstr "Təhlükəsizlik İdarəçisi"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4847,7 +4847,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Bu nöqtədə siz Mandrakelinux yüklənəcək bölmə(lər)i seçməlisiniz. Əgər\n"</div><div class='add'>+"Bu nöqtədə siz Mandrivalinux yüklənəcək bölmə(lər)i seçməlisiniz. Əgər\n"</div><div class='ctx'> "bölmələr əvvəldən mövcuddursa (sistemdə əvvəllər qurulu olan GNU/Linuks \n"</div><div class='ctx'> "bölmələri və ya başqa bölmələndirmə vasitələri ilə hazırladığınız "</div><div class='ctx'> "bölmələr),\n"</div><div class='hunk'>@@ -4942,7 +4942,7 @@ msgstr "Normal modla mütəxəssis modu arasında keç"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4971,7 +4971,7 @@ msgid ""</div><div class='ctx'> "disk or partition is called \"C:\")."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sürücünüzdə bir və ya daha çox Microsoft bölməsi tapıldı.\n"</div><div class='del'>-"Xahiş edirik, Mandrakelinuxi qurmaq üçün onlardan hansını\n"</div><div class='add'>+"Xahiş edirik, Mandrivalinuxi qurmaq üçün onlardan hansını\n"</div><div class='ctx'> "yenidən ölçüləndirmək istədiyinizi seçin.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Hər bölmə bu cür sıralanıb; \"Linuks adı\",\"Windows adı\"\n"</div><div class='hunk'>@@ -5020,7 +5020,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5029,18 +5029,18 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bu addım, yalnız sisteminizdə daha əvvəldən qurulu olan GNU/Linuks bölməsi\n"</div><div class='ctx'> "tapılanda fəal olur.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"DrakX indi mövcud Mandrakelinux sisteminizi yeniləmək mi, yoxsa yenidən\n"</div><div class='add'>+"DrakX indi mövcud Mandrivalinux sisteminizi yeniləmək mi, yoxsa yenidən\n"</div><div class='ctx'> "qurmaq mı istədiyinizi bilməlidir.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Bu seçim köhnə sistemi tamamilə siləcək. Əgər sabit "</div><div class='hunk'>@@ -5050,13 +5050,13 @@ msgstr ""</div><div class='ctx'> "bu seçimi seçin. Yalnız, bölmələndirmə sxeminizdən aslı olaraq bə'zi mövcud\n"</div><div class='ctx'> "mə'lumatlarınızın üstündən yazılmasının qabağını ala bilərsiniz.\n"</div><div class='ctx'> "\n"</div><div class='del'>-" * \"%s\": Hazırkı Mandrakelinux sisteminizdə qurulu olan paketləri "</div><div class='add'>+" * \"%s\": Hazırkı Mandrivalinux sisteminizdə qurulu olan paketləri "</div><div class='ctx'> "yeniləmə\n"</div><div class='ctx'> "imkanı verir. Qurulum hazırkı bölmələmə sxemi və istifadəçi mə'lumat və "</div><div class='ctx'> "sənədlərinə\n"</div><div class='ctx'> "dəyməyəcək və dəyişdirməyəcək. Digər qurulum addımlarının çoxu isə standart\n"</div><div class='ctx'> "qurulumdakının eynisi olacaq. Bu seçimi \"8.1\" versiyasından əvvəlki "</div><div class='del'>-"Mandrakelinuxlarda\n"</div><div class='add'>+"Mandrivalinuxlarda\n"</div><div class='ctx'> "tədbiq etmək uyğun görülmür."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -5115,7 +5115,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5369,7 +5369,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5390,12 +5390,12 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "İndi kompüteriniz üçün çap sistemini seçmə vaxtı gəldi. Digər ƏS'ləri sizə "</div><div class='ctx'> "bir\n"</div><div class='del'>-"dənəsini təqdim edə bilərlər, yalnız Mandrakelinux ikisini təqdim edir.\n"</div><div class='add'>+"dənəsini təqdim edə bilərlər, yalnız Mandrivalinux ikisini təqdim edir.\n"</div><div class='ctx'> "Hər çap sistemi xüsusi quraşdırma növləri üçün uyğundur.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- bu seçim``çap et, növbəyə alma'' mə'nasına gəlir.\n"</div><div class='hunk'>@@ -5413,7 +5413,7 @@ msgstr ""</div><div class='ctx'> "əmin oun. .\"%s\" eyni zamanda çapçının quraşdırılması və idarəsi və çap\n"</div><div class='ctx'> "üçün qrafiki ara üzlərə də sahibdir. \n"</div><div class='ctx'> "Əgər indi birisini seçib sonra çap sistemini bəyənməzsəniz, onu "</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "İdarə Mərkəzindəki PrinterDrake bölməsindəki mütəxəssis düyməsi vasitəsiylə\n"</div><div class='ctx'> "dəyişdirə bilərsiniz."</div><div class='ctx'> </div><div class='hunk'>@@ -5531,7 +5531,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5548,7 +5548,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5674,10 +5674,10 @@ msgstr "Xidmətlər"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Yeni Mandrakelinux'izi qurmaq üçün silmək istədiyiniz sürücünü seçin.\n"</div><div class='add'>+"Yeni Mandrivalinux'izi qurmaq üçün silmək istədiyiniz sürücünü seçin.\n"</div><div class='ctx'> "Diqqətli olun, sürücüdəki bütün mə'lumatlar silinəcək\n"</div><div class='ctx'> "və geri gəlməyəcək!"</div><div class='ctx'> </div><div class='hunk'>@@ -6024,11 +6024,11 @@ msgstr "Windows bölməsin böyüklüyü hesablanır"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Windows bölümünüz çox dağınıqdır. Daxiş edirik, əvvəlcə kompüterinizi "</div><div class='del'>-"Windows ilə açın, ''defrag'' vasitəsini işlədin, sonra Mandrakelinux "</div><div class='add'>+"Windows ilə açın, ''defrag'' vasitəsini işlədin, sonra Mandrivalinux "</div><div class='ctx'> "qurulumunu yenidən başladın."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6143,19 +6143,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6177,7 +6177,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6185,14 +6185,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6202,7 +6202,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6222,10 +6222,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6236,11 +6236,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6256,7 +6256,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Giriş\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6266,14 +6266,14 @@ msgstr ""</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Lisenziya Müqaviləsi\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6295,7 +6295,7 @@ msgstr ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6303,14 +6303,14 @@ msgstr ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6320,7 +6320,7 @@ msgstr ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6340,10 +6340,10 @@ msgstr ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6354,11 +6354,11 @@ msgstr ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Hökümət Qanunları \n"</div><div class='hunk'>@@ -6374,7 +6374,7 @@ msgstr ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6464,7 +6464,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6472,21 +6472,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Təbrik edirik, qurulum başa çatdı.\n"</div><div class='ctx'> "Cdrom və disketi çıxartdıqtan sonra Enter'ə basaraq kompüterinizi\n"</div><div class='ctx'> "yenidən başladın.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux'in bu buraxılışındakı yamaqlar haqqında \n"</div><div class='add'>+"Mandrivalinux'in bu buraxılışındakı yamaqlar haqqında \n"</div><div class='ctx'> "mə'lumat almaq üçün bu ünvana baxın: \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Sisteminizin qurğuları haqqında daha geniş mə'lumatı Rəsmi\n"</div><div class='del'>-"Mandrakelinux İstifadəçi Kitabcığının qurulum sonrası bölməsində\n"</div><div class='add'>+"Mandrivalinux İstifadəçi Kitabcığının qurulum sonrası bölməsində\n"</div><div class='ctx'> "tapa bilərsiniz."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6522,7 +6522,7 @@ msgstr "Başlanğıc addımı `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -7064,9 +7064,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mövcud əkslərin siyahısını almaq üçün Mandrakelinux səhifəsi ilə təmas "</div><div class='add'>+"Mövcud əkslərin siyahısını almaq üçün Mandrivalinux səhifəsi ilə təmas "</div><div class='ctx'> "qurulur..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7286,8 +7286,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux Qurulumu %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux Qurulumu %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9873,13 +9873,13 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall quraşdırıcısı\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Bu, Mandrakelinux sisteminiz üçün şəxsi bir atəş divarını quraşdıracaq.\n"</div><div class='add'>+"Bu, Mandrivalinux sisteminiz üçün şəxsi bir atəş divarını quraşdıracaq.\n"</div><div class='ctx'> "Daha güclü və e'tibarlı sistem üçün xahiş edirik, xüsusi MandrakeSecurity\n"</div><div class='ctx'> "Firewall buraxılışı ilə maraqlanın."</div><div class='ctx'> </div><div class='hunk'>@@ -12517,7 +12517,7 @@ msgstr ""</div><div class='ctx'> "ümumiyyətlə \"Fayl\" menyusunda yer alır).\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Əgər çapçı ilə əlaqəli hər hansı bir qurğu yerinə gətirmək, ya da yeni çapçı "</div><div class='del'>-"əlavə etmək / çapçı silmək istəyirsinizsə, Mandrakelinux İdarə Mərkəzindəki "</div><div class='add'>+"əlavə etmək / çapçı silmək istəyirsinizsə, Mandrivalinux İdarə Mərkəzindəki "</div><div class='ctx'> "\"Avadanlıq\" bölməsində yer alan in the \"Çapçı\" düyməsini istifadə edin."</div><div class='ctx'> </div><div class='ctx'> #: printer/printerdrake.pm:1207 printer/printerdrake.pm:1437</div><div class='hunk'>@@ -13835,7 +13835,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14108,9 +14108,9 @@ msgid ""</div><div class='ctx'> "also using the %s Control Center, section \"Hardware\"/\"Printer\""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Qurulum sırasında edilən şəbəkə quraşdırılması indi başladıla bilməz. Xahiş "</div><div class='del'>-"dirik, sistem açılandan sonra şəbəkənin işlədiyini yoxlayın və Mandrakelinux "</div><div class='add'>+"dirik, sistem açılandan sonra şəbəkənin işlədiyini yoxlayın və Mandrivalinux "</div><div class='ctx'> "İdarə Mərkəzindəki Şəbəkə və İnternet bölməsindən qurğuları düzəldin, və "</div><div class='del'>-"ondan sonra yenə də Mandrakelinux İdarə Mərkəzindəki \"Avadanlıq\"/\"Çapçı\" "</div><div class='add'>+"ondan sonra yenə də Mandrivalinux İdarə Mərkəzindəki \"Avadanlıq\"/\"Çapçı\" "</div><div class='ctx'> "bölməsindən çapçınızı qurun."</div><div class='ctx'> </div><div class='ctx'> #: printer/printerdrake.pm:4196</div><div class='hunk'>@@ -15736,18 +15736,18 @@ msgstr "Dayandır"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Nədir?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Nədir?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux&lt;/b&gt; Xoş Gəldiniz!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux&lt;/b&gt; Xoş Gəldiniz!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15756,7 +15756,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15773,9 +15773,9 @@ msgstr "Açıq Mənbə Dünyasına Xoş Gəldiniz!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15795,7 +15795,7 @@ msgstr "&lt;b&gt;Qeyd&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15816,15 +15816,15 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Join the Community&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux cəmiyyətinə qoşulun!&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux cəmiyyətinə qoşulun!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15838,13 +15838,13 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Download Version&lt;/b&gt;"</div><div class='del'>-msgstr "Bu Mandrakelinux &lt;b&gt;Endirmə buraxılışıdır&lt;/b&gt;."</div><div class='add'>+msgstr "Bu Mandrivalinux &lt;b&gt;Endirmə buraxılışıdır&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15871,7 +15871,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15881,7 +15881,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15900,13 +15900,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15918,7 +15918,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15932,20 +15932,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux Yeniləmələri Appleti"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux Yeniləmələri Appleti"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15965,61 +15965,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -16057,7 +16057,7 @@ msgstr "&lt;b&gt;Qrafiki Masa Üstü Mühitinizi Seçin!&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -16078,7 +16078,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16195,7 +16195,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16436,14 +16436,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux İdarə Mərkəzi&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux İdarə Mərkəzi&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16465,9 +16465,9 @@ msgstr "&lt;b&gt;KDE Seçimi&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16479,7 +16479,7 @@ msgstr "&lt;b&gt;MandrakeStore&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16502,20 +16502,20 @@ msgstr "Bugün &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; ünvanını ziyarət edin"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16534,33 +16534,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr "\t* &lt;b&gt;Kopete&lt;/b&gt; ilə onlayn söhbətdə yer alın"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Mandrake Onlayn&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16583,32 +16583,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16906,8 +16906,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -17043,7 +17043,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17115,14 +17115,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[SEÇİM]...\n"</div><div class='del'>-"  --no-confirmation      MandrakeUpdate modundabirinci təsdiqləmə  sualını "</div><div class='add'>+"  --no-confirmation      Mandriva Update modundabirinci təsdiqləmə  sualını "</div><div class='ctx'> "soruşma\n"</div><div class='ctx'> "  --no-verify-rpm        paket imzalarını yoxlama\n"</div><div class='ctx'> "  --changelog-first      izahat pəncərəsində fayl siyahısından əvvəl "</div><div class='hunk'>@@ -19863,13 +19863,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux Xəta Raportlama Vasitəsi"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux Xəta Raportlama Vasitəsi"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux İdarə Mərkəzi"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux İdarə Mərkəzi"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19889,7 +19889,7 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr "Mandrake Onlayn"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -19934,7 +19934,7 @@ msgstr "Quraşdırma Sehirbazları"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -20354,7 +20354,7 @@ msgstr "Açılışda başladılır"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "BU ara üz hələlik quraşdırılmayıb.\n"</div><div class='ctx'> "Ana pəncərədə quraşdırma sehirbazını işə salın"</div><div class='hunk'>@@ -20363,7 +20363,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "BU ara üz hələlik quraşdırılmayıb.\n"</div><div class='ctx'> "Ana pəncərədə quraşdırma sehirbazını işə salın"</div><div class='hunk'>@@ -20416,7 +20416,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -20713,7 +20713,7 @@ msgstr "İdxal Et"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20722,7 +20722,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Müəllif Hüququ (C) 2001-2002 Mandrakesoft \n"</div><div class='add'>+"Müəllif Hüququ (C) 2001-2002 Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (orijinal buraxılış)\n"</div><div class='hunk'>@@ -21248,14 +21248,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Müəllif Hüququ (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Müəllif Hüququ (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Bu sərbəst tə'minatdır və yalnız GNU GPL qaydaları altında paylana bilər.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "İstifadə qaydası: \n"</div><div class='hunk'>@@ -21284,8 +21284,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux İdarə Mərkəzi"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux İdarə Mərkəzi"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24288,7 +24288,7 @@ msgid ""</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Bu HardDrake'dir, Mandrakelinux avadanlıq quraşdırma vasitəsi.\n"</div><div class='add'>+"Bu HardDrake'dir, Mandrivalinux avadanlıq quraşdırma vasitəsi.\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Buraxılış:&lt;/span&gt; %s\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Müəllif:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -24399,8 +24399,8 @@ msgstr "Dəyişikliklər edildi, ancaq effektiv olmaq üçün yenidən giriş ed</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux Vasitələrinin İzahatı"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux Vasitələrinin İzahatı"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24913,10 +24913,10 @@ msgstr "Bağlantı tamamlandı."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bağlantı iflas etdi.\n"</div><div class='del'>-"Mandrakelinux İdarə Mərkəzindən qurğularınızı yoxlayın."</div><div class='add'>+"Mandrivalinux İdarə Mərkəzindən qurğularınızı yoxlayın."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25153,7 +25153,7 @@ msgstr "Quraşdırılmış darayıcıların siyahısı yenidən yaradılır ..."</div><div class='ctx'> #: standalone/scannerdrake:101</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported by this version of %s."</div><div class='del'>-msgstr "%s Mandrakelinuxun bu buraxılışı tərəfindən dəstəklənmir."</div><div class='add'>+msgstr "%s Mandrivalinuxun bu buraxılışı tərəfindən dəstəklənmir."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:104</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25194,7 +25194,7 @@ msgstr ""</div><div class='ctx'> #: standalone/scannerdrake:144</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported under Linux."</div><div class='del'>-msgstr "%s Mandrakelinuxun bu buraxılışı tərəfindən dəstəklənmir."</div><div class='add'>+msgstr "%s Mandrivalinuxun bu buraxılışı tərəfindən dəstəklənmir."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:171 standalone/scannerdrake:185</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25295,7 +25295,7 @@ msgid ""</div><div class='ctx'> "You can launch printerdrake from the %s Control Center in Hardware section."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "%s printerdrake tərəfindən quraşdırılmalıdır.\n"</div><div class='del'>-"Printerdrake'ni Mandrakelinux İdarə Mərkəzindəki Avadanlıq bölməsindən işə "</div><div class='add'>+"Printerdrake'ni Mandrivalinux İdarə Mərkəzindəki Avadanlıq bölməsindən işə "</div><div class='ctx'> "sala bilərsiniz."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:308 standalone/scannerdrake:315</div><div class='head'>diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po<br/>index d453b7fc0..4aae21be1 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/be.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/be.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/be.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/be.po</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> # SOME DESCRIPTIVE TITLE.</div><div class='del'>-# Copyright (C) 1999 Mandrakesoft.</div><div class='add'>+# Copyright (C) 1999 Mandriva.</div><div class='ctx'> # Alexander Bokovoy &lt;ab@avilink.net&gt;, 2000</div><div class='ctx'> # Maryia Davidouskaia &lt;maryia@scientist.com&gt;, 2000</div><div class='ctx'> msgid ""</div><div class='hunk'>@@ -58,7 +58,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -77,7 +77,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +85,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -93,7 +93,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -219,7 +219,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1226,7 +1226,7 @@ msgstr "Выбар мовы"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "Вы можаце абраць іншыя мовы, якія будуць даступны пасля ўсталявання"</div><div class='hunk'>@@ -3476,7 +3476,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3586,7 +3586,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3597,11 +3597,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3708,10 +3708,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3820,7 +3820,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -3918,12 +3918,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -3950,7 +3950,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -3959,7 +3959,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4088,7 +4088,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4106,7 +4106,7 @@ msgstr "прылада"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4135,7 +4135,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4151,7 +4151,7 @@ msgstr "Сістэмнае адміністраваньне"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4237,7 +4237,7 @@ msgstr "Звычайны рэжым"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4282,7 +4282,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4291,13 +4291,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4338,7 +4338,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4495,7 +4495,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4516,7 +4516,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4616,7 +4616,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4633,7 +4633,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4695,7 +4695,7 @@ msgstr "Сэрвісы"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5018,7 +5018,7 @@ msgstr "Выкарыстоўваць незанятую прастору на р</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ваш раздзел з Windows занадта фрагментаваны. \n"</div><div class='hunk'>@@ -5126,19 +5126,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5160,7 +5160,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5168,14 +5168,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5185,7 +5185,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5205,10 +5205,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5219,11 +5219,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5239,7 +5239,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5296,7 +5296,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5304,7 +5304,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5340,12 +5340,12 @@ msgstr "Пераход на крок ‛%s’\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "У Вашай сістэме маецца недахоп рэсурсаў, таму магчымы праблемы\n"</div><div class='del'>-"пры ўсталяванні Mandrakelinux. У гэтым выпадку паспрабуйце тэкставую\n"</div><div class='add'>+"пры ўсталяванні Mandrivalinux. У гэтым выпадку паспрабуйце тэкставую\n"</div><div class='ctx'> "праграму ўсталявання. Для гэтага націсніце ‛F1’ у час загрузкі, а потым\n"</div><div class='ctx'> "набярыце ‛text’ і націсніце &lt;ENTER&gt;."</div><div class='ctx'> </div><div class='hunk'>@@ -5862,7 +5862,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6071,8 +6071,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Усталяванне Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Усталяванне Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -8640,7 +8640,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12214,7 +12214,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13942,18 +13942,18 @@ msgstr "Спыніць"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Сардэчна запрашаем у &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Сардэчна запрашаем у &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -13962,7 +13962,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -13979,9 +13979,9 @@ msgstr ""</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14001,7 +14001,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14027,10 +14027,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14049,8 +14049,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14077,7 +14077,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14087,7 +14087,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14106,13 +14106,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14124,7 +14124,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14138,19 +14138,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "Цэнтар кіраваньня"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14171,61 +14171,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14263,7 +14263,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14284,7 +14284,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14401,7 +14401,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14636,14 +14636,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "Цэнтар кіраваньня"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14665,9 +14665,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14679,7 +14679,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14702,20 +14702,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr "Цэнтар кіраваньня"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -14734,33 +14734,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "Цэнтар кіраваньня"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -14783,32 +14783,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr "Цэнтар кіраваньня"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15107,7 +15107,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "Цэнтар кіраваньня"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -15222,7 +15222,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15270,7 +15270,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17724,12 +17724,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Дастасаваньне для кіраваньня карыстальнікамі Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Дастасаваньне для кіраваньня карыстальнікамі Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "Цэнтар кіраваньня"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -17750,7 +17750,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -17795,7 +17795,7 @@ msgstr "Канфігурацыя"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18201,14 +18201,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -18259,7 +18259,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18544,7 +18544,7 @@ msgstr "Імпарт"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19023,7 +19023,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -19050,7 +19050,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Цэнтар кіраваньня"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -22030,7 +22030,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Цэнтар кіраваньня"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -22534,7 +22534,7 @@ msgstr "Імя злучэння"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -23360,7 +23360,7 @@ msgstr "Усталяванне SILO"</div><div class='ctx'> #~ msgstr "(ужо дададзена %s)"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='ctx'> #~ msgstr "Цэнтар кіраваньня"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='head'>diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po<br/>index d5d1d393c..f670bd9ca 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/bg.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/bg.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/bg.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/bg.po</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> # translation of DrakX-bg.po to Bulgarian</div><div class='ctx'> # Copyright (C) 2000,2003 Free Software Foundation, Inc.</div><div class='del'>-# Copyright (c) 2000 Mandrakesoft</div><div class='add'>+# Copyright (c) 2000 Mandriva</div><div class='ctx'> # Bozhan Boiadzhiev &lt;bozhan@plov.omega.bg&gt;, 2000.</div><div class='ctx'> # Borislav Aleksandrov &lt;B.Aleksandrov@cnsys.bg&gt;, 2003.</div><div class='ctx'> # Boyan Ivanov &lt;boyan17@bulgaria.com&gt;, 2003.</div><div class='hunk'>@@ -63,7 +63,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -82,7 +82,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -90,7 +90,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -98,7 +98,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -224,7 +224,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1245,11 +1245,11 @@ msgstr "ръчно"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux може да подържа много езици. Изберете\n"</div><div class='add'>+"Mandrivalinux може да подържа много езици. Изберете\n"</div><div class='ctx'> "езиците които искате ад инсталирате. Те ще бъдат налични след\n"</div><div class='ctx'> "като завърши инсталацията и вие престартирате системата."</div><div class='ctx'> </div><div class='hunk'>@@ -3564,13 +3564,13 @@ msgstr "разрешава подръжка на радио"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Преди да продължите, трябва внимателно да прочетете условията на лиценза. "</div><div class='ctx'> "Той\n"</div><div class='del'>-"покрива цялата Mandrakelinux дистрибуция, и, ако сте съгласни с всички "</div><div class='add'>+"покрива цялата Mandrivalinux дистрибуция, и, ако сте съгласни с всички "</div><div class='ctx'> "условия\n"</div><div class='ctx'> "в него, сложете отметка на \"%s\".Ако не сте съгласни,просто спрете "</div><div class='ctx'> "компютъра си."</div><div class='hunk'>@@ -3757,13 +3757,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Инсталацията на Mandrakelinux е разположена на няколко CDROM-а. DrakX\n"</div><div class='add'>+"Инсталацията на Mandrivalinux е разположена на няколко CDROM-а. DrakX\n"</div><div class='ctx'> "знае дали избран пакет не се намира на друг CDROM,така че ще извади "</div><div class='ctx'> "текущото\n"</div><div class='ctx'> "CD и ще ви остави да вкарате това, от което има нужда."</div><div class='hunk'>@@ -3772,11 +3772,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3828,7 +3828,7 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Сега е моментът да определите кои програми искате да бъдат инсталирани на\n"</div><div class='del'>-"системата ви. В Mandrakelinux дистрибуцията има хиляди пакети, но не е\n"</div><div class='add'>+"системата ви. В Mandrivalinux дистрибуцията има хиляди пакети, но не е\n"</div><div class='ctx'> "задължително да ги знаете наизуст.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ако извършвате стандартна инстлация от CDROM, първо ще бъдете попитани кои\n"</div><div class='hunk'>@@ -3924,10 +3924,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3963,10 +3963,10 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Ако е избран сървърен пакет, било то умишлено или защото е част от цяла\n"</div><div class='ctx'> "група, ще бъдете помолени за потвърждение, че наистина искате този сървър\n"</div><div class='del'>-"да бъде инсталиран. В Mandrakelinux, всички сървъри тръгват по подразбиране\n"</div><div class='add'>+"да бъде инсталиран. В Mandrivalinux, всички сървъри тръгват по подразбиране\n"</div><div class='ctx'> "при зареждане.Даже ако са сигурни и нямат известни проблеми, когато\n"</div><div class='ctx'> "дистрибуцията се разпространява, може да се случи така, че да се появят\n"</div><div class='del'>-"дупки в сигурността, след като версията на Mandrakelinux е завършена. Ако\n"</div><div class='add'>+"дупки в сигурността, след като версията на Mandrivalinux е завършена. Ако\n"</div><div class='ctx'> "не знаете за какво служи определена услуга или защо е инсталирана, цъкнете\n"</div><div class='ctx'> "\"Не\". С цъкане на \"Да\"  ще инсталирате изброени услуги и те ще бъдат\n"</div><div class='ctx'> "стартирани автоматично по подразбиране. !!\n"</div><div class='hunk'>@@ -4090,7 +4090,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4193,12 +4193,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4225,7 +4225,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4234,7 +4234,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4256,12 +4256,12 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "В този момент трябва изберете къде на твърдия си диска да инсталирате "</div><div class='ctx'> "вашата\n"</div><div class='del'>-"Mandrakelinux операционна система. Ако твърдият ви диск е празен или друга\n"</div><div class='add'>+"Mandrivalinux операционна система. Ако твърдият ви диск е празен или друга\n"</div><div class='ctx'> "операционна система използва цялото пространство, ще трябва да го "</div><div class='ctx'> "разделите.\n"</div><div class='ctx'> "Казано простичко, разделянето на твърдия диск се състои в логическо "</div><div class='ctx'> "разделяне\n"</div><div class='del'>-"цел да се създаде място за инсталация на новата Mandrakelinux система.\n"</div><div class='add'>+"цел да се създаде място за инсталация на новата Mandrivalinux система.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Тъй като процесът на разделяне обикновено е необратим, разделянето може да\n"</div><div class='ctx'> "изглежда плашещ и стряскащ, ако сте неопитен потребител. Слава Богу, има\n"</div><div class='hunk'>@@ -4270,7 +4270,7 @@ msgstr ""</div><div class='ctx'> "с ръководството и не бързайте.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ако пускате инсталацията в Експертен режим, ще бъдете въведени в DiskDrake,\n"</div><div class='del'>-"разделящия инструмент на Mandrakelinux, който ви позволява да донастроите\n"</div><div class='add'>+"разделящия инструмент на Mandrivalinux, който ви позволява да донастроите\n"</div><div class='ctx'> "дяловете си. Вижте главата DiskDrake от ръководството. От инсталационния\n"</div><div class='ctx'> "интерфейс можете да използвате магьосниците, като натиснете бутона\n"</div><div class='ctx'> "\"Магьосник\" на диалога.\n"</div><div class='hunk'>@@ -4298,7 +4298,7 @@ msgstr ""</div><div class='ctx'> "решенията \"Изтрий целия диск\" или \"Екпертен режим\") или да промените\n"</div><div class='ctx'> "големината на Microsoft Windows дяла. Промяната на големината може да бъде\n"</div><div class='ctx'> "извършена без загуба на данни. Това решение се препоръчва, ако искате\n"</div><div class='del'>-"едновременно Mandrakelinux и Microsoft Windows на един и същи компютър.\n"</div><div class='add'>+"едновременно Mandrivalinux и Microsoft Windows на един и същи компютър.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Преди да изберете тази опция, моля, разберете, че след тази процедура,\n"</div><div class='ctx'> "големината на Microsoft Windows дяла ще бъде по-малка, отколкото преди "</div><div class='hunk'>@@ -4308,7 +4308,7 @@ msgstr ""</div><div class='ctx'> "инсталира на нов софтуер.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": ако искате да изтриете всички данни и дялове, които\n"</div><div class='del'>-"съществуват на вашия твърд диск и да ги замените с новата Mandrakelinux\n"</div><div class='add'>+"съществуват на вашия твърд диск и да ги замените с новата Mandrivalinux\n"</div><div class='ctx'> "система, изберете тази опция. Бъдете внимателни с това решения, защото няма\n"</div><div class='ctx'> "да можете да върнете обратно избора си, след като потвърдите.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4467,7 +4467,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4497,7 +4497,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Цъкнете \"Отказ\", ако искате да изберете други дялове за инсталация на "</div><div class='ctx'> "новата\n"</div><div class='del'>-"си Mandrakelinux операционна система.\n"</div><div class='add'>+"си Mandrivalinux операционна система.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Цъкнете \"Напредничав\", ако искате да изберете дялове, които да бъдат\n"</div><div class='ctx'> "проверени за лоши блокове от диска."</div><div class='hunk'>@@ -4514,7 +4514,7 @@ msgstr "Предишен"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4543,7 +4543,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4570,7 +4570,7 @@ msgstr "Администратор по защита:"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4642,7 +4642,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "В този момент трябва да изберете кой дялове да бъдат използвани за "</div><div class='ctx'> "инсталация\n"</div><div class='del'>-"на вашата Mandrakelinux система. Ако дяловете вече са определени, дали от\n"</div><div class='add'>+"на вашата Mandrivalinux система. Ако дяловете вече са определени, дали от\n"</div><div class='ctx'> "предишна инсталация на GNU/Linux или от друг инструмент за разделяне, "</div><div class='ctx'> "можете\n"</div><div class='ctx'> "да използвате съществуващите далове. В противен случай трябва да определите\n"</div><div class='hunk'>@@ -4722,7 +4722,7 @@ msgstr "Премини в нормален/експертен режим"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4753,7 +4753,7 @@ msgstr ""</div><div class='ctx'> "Беше засечен повече от един Microsoft Windows дял\n"</div><div class='ctx'> "на твърдия ви диска. Изберете този, чиято дължина искате да промените, за "</div><div class='ctx'> "да\n"</div><div class='del'>-"инсталирате Mandrakelinux операционна система.\n"</div><div class='add'>+"инсталирате Mandrivalinux операционна система.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "За информация, всеки дял е изброен както следва: \"Linux име\", \"Windows име"</div><div class='hunk'>@@ -4801,7 +4801,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4810,13 +4810,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4878,7 +4878,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5060,7 +5060,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5081,7 +5081,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Дойде времето да изберете система за печат за вашия компютър.Другите\n"</div><div class='hunk'>@@ -5210,7 +5210,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5227,7 +5227,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5289,11 +5289,11 @@ msgstr "Услуги"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Изберете твърдия диск, който искате да изтриете, за да\n"</div><div class='del'>-"инсталирам новия ви Mandrakelinux дял. Внимание, всички данни на него ще "</div><div class='add'>+"инсталирам новия ви Mandrivalinux дял. Внимание, всички данни на него ще "</div><div class='ctx'> "бъдат загубени\n"</div><div class='ctx'> "и няма да могат да се възстановят."</div><div class='ctx'> </div><div class='hunk'>@@ -5645,7 +5645,7 @@ msgstr "Изчислява свободното място на Windows дял"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Вашият Windows дял е много фрагментиран, моля първо стартирайте ''defrag''"</div><div class='hunk'>@@ -5760,19 +5760,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5794,7 +5794,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5802,14 +5802,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5819,7 +5819,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5839,10 +5839,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5853,11 +5853,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5873,24 +5873,24 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Въведение\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Операционната система и различните компоненти достъпни в Mandrakelinux "</div><div class='add'>+"Операционната система и различните компоненти достъпни в Mandrivalinux "</div><div class='ctx'> "дистрибуцията по-долу ще се\n"</div><div class='ctx'> "наричат \"Софтуерен Продукти\". Софтуерните Продукти включват, но не се "</div><div class='ctx'> "ограничават само до, набора\n"</div><div class='ctx'> "програми, методи, правила и документация отнасяща се до операционната "</div><div class='ctx'> "система и различните\n"</div><div class='del'>-"компоненти на Mandrakelinux дистрибуцията.\n"</div><div class='add'>+"компоненти на Mandrivalinux дистрибуцията.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Лицензионен договор\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Моля, прочетете внимателно този документ. Този документ е лицензионен "</div><div class='ctx'> "договор между вас и\n"</div><div class='del'>-"Mandrakesoft S.A., който се отнася до Софтуерния Продукт. Чрез "</div><div class='add'>+"Mandriva S.A., който се отнася до Софтуерния Продукт. Чрез "</div><div class='ctx'> "инсталирането, копирането\n"</div><div class='ctx'> "или използването на Софтуерния Продукт по какъвто и да е начин вие изрично "</div><div class='ctx'> "приемате и\n"</div><div class='hunk'>@@ -5911,7 +5911,7 @@ msgstr ""</div><div class='ctx'> "Софтуерните Продукти и приложената документация се предоставят \"такива "</div><div class='ctx'> "каквито са\", без гаранция,\n"</div><div class='ctx'> "в рамките на разрешеното от закона.\n"</div><div class='del'>-"Mandrakesoft S.A., при никакви обстоятелства и в рамките на закона, не е "</div><div class='add'>+"Mandriva S.A., при никакви обстоятелства и в рамките на закона, не е "</div><div class='ctx'> "отговорна за каквито да e\n"</div><div class='ctx'> "умишлени, случайни, преки или косвени щети (включително загуба на данни за "</div><div class='ctx'> "работа, прекратяване на,\n"</div><div class='hunk'>@@ -5919,13 +5919,13 @@ msgstr ""</div><div class='ctx'> "решение или каквато и да е\n"</div><div class='ctx'> "друга произлизащи от това загуби) произтичащи от употребата или от "</div><div class='ctx'> "невъзможността да се употреби\n"</div><div class='del'>-"Софтуерния Продукт, даже ако Mandrakesoft S.A. да е известила за "</div><div class='add'>+"Софтуерния Продукт, даже ако Mandriva S.A. да е известила за "</div><div class='ctx'> "възможността или случването на такава загуба.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "ОГРАНИЧЕНА ОТГОВОРНОСТ СВЪРЗАНА С ПРИТЕЖАВАНЕТО ИЛИ ИЗПОЛЗВАНЕТО НА ЗАБРАНЕН "</div><div class='ctx'> "СОФТУЕР В НЯКОИ СТРАНИ\n"</div><div class='ctx'> "\n"</div><div class='del'>-"В рамките на закона, Mandrakesoft S.A. и нейните дистрибутори няма при "</div><div class='add'>+"В рамките на закона, Mandriva S.A. и нейните дистрибутори няма при "</div><div class='ctx'> "никакви условия да бъдат\n"</div><div class='ctx'> "отговорни за каквито и да било умишлени, случайни, преки или косвени щети "</div><div class='ctx'> "(включително загуба на данни\n"</div><div class='hunk'>@@ -5934,7 +5934,7 @@ msgstr ""</div><div class='ctx'> "съдебно решение или каквато и да е друга произлизащи от това загуби) "</div><div class='ctx'> "произтичащи от притежаването\n"</div><div class='ctx'> "и употребата на софтуерни компоненти и от изтеглянето на софтуерни "</div><div class='del'>-"компоненти от сайтовете на Mandrakelinux,\n"</div><div class='add'>+"компоненти от сайтовете на Mandrivalinux,\n"</div><div class='ctx'> "които са забранени в някои страни от местното законодателство.\n"</div><div class='ctx'> "Тази ограничена отговорност се отнася до, но не само за, мощните "</div><div class='ctx'> "криптографски компоненти включени\n"</div><div class='hunk'>@@ -5954,10 +5954,10 @@ msgstr ""</div><div class='ctx'> "лицензионния договор на всеки компонент преди да го използвате. Всякакви "</div><div class='ctx'> "въпроси относно лиценза\n"</div><div class='ctx'> "на компонентите би трябвало да бъдат насочени към съответния им автор, а не "</div><div class='del'>-"към Mandrakesoft.\n"</div><div class='del'>-"Програмите разработени от Mandrakesoft S.A. се управляват от GPL Лиценза. "</div><div class='add'>+"към Mandriva.\n"</div><div class='add'>+"Програмите разработени от Mandriva S.A. се управляват от GPL Лиценза. "</div><div class='ctx'> "Документацията написана\n"</div><div class='del'>-"от Mandrakesoft S.A. се управлява от специален лиценз. Моля, погледнете "</div><div class='add'>+"от Mandriva S.A. се управлява от специален лиценз. Моля, погледнете "</div><div class='ctx'> "документацията за\n"</div><div class='ctx'> "повече информация.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5968,11 +5968,11 @@ msgstr ""</div><div class='ctx'> "съответните им автори и са\n"</div><div class='ctx'> "защитени от законите за интелектуалната собственост и за копиране прилагани "</div><div class='ctx'> "за софтуерните програми.\n"</div><div class='del'>-"Mandrakesoft S.A. запазва правото си да модифицира и пригодява Софтуерния "</div><div class='add'>+"Mandriva S.A. запазва правото си да модифицира и пригодява Софтуерния "</div><div class='ctx'> "Продукт, като цяло или на\n"</div><div class='ctx'> "части, по всякакъв начин и с всякакви цели.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" и свързаните логота са запазена марка на "</div><div class='del'>-"Mandrakesoft S.A.\n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" и свързаните логота са запазена марка на "</div><div class='add'>+"Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Управляващи Закони\n"</div><div class='hunk'>@@ -5986,7 +5986,7 @@ msgstr ""</div><div class='ctx'> "съда. Като крайна мярка,\n"</div><div class='ctx'> "споровете ще бъдат отнасяни до подходящия правни съдилища на Париж - "</div><div class='ctx'> "Франция.\n"</div><div class='del'>-"За всякакви въпроси по този документ, моля, свържете се с Mandrakesoft S.A.\n"</div><div class='add'>+"За всякакви въпроси по този документ, моля, свържете се с Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "ЗАБЕЛЕЖКА: Това е български приблизителен превод на документа, което "</div><div class='ctx'> "означава, че той\n"</div><div class='hunk'>@@ -6077,7 +6077,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6085,13 +6085,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Поздравления, инсталацията е преключена.\n"</div><div class='ctx'> "Премахнете стартовото устройство и натисене Enter за да рестартирайте.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"За информация относно поправки, на тази версия на Mandrakelinux,\n"</div><div class='add'>+"За информация относно поправки, на тази версия на Mandrivalinux,\n"</div><div class='ctx'> "се консултирайте с Errata, на адрес : \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6099,7 +6099,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Информация за настройване на системата ви можете да намерите в\n"</div><div class='del'>-"слединсталационната глава от Official Mandrakelinux User's Guide."</div><div class='add'>+"слединсталационната глава от Official Mandrivalinux User's Guide."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6134,12 +6134,12 @@ msgstr "Навлизам в етап `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Вашата система е с малки ресурси. Може да имате проблеми с инсталирането\n"</div><div class='del'>-"на Mandrakelinux. Ако се появи проблем опитайте с текстовата инсалация. "</div><div class='add'>+"на Mandrivalinux. Ако се появи проблем опитайте с текстовата инсалация. "</div><div class='ctx'> "Зацелта,\n"</div><div class='ctx'> "натиснете 'F1', когато стартирате от CDROM и въведете 'теьт'."</div><div class='ctx'> </div><div class='hunk'>@@ -6669,9 +6669,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Свързване с Mandrakelinux web сайт за получаване на списъка с налични "</div><div class='add'>+"Свързване с Mandrivalinux web сайт за получаване на списъка с налични "</div><div class='ctx'> "огледални сървъри..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6892,8 +6892,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Инсталация на Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Инсталация на Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9473,13 +9473,13 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Настройчик за малка защитна стена\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Това настройва персонална защитна стена за тази Mandrakelinux машина.\n"</div><div class='add'>+"Това настройва персонална защитна стена за тази Mandrivalinux машина.\n"</div><div class='ctx'> "За мощно постветено на защитата решение, моле, погледнете специализираната\n"</div><div class='ctx'> "MandrakeSecurity Firewall дистрибуция."</div><div class='ctx'> </div><div class='hunk'>@@ -13268,7 +13268,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15064,18 +15064,18 @@ msgstr "Стоп"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Добре дошли в &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Добре дошли в &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15084,7 +15084,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15101,9 +15101,9 @@ msgstr "Добре дошли в света на Отвореният Изход</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15123,7 +15123,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15149,10 +15149,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15171,8 +15171,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15199,7 +15199,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15209,7 +15209,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15228,13 +15228,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15246,7 +15246,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15260,19 +15260,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "Контролен център на Mandrakelinux"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "Контролен център на Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -15293,61 +15293,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15385,7 +15385,7 @@ msgstr "Избор на криптиращ ключ за еашата файло</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15406,7 +15406,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15523,7 +15523,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15758,14 +15758,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Контролен център на Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Контролен център на Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15787,21 +15787,21 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Online Store&lt;/b&gt;"</div><div class='del'>-msgstr "Контролен център на Mandrakelinux"</div><div class='add'>+msgstr "Контролен център на Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15824,20 +15824,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Мандрейклинукс Клуб&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15856,33 +15856,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -15905,32 +15905,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;МандрейкЕксперт&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16216,7 +16216,7 @@ msgstr "Webmin Обслужване"</div><div class='ctx'> #: share/compssUsers.pl:187</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "Webmin Remote Configuration Server"</div><div class='del'>-msgstr "Конфигурация на Терминален Сървър в Mandrakelinux"</div><div class='add'>+msgstr "Конфигурация на Терминален Сървър в Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:191</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -16230,8 +16230,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Контролен център на Mandrakelinux"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Контролен център на Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -16326,7 +16326,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16374,7 +16374,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -16449,7 +16449,7 @@ msgstr ""</div><div class='ctx'> #: standalone/drakTermServ:211 standalone/drakTermServ:214</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "Terminal Server Configuration"</div><div class='del'>-msgstr "Конфигурация на Терминален Сървър в Mandrakelinux"</div><div class='add'>+msgstr "Конфигурация на Терминален Сървър в Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakTermServ:220</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16594,7 +16594,7 @@ msgstr ""</div><div class='ctx'> #: standalone/drakTermServ:509</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "Terminal Server Overview"</div><div class='del'>-msgstr "Конфигурация на Терминален Сървър в Mandrakelinux"</div><div class='add'>+msgstr "Конфигурация на Терминален Сървър в Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakTermServ:510</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18873,13 +18873,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Контролен център на Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Контролен център на Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Контролен център на Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Контролен център на Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18899,8 +18899,8 @@ msgstr "ХардДрейк"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18944,7 +18944,7 @@ msgstr "Конфигурационни Магьосници"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19357,14 +19357,14 @@ msgstr "Пуснат при стартиране"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Нямате Internet връзка.\n"</div><div class='ctx'> "Създайте такава, като цъкнете на 'Настрой'"</div><div class='hunk'>@@ -19417,7 +19417,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -19707,7 +19707,7 @@ msgstr "Импорт"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20192,7 +20192,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -20219,8 +20219,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Контролен център на Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Контролен център на Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -23233,7 +23233,7 @@ msgstr "Промените са запазени, но за да бъдат еф</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Самостоятелни инструменти"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -23742,10 +23742,10 @@ msgstr "Връзката е установена."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Връзката пропадна.\n"</div><div class='del'>-"Проверете си конфигурацията в Контролен център на Mandrakelinux."</div><div class='add'>+"Проверете си конфигурацията в Контролен център на Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -23980,7 +23980,7 @@ msgstr ""</div><div class='ctx'> #: standalone/scannerdrake:101</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported by this version of %s."</div><div class='del'>-msgstr "%s не се подържа от тази версия на Mandrakelinux."</div><div class='add'>+msgstr "%s не се подържа от тази версия на Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:104</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24020,7 +24020,7 @@ msgstr ""</div><div class='ctx'> #: standalone/scannerdrake:144</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported under Linux."</div><div class='del'>-msgstr "%s не се подържа от тази версия на Mandrakelinux."</div><div class='add'>+msgstr "%s не се подържа от тази версия на Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:171 standalone/scannerdrake:185</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24591,8 +24591,8 @@ msgstr "Инсталацията провалена"</div><div class='ctx'> #~ msgstr "Не сте избрали никакъв шрифт"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Контролен център на Mandrakelinux"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Контролен център на Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Няма налична програма за преглед! Моля изберете една"</div><div class='hunk'>@@ -24766,13 +24766,13 @@ msgstr "Инсталацията провалена"</div><div class='ctx'> #~ msgstr "Грешка при отваряне на %s за запис: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Това е HardDrake, хардуерен конфигурационен инструмент на Mandrakelinux.\n"</div><div class='add'>+#~ "Това е HardDrake, хардуерен конфигурационен инструмент на Mandrivalinux.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Версия:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Автор:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -25267,15 +25267,15 @@ msgstr "Инсталацията провалена"</div><div class='ctx'> #~ msgid "mkraid failed"</div><div class='ctx'> #~ msgstr "mkraid пропадна"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Connection failed.\n"</div><div class='ctx'> #~ "Verify your configuration in the Mandrake Control Center."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Връзката пропадна.\n"</div><div class='del'>-#~ "Проверете си конфигурацията в Контролен център на Mandrakelinux."</div><div class='add'>+#~ "Проверете си конфигурацията в Контролен център на Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "The package %s is needed. Install it?"</div><div class='ctx'> #~ msgstr "Пакет %s е необходим. Да го инсталирам?"</div><div class='head'>diff --git a/perl-install/share/po/bn.po b/perl-install/share/po/bn.po<br/>index 773985157..5524625b1 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/bn.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/bn.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/bn.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/bn.po</a></div><div class='hunk'>@@ -68,7 +68,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "মনেহচ্ছে ইউএসবি ডিস্কে রাইট প্রটেকশন কার্যকর করা রয়েছে, কিন্তু এখন\n"</div><div class='ctx'> "আমরা নিরাপদভাবে এটা আন-প্লাগও করতে পারছিনা।\n"</div><div class='hunk'>@@ -94,7 +94,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "আপনার ইউএসবি ডিস্কে কোন উইন্ডোজ (FAT) পার্টিশন নেই।\n"</div><div class='hunk'>@@ -113,7 +113,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -121,7 +121,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "আমরা আপনার সিস্টেমে কোন ইউএসবি ড্রাইভ সনাক্ত করতে\n"</div><div class='hunk'>@@ -263,7 +263,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1312,11 +1312,11 @@ msgstr "পছন্দনীয় ভাষা"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux বাভিন্ন ভাষা সমর্থন করে।\n"</div><div class='add'>+"Mandrivalinux বাভিন্ন ভাষা সমর্থন করে।\n"</div><div class='ctx'> "আপনি যেই ভাষাটি ইনস্টল করতে চান তা পছন্দ করুন।\n"</div><div class='ctx'> "ইনস্টল শেষে রি-স্টার্ট করার পরে সেই ভাষাগুলি উপলব্ধ হবে।"</div><div class='ctx'> </div><div class='hunk'>@@ -3733,7 +3733,7 @@ msgstr "রেডিও সাপোর্ট সক্রিয় করো"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3924,7 +3924,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3942,11 +3942,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3998,11 +3998,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "এখন আপনাকে নির্বাচন করতে হবে আপনি কোন কোন প্রোগ্রাম সিস্টেমে ইনস্টল করতে চান।\n"</div><div class='del'>-"Mandrakelinux এর জন্য কয়েক হাজার প্যাকেজ রয়েছে, এবং ব্যাবস্থাপনার সুবিধার্থে "</div><div class='add'>+"Mandrivalinux এর জন্য কয়েক হাজার প্যাকেজ রয়েছে, এবং ব্যাবস্থাপনার সুবিধার্থে "</div><div class='ctx'> "সেগুলোকে\n"</div><div class='ctx'> "অ্যাপ্লিকেশনের ধরন অনুযায়ী ভাগ করা হয়েছে।\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux সব প্যাকেজগ্রুপসমূহ চারটি শ্রেণীতে ভাগ করে। আপনি বিভিন্ন শ্রেণীর\n"</div><div class='add'>+"Mandrivalinux সব প্যাকেজগ্রুপসমূহ চারটি শ্রেণীতে ভাগ করে। আপনি বিভিন্ন শ্রেণীর\n"</div><div class='ctx'> "অ্যাপ্লিকেশনমিলিয়ে ও মিশিয়ে ইনস্টল করতে পারেন, যেমন একটি ``Workstation''\n"</div><div class='ctx'> "ইনস্টলেশনে আপনি ''Server'' শ্রেণী থেকে অ্যাপ্লিকেশন ইনস্টল\n"</div><div class='ctx'> "করতে পারেন।\n"</div><div class='hunk'>@@ -4110,10 +4110,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4252,7 +4252,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4372,12 +4372,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4404,7 +4404,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4413,7 +4413,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4543,7 +4543,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4562,7 +4562,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "পার্টিশন ফরম্যাট শুরু করতে \"%s\" চাপুন।\n"</div><div class='ctx'> "\n"</div><div class='del'>-"আপনার নতুন Mandrakelinux অপারেটিং সিস্টেম ইনস্টেশনের জন্য আপনি যদি অন্য একটি "</div><div class='add'>+"আপনার নতুন Mandrivalinux অপারেটিং সিস্টেম ইনস্টেশনের জন্য আপনি যদি অন্য একটি "</div><div class='ctx'> "পার্টিশন নির্বাচন করতে, তবে \"%s\" ক্লিক করুন।\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "যদি আপনি পার্টিশনের জন্য ডিস্কের খারাপ ব্লক সনাক্ত করাতে চান তাহলে \"%s\" ক্লিক "</div><div class='hunk'>@@ -4582,7 +4582,7 @@ msgstr "পূর্ববর্তী"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4594,7 +4594,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"আপনি যখন Mandrakelinux ইনস্টল করবেন, সম্ভবত প্রথম রিলিজ থেকে কিছু\n"</div><div class='add'>+"আপনি যখন Mandrivalinux ইনস্টল করবেন, সম্ভবত প্রথম রিলিজ থেকে কিছু\n"</div><div class='ctx'> "প্যাকেজ আপডেট হয়ে গেছে। কোন সাধারন বা নিরাপত্তা ত্রুটি সমাধান করা হয়েছে।\n"</div><div class='ctx'> "আপনাকে এই সুবিধাগুলি দেয়ার লক্ষ্যে এই আপডেটগুলো ইন্টারনেট থেকে ডাউনলোড\n"</div><div class='ctx'> "করার সুযোগ দেয়া হয়েছে। যদি আপনার সক্রিয় ইন্টারনেট সংযোগ থাকে, \"%s\" চেক\n"</div><div class='hunk'>@@ -4624,7 +4624,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4636,7 +4636,7 @@ msgstr ""</div><div class='ctx'> "হয়। নিরাপত্তা যত বেশী, ব্যবহারের স্বাচ্ছন্দ্য তত কমে যায়।\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "আপনি যদি নিশ্চিত না হন কোন অপশনটি রাখবেন তবে ডিফল্ট অপশনটিই রাখুন।\n"</div><div class='del'>-"পরবর্তীতে আপনি এটি draksec টুল (যেটি Mandrakelinux নিয়ন্ত্রন কেন্দ্রের একটি অংশ)\n"</div><div class='add'>+"পরবর্তীতে আপনি এটি draksec টুল (যেটি Mandrivalinux নিয়ন্ত্রন কেন্দ্রের একটি অংশ)\n"</div><div class='ctx'> "দিয়ে পরিবর্তন করতে পারবেন।\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\"%s\" ক্ষেত্রটিতে যিনি নিরাপত্তার দায়িত্বে নিয়োজিত তার ই-মেইল অ্যাড্রেস দিন।\n"</div><div class='hunk'>@@ -4652,7 +4652,7 @@ msgstr "সিকিউরিটি এ্যডমিনিস্ট্রে�</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4722,7 +4722,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"এই সময়ে আপনাকে Mandrakelinux যে পার্টিশনে ইনস্টল হবে তা নির্বাচন\n"</div><div class='add'>+"এই সময়ে আপনাকে Mandrivalinux যে পার্টিশনে ইনস্টল হবে তা নির্বাচন\n"</div><div class='ctx'> "করতে হবে। যদি আগে থেকেই পার্টিশন তৈরী থাকে, (GNU/Linux এর পুর্বের\n"</div><div class='ctx'> "কোন ইনস্টলেশনের কারনে বা অন্য কোন পার্টিশন টুল দিয়ে তৈরী করা) আপনি\n"</div><div class='ctx'> "সেগুলো ব্যবহার করতে পারেন। অন্যথায় হার্ডড্রাইভ পার্টিশন তৈরী করতে হবে।\n"</div><div class='hunk'>@@ -4805,7 +4805,7 @@ msgstr "সাধারণ/দক্ষ মোডের মধ্যে পর�</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4854,7 +4854,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4863,13 +4863,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='hunk'>@@ -4928,7 +4928,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5089,7 +5089,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5110,11 +5110,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "এখন সময় আপনার কম্পিউটারের জন্য একটি প্রিন্টিং সিস্টেম নির্বাচন করার। অনান্য\n"</div><div class='del'>-"অপারেটিং সিস্টেম আপনাকে একটি অপশন দিতে পারে কিন্তু Mandrakelinux দেবে দুটি।\n"</div><div class='add'>+"অপারেটিং সিস্টেম আপনাকে একটি অপশন দিতে পারে কিন্তু Mandrivalinux দেবে দুটি।\n"</div><div class='ctx'> "প্রিন্টিং সিস্টেমগুলো বিভিন্ন কনফিগারেশনের জন্য প্রযোজ্য।\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- অর্থ হচ্ছে \"প্রিন্ট করো, সারিতে রাখবেনা\". এটি নির্বাচন করুন যদি "</div><div class='hunk'>@@ -5141,7 +5141,7 @@ msgstr ""</div><div class='ctx'> "ইন্টারফেস রয়েছে।\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "আপনার বাছাইকৃত প্রিন্টিং সিস্টেমটি যদি আপনার পরে পছন্দ না হয়,\n"</div><div class='del'>-"তবে আপনি Mandrakelinux নিয়ন্ত্রন কেন্দ্র থেকে PrinterDrake চালিয়ে ও \"%s\" বাটন "</div><div class='add'>+"তবে আপনি Mandrivalinux নিয়ন্ত্রন কেন্দ্র থেকে PrinterDrake চালিয়ে ও \"%s\" বাটন "</div><div class='ctx'> "ক্লিক\n"</div><div class='ctx'> "করে তা বদল করতে পারেন।"</div><div class='ctx'> </div><div class='hunk'>@@ -5262,7 +5262,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5279,7 +5279,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5341,7 +5341,7 @@ msgstr "সার্ভিস সমূহ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "হার্ড ড্রাইভ বেছে নিন যেটি আপনি আপনার নতুন ম্যানড্রেকলিনাক্স পার্টিশন ইনস্টল করার "</div><div class='hunk'>@@ -5701,7 +5701,7 @@ msgstr "আপনার উইন্ডোজের পার্টিশনে�</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "আপনার উইন্ডোজের পার্টিশনটি প্রচন্ড অসম। অনুগ্রহ করে আপনার কম্পিউটারটি উইন্ডোজে রি-বুট "</div><div class='hunk'>@@ -5819,19 +5819,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5853,7 +5853,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5861,14 +5861,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5878,7 +5878,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5898,10 +5898,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5912,11 +5912,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5932,7 +5932,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5994,7 +5994,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6002,7 +6002,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "অভিনন্দন, ইনস্টলেশন পুরোপুরিভাবে হয়ে গেছে।\n"</div><div class='ctx'> "দ্নবুট মিডিয়া সরিয়ে ফেলুন, এবং পুনরায় চালু করার জন্য return চাপুন।\n"</div><div class='hunk'>@@ -6051,7 +6051,7 @@ msgstr "`%s' স্টেপে প্রবেশ করছি\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -6603,8 +6603,8 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='del'>-msgstr "উপস্থিত মিররের তালিকার জন্য Mandrakelinux-এ সংযুক্ত করা হচ্ছে..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='add'>+msgstr "উপস্থিত মিররের তালিকার জন্য Mandrivalinux-এ সংযুক্ত করা হচ্ছে..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6826,8 +6826,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux ইনস্টলেশন %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux ইনস্টলেশন %s"</div><div class='ctx'> </div><div class='ctx'> #  -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -9443,7 +9443,7 @@ msgstr "বিটTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13564,11 +13564,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"আপনার স্ক্যানারটি নেটওয়ার্ক শেয়ার করার জন্য Scannerdrake (Mandrakelinux নিয়ন্ত্রণ "</div><div class='add'>+"আপনার স্ক্যানারটি নেটওয়ার্ক শেয়ার করার জন্য Scannerdrake (Mandrivalinux নিয়ন্ত্রণ "</div><div class='ctx'> "কেন্দ্র হার্ডওয়্যার/স্ক্যানার) চালান।\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -15580,24 +15580,24 @@ msgstr "বন্ধ"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ম্যানড্রেককলিনাক্স কি?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "&lt;b&gt;ম্যানড্রেককলিনাক্স&lt;/b&gt;-এ আপনাকে স্বাগতম!"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux একটি &lt;b&gt;লিনাক্স ডিস্ট্রিবিউশন&lt;/b&gt; যা গঠিত হয়েছে সিস্টেম মূল অংশ বা "</div><div class='add'>+"Mandrivalinux একটি &lt;b&gt;লিনাক্স ডিস্ট্রিবিউশন&lt;/b&gt; যা গঠিত হয়েছে সিস্টেম মূল অংশ বা "</div><div class='ctx'> "&lt;b&gt;অপারেটিং সিস্টেম&lt;/b&gt; (লিনাক্স কার্নেল এর উপর ভিত্তি করে) এবং &lt;b&gt;বিভিন্ন অনেক "</div><div class='ctx'> "অ্যাপ্লিকেশন&lt;/b&gt; দিয়ে যা কিনা আপনার সম্ভাব্য সব চাহিদা পূরন করে।"</div><div class='ctx'> </div><div class='hunk'>@@ -15605,10 +15605,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux আজকের সবচেয়ে &lt;b&gt;ব্যবহারকারীর বন্ধুসূলভ&lt;/b&gt; লিনাক্স ডিস্ট্রিবিউশন। এটি "</div><div class='add'>+"Mandrivalinux আজকের সবচেয়ে &lt;b&gt;ব্যবহারকারীর বন্ধুসূলভ&lt;/b&gt; লিনাক্স ডিস্ট্রিবিউশন। এটি "</div><div class='ctx'> "পৃথিবীর সবচেয়ে &lt;b&gt;বহুল-ব্যবহৃত&lt;/b&gt; লিনাক্স ডিস্ট্রিবিউশনের মধ্যে অন্যতম!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -15626,13 +15626,13 @@ msgstr "&lt;b&gt;উন্মুক্ত সোর্সের পৃথিবী&lt;/b&gt;</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux উন্মুক্ত সোর্স মডেলে প্রতিশ্রুতিবদ্ধ। এর অর্থ, এই নতুন রিলিজটি "</div><div class='del'>-"&lt;b&gt;Mandrakesoft এর ডেভেলপমেন্ট টিম&lt;/b&gt; এবং &lt;b&gt;বিশ্বব্যাপী কমিউনিটির&lt;/b&gt; "</div><div class='add'>+"Mandrivalinux উন্মুক্ত সোর্স মডেলে প্রতিশ্রুতিবদ্ধ। এর অর্থ, এই নতুন রিলিজটি "</div><div class='add'>+"&lt;b&gt;Mandriva এর ডেভেলপমেন্ট টিম&lt;/b&gt; এবং &lt;b&gt;বিশ্বব্যাপী কমিউনিটির&lt;/b&gt; "</div><div class='ctx'> "&lt;b&gt;সহযোগিতার&lt;/b&gt; ফসল।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='hunk'>@@ -15653,7 +15653,7 @@ msgstr "&lt;b&gt;জি-পি-এল&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ডিস্ট্রিবিউশন এবং ম্যানড্রেকলিনাক্স টুলসমূহের বেশিরভাগ সফ্‌টওয়্যার &lt;b&gt;General Public "</div><div class='ctx'> "License&lt;/b&gt; এর অধীনে লাইসেন্সকৃত।"</div><div class='hunk'>@@ -15689,14 +15689,14 @@ msgstr "&lt;b&gt;কমিউনিটিতে যোগ দিন&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux এর আছে ব্যবহারকারী ও ডেভেলপারদের &lt;b&gt;সবচেয়ে বড় কমিউনিটি&lt;/b&gt; গুলোর "</div><div class='add'>+"Mandrivalinux এর আছে ব্যবহারকারী ও ডেভেলপারদের &lt;b&gt;সবচেয়ে বড় কমিউনিটি&lt;/b&gt; গুলোর "</div><div class='ctx'> "একটি। এই কমিউনিটির কার্যক্রমও অনেক বিস্তৃত, ত্রুটি রিপোর্ট করা থেকে নতুন অ্যাপলিকেশন "</div><div class='del'>-"তৈরী পর্যন্ত। এ কমিউনিটি Mandrakelinux এর ভুবনে অপরিহার্য ভুমিকা পালন করে।"</div><div class='add'>+"তৈরী পর্যন্ত। এ কমিউনিটি Mandrivalinux এর ভুবনে অপরিহার্য ভুমিকা পালন করে।"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15719,11 +15719,11 @@ msgstr "&lt;b&gt;ডাউনলোড সংস্করণ&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"আপনি এখন &lt;b&gt;Mandrakelinux ডাউনলোড&lt;/b&gt; ইনস্টল করছেন। এটি একটি ফ্রী ভার্সন যা "</div><div class='del'>-"কিনা Mandrakesoft &lt;b&gt;সবার জন্য সহজলভ্য&lt;/b&gt; রাখতে চায়।"</div><div class='add'>+"আপনি এখন &lt;b&gt;Mandrivalinux ডাউনলোড&lt;/b&gt; ইনস্টল করছেন। এটি একটি ফ্রী ভার্সন যা "</div><div class='add'>+"কিনা Mandriva &lt;b&gt;সবার জন্য সহজলভ্য&lt;/b&gt; রাখতে চায়।"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15756,9 +15756,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='del'>-"অনান্য Mandrakesoft পণ্যেও &lt;b&gt;সংযোজিত সার্ভিসগুলো&lt;/b&gt; আপনি ব্যবহার করতে পারবেন না।"</div><div class='add'>+"অনান্য Mandriva পণ্যেও &lt;b&gt;সংযোজিত সার্ভিসগুলো&lt;/b&gt; আপনি ব্যবহার করতে পারবেন না।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15767,7 +15767,7 @@ msgstr "&lt;b&gt;আবিষ্কার করুন, আপনার প্রথ�</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr "আপনি এখন &lt;b&gt;ম্যানড্রেকলিনাস্ক আবিষ্কার&lt;/b&gt; ইনস্টল করছেন।"</div><div class='ctx'> </div><div class='ctx'> # সাম:</div><div class='hunk'>@@ -15792,7 +15792,7 @@ msgstr "&lt;b&gt;পাওয়ারপ্যাক, চূড়ান্ত লিনা</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr "আপনি এখন &lt;b&gt;ম্যানড্রেকলিনাক্স পাওয়ারপ্যাক&lt;/b&gt; ইনস্টল করছেন।"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='hunk'>@@ -15800,11 +15800,11 @@ msgstr "আপনি এখন &lt;b&gt;ম্যানড্রেকলিনাক�</div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack হচ্ছে Mandrakesoft এর &lt;b&gt;premier লিনাক্স ডেস্কটপ&lt;/b&gt; পণ্য। PowerPack এ "</div><div class='add'>+"PowerPack হচ্ছে Mandriva এর &lt;b&gt;premier লিনাক্স ডেস্কটপ&lt;/b&gt; পণ্য। PowerPack এ "</div><div class='ctx'> "আছে &lt;b&gt;হাজারেরও অধিক অ্যাপ্লিকেশন&lt;/b&gt; - সবচেয়ে জনপ্রিয় থেকে শুরু করে সবচেয়ে উন্নত "</div><div class='ctx'> "পর্যন্ত।"</div><div class='ctx'> </div><div class='hunk'>@@ -15815,7 +15815,7 @@ msgstr "&lt;b&gt;পাওয়ারপ্যাক+, ডেস্কটপ এবং �</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr "আপনি এখন &lt;b&gt;ম্যানড্রেকলিনাক্স পাওয়ারপ্যা++&lt;/b&gt; ইনস্টল করছেন।"</div><div class='ctx'> </div><div class='ctx'> # সাম </div><div class='hunk'>@@ -15832,24 +15832,24 @@ msgstr ""</div><div class='ctx'> "লিনাক্স সমাধান&lt;/b&gt;। PowerPack+ এ আছে হাজারেরও অধিক &lt;b&gt;ডেস্কটপ অ্যাপ্লিকেশন&lt;/b&gt; "</div><div class='ctx'> "এবং কিছু অতি উন্নত সমন্বিত &lt;b&gt;সার্ভার অ্যাপ্লিকেশন&lt;/b&gt;।"</div><div class='ctx'> </div><div class='del'>-# সাম: Mandrakesoft </div><div class='add'>+# সাম: Mandriva </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft পণ্যসমূহ&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva পণ্যসমূহ&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr "&lt;b&gt;ম্যানড্রেকসফ্‌ট&lt;/b&gt; &lt;b&gt;ম্যানড্রেকলিনাক্স&lt;/b&gt; প্রচুর প্রোডাক্ট তৈরী করেছে।"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux এর পণ্যসমূহ হলো:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux এর পণ্যসমূহ হলো:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15870,58 +15870,58 @@ msgstr "\t* &lt;b&gt;পাওয়ারপ্যাক+&lt;/b&gt;, ডেস্কটপ এ</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;x86-64 এর জন্য Mandrakelinux&lt;/b&gt;, আপনার ৬৪‌-বিট প্রোসেসরের সব সম্ভবনাকে "</div><div class='del'>-"কাজে লাগানোর Mandrakelinux সমাধান। "</div><div class='add'>+"\t* &lt;b&gt;x86-64 এর জন্য Mandrivalinux&lt;/b&gt;, আপনার ৬৪‌-বিট প্রোসেসরের সব সম্ভবনাকে "</div><div class='add'>+"কাজে লাগানোর Mandrivalinux সমাধান। "</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft পণ্যসমূহ (Nomad পণ্যসমূহ)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva পণ্যসমূহ (Nomad পণ্যসমূহ)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft দুটি পণ্য তৈরী করেছে যা আপনাকে ইনস্টল করা ছাড়াই &lt;b&gt;যেকোন "</div><div class='del'>-"কম্পিউটারে&lt;/b&gt; Mandrakelinux ব্যবহার করার সুযোগ দেবে। "</div><div class='add'>+"Mandriva দুটি পণ্য তৈরী করেছে যা আপনাকে ইনস্টল করা ছাড়াই &lt;b&gt;যেকোন "</div><div class='add'>+"কম্পিউটারে&lt;/b&gt; Mandrivalinux ব্যবহার করার সুযোগ দেবে। "</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='ctx'> # bootable = ?</div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;মুভ&lt;/b&gt;, একটি Mandrakelinux ডিস্ট্রিবিউশন সম্পূর্ণভাবে একটি বুট CD-ROM থেকে "</div><div class='add'>+"\t* &lt;b&gt;মুভ&lt;/b&gt;, একটি Mandrivalinux ডিস্ট্রিবিউশন সম্পূর্ণভাবে একটি বুট CD-ROM থেকে "</div><div class='ctx'> "চলতে পারে।"</div><div class='ctx'> </div><div class='ctx'> # সাম: ultra-compact = ?</div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, একটি Mandrakelinux ডিস্ট্রিবিউশন যা কিনা আলট্রা‌-"</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, একটি Mandrivalinux ডিস্ট্রিবিউশন যা কিনা আলট্রা‌-"</div><div class='ctx'> "কমপ্যাক্ট “LaCie মোবাইল হার্ড ড্রাইভ” এ পূর্ব-ইনস্টলকৃত।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ম্যানড্রেকসফ্‌ট প্রোডাক্টসমূহ (পেশাদারী সমাধান)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "নিচের ম্যানড্রেকসফ্‌ট প্রোডাক্টসমূহ &lt;b&gt;পেশাদারী প্রয়োজন&lt;/b&gt; মেটানোর জন্য ডিজাইন করা "</div><div class='hunk'>@@ -15930,22 +15930,22 @@ msgstr ""</div><div class='ctx'> # সাম: Corporate = প্রাতিষ্ঠানিক লিখলাম...সিওর না।</div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;কর্পোরেট ডেস্কটপ&lt;/b&gt;, ব্যবসা প্রতিষ্ঠানের উপযুক্ত Mandrakelinux ডেস্কটপ।"</div><div class='add'>+"\t* &lt;b&gt;কর্পোরেট ডেস্কটপ&lt;/b&gt;, ব্যবসা প্রতিষ্ঠানের উপযুক্ত Mandrivalinux ডেস্কটপ।"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='ctx'> # প্রাতিষ্ঠানিক</div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;কর্পোরেট সার্ভার&lt;/b&gt;, Mandrakelinux সার্ভার সমাধান।"</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;কর্পোরেট সার্ভার&lt;/b&gt;, Mandrivalinux সার্ভার সমাধান।"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;একাধিক-নেটওয়ার্ক ফায়ারওয়াল&lt;/b&gt;, Mandrakelinux নিরাপত্তা সমাধান।"</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;একাধিক-নেটওয়ার্ক ফায়ারওয়াল&lt;/b&gt;, Mandrivalinux নিরাপত্তা সমাধান।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15996,10 +15996,10 @@ msgstr "&lt;b&gt;আপনার পছন্দনীয় ডেস্কটপ পর</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PowerPack এর মাধ্যমে আপনি আপনার পচ্ছন্দ অনুযায়ী &lt;b&gt;গ্রাফিক্যাল ডেস্কটপ পরিবেশ&lt;b&gt; "</div><div class='del'>-"বেছে নিতে পারবেন। Mandrakesoft এর জন্য ডিফল্ট &lt;b&gt;KDE&lt;/b&gt;। "</div><div class='add'>+"বেছে নিতে পারবেন। Mandriva এর জন্য ডিফল্ট &lt;b&gt;KDE&lt;/b&gt;। "</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='ctx'> # ব্যবহারকারীর বন্ধুসূলভ</div><div class='hunk'>@@ -16028,10 +16028,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PowerPack এর মাধ্যমে আপনি আপনার পচ্ছনুযায়ী &lt;b&gt;গ্রাফিক্যাল ডেস্কটপ পরিবেশ&lt;/b&gt; বেছে "</div><div class='del'>-"নিতে পারবেন। Mandrakesoft এর জন্য ডিফল্ট হচ্ছে &lt;b&gt;KDE&lt;/b&gt;। "</div><div class='add'>+"নিতে পারবেন। Mandriva এর জন্য ডিফল্ট হচ্ছে &lt;b&gt;KDE&lt;/b&gt;। "</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16164,7 +16164,7 @@ msgstr "&lt;b&gt;অ্যাপ্লিকেশনের বিশাল সীম�</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ম্যানড্রেকলিনাক্স মেনু'তে &lt;b&gt;আপনার সকল কাজসমূহ&lt;/b&gt; এর জন্য আপনি &lt;/b&gt;সহজে-ব্যবহার্য&lt;/"</div><div class='hunk'>@@ -16449,7 +16449,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ম্যান্ড্রেক-লিনাক্স নিয়ন্ত্রণ কেন্দ্র&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='hunk'>@@ -16457,11 +16457,11 @@ msgstr "&lt;b&gt;ম্যান্ড্রেক-লিনাক্স নিয়ন�</div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakelinux নিয়ন্ত্রণ কেন্দ্র&lt;/b&gt; একটি Mandrakelinux-সম্পর্কিত মৌলিক "</div><div class='add'>+"&lt;b&gt;Mandrivalinux নিয়ন্ত্রণ কেন্দ্র&lt;/b&gt; একটি Mandrivalinux-সম্পর্কিত মৌলিক "</div><div class='ctx'> "ইউটিলিটির সমষ্টি যা কিনা আপনার কম্পিউটারের কনফিগারেশন সহজ করে তোলে।  "</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='hunk'>@@ -16489,14 +16489,14 @@ msgstr "&lt;b&gt;উন্মুক্ত সোর্সের মডেল&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "সব কম্পিউটার প্রোগ্রামিং এর মতই, উন্মুক্ত সোর্স সফ্টওয়্যার ডেভেলপমেন্টেও প্রয়োজন &lt;b&gt;সময় "</div><div class='del'>-"এবং লোকবল&lt;/b&gt;। উন্মুক্ত সোর্স ধারনাটির সমর্থনে এবং &lt;b&gt;Mandrakelinux উন্নততর করার "</div><div class='del'>-"উদ্দেশ্যে&lt;/b&gt; Mandrakesoft মূল্য সংযোজিত পণ্য ও সেবা বিক্রয় করে থাকে। আপনি যদি এই "</div><div class='add'>+"এবং লোকবল&lt;/b&gt;। উন্মুক্ত সোর্স ধারনাটির সমর্থনে এবং &lt;b&gt;Mandrivalinux উন্নততর করার "</div><div class='add'>+"উদ্দেশ্যে&lt;/b&gt; Mandriva মূল্য সংযোজিত পণ্য ও সেবা বিক্রয় করে থাকে। আপনি যদি এই "</div><div class='ctx'> "প্রচেষ্টায় সাহায্য করতে চান তবে &lt;b&gt;অনুগ্রহ করে&lt;/b&gt; আমাদের যেকোন পণ্য বা সেবা ক্রয় "</div><div class='ctx'> "করুন!"</div><div class='ctx'> </div><div class='hunk'>@@ -16509,7 +16509,7 @@ msgstr "&lt;b&gt;অনলাইন বিপনীকেন্দ্র&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ম্যনড্রেকসফ্‌টের প্রোডাক্টসমূহ এবং সার্ভিস সম্বন্ধে জ্ঞানার্জনের জন্য, আপনি আমাদের &lt;b&gt;ই-"</div><div class='hunk'>@@ -16537,20 +16537,20 @@ msgstr "আজ &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; এ থেমে যান!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ম্যানড্রেকক্লাব&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr "&lt;b&gt;ম্যানড্রেকক্লাব&lt;/b&gt; আপনার ম্যানড্রেকলিনাক্স প্রোডাক্টের &lt;b&gt;সঠিক সংগী&lt;/b&gt;.."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr "ম্যানড্রেকক্লাবে যোগ দিয়ে &lt;b&gt;মূল্যবান উপকারসমূহের&lt;/b&gt; সুবিধা নিন, যেমন:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16573,7 +16573,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr "\t* ম্যানড্রেকলিনাক্স &lt;b&gt;ব্যবহারকারীদের ফোরাম&lt;/b&gt; এ অংশগ্রহণ।"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='hunk'>@@ -16581,20 +16581,20 @@ msgstr "\t* ম্যানড্রেকলিনাক্স &lt;b&gt;ব্যব�</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Mandrakelinux &lt;b&gt;ISO ইমেজগুলো&lt;/b&gt;, &lt;b&gt;নির্ধারিত সময়ের পূর্বেই&lt;/b&gt;, পাওয়ার "</div><div class='add'>+"\t* Mandrivalinux &lt;b&gt;ISO ইমেজগুলো&lt;/b&gt;, &lt;b&gt;নির্ধারিত সময়ের পূর্বেই&lt;/b&gt;, পাওয়ার "</div><div class='ctx'> "বিশেষ সুবিধা।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;ম্যান্ড্রকঅনলাইন (MandrakeOnline)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;ম্যান্ড্রকঅনলাইন (Mandriva Online)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "&lt;b&gt;ম্যানড্রেকঅনলাইন&lt;/b&gt; হচ্ছে একটি নতুন প্রিমিয়াম সার্ভিস যা ম্যানড্রেকসফ্‌ট তার "</div><div class='hunk'>@@ -16603,8 +16603,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ম্যানড্রেকঅনলাইন আপনার ম্যানড্রেকলিনাক্স সিস্টেমের জন্য &lt;b&gt;সহজে আপডেট&lt;/b&gt; এর জন্য "</div><div class='ctx'> "বিশাল সীমানার গুরুত্বপূর্ণ সার্ভিস:"</div><div class='hunk'>@@ -16631,19 +16631,19 @@ msgstr "\t* নমনীয় &lt;b&gt;রুটিনমাফিক&lt;/b&gt; আপডে�</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* একটি অ্যাকাউন্ট দিয়ে &lt;b&gt;আপনার সম্পূর্ণ ম্যানড্রেকলিনাক্স সিস্টেমের&lt;/b&gt; ম্যানেজমেন্ট।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "আপনার কি কোন &lt;b&gt;সহযোগিতা&lt;/b&gt; প্রয়োজন? www.mandrakeexpert.com এর  &lt;b&gt;আমাদের "</div><div class='hunk'>@@ -16653,7 +16653,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "&lt;b&gt;যোগ্যতাসম্পন্ন অভিজ্ঞ ম্যানড্রেকলিনাক্স ব্যবহারকারীদের&lt;/b&gt; সাহায্যের জন্য ধন্যবাদ, "</div><div class='hunk'>@@ -16662,7 +16662,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ম্যানড্রেকলিনাক্স সম্পর্কিত কোন প্রশ্নের জন্য, আপনাকে &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; "</div><div class='hunk'>@@ -16975,8 +16975,8 @@ msgstr "পর্যবেক্ষণ টুলসমূহ, হিসাবর</div><div class='ctx'> # সাম</div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft উইজার্ডসমূহ"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva উইজার্ডসমূহ"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -17129,12 +17129,12 @@ msgstr ""</div><div class='ctx'> "                 : এবং ghostscript এর জন্য gs।"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='del'>-# Mandrakelinux Terminal</div><div class='add'>+# Mandrivalinux Terminal</div><div class='ctx'> #: standalone.pm:84</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17148,7 +17148,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux টার্মিনাল সার্ভার কনফিগারকারী\n"</div><div class='add'>+"Mandrivalinux টার্মিনাল সার্ভার কনফিগারকারী\n"</div><div class='ctx'> "--enable        :MTS সক্রিয় করো\n"</div><div class='ctx'> "--disable        : MTS নিষ্ক্রিয় করো\n"</div><div class='ctx'> "--start           : MTS চালু করো\n"</div><div class='hunk'>@@ -17209,14 +17209,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='del'>-"  --no-confirmation      MandrakeUpdate মোডে প্রথম নিশ্চিতকরন প্রশ্ন জিজ্ঞাসা করো "</div><div class='add'>+"  --no-confirmation      Mandriva Update মোডে প্রথম নিশ্চিতকরন প্রশ্ন জিজ্ঞাসা করো "</div><div class='ctx'> "না\n"</div><div class='ctx'> "  --no-verify-rpm        প্যাকেজ স্বাক্ষর নিরীক্ষা করো না\n"</div><div class='ctx'> "  --changelog-first      বর্ণনা উইন্ডোতে filelist এর আগে changelog দোখাও\n"</div><div class='hunk'>@@ -19953,12 +19953,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "ম্যানড্রেকলিনাক্স ত্রুটি রিপোর্টকারী টুল"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "ম্যানড্রেকলিনাক্স নিয়ন্ত্রন (control) সেন্টার"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -19979,8 +19979,8 @@ msgstr "হার্ডড্রেক"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "ম্যানড্রেকঅনলাইন (MandrakeOnline)"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "ম্যানড্রেকঅনলাইন (Mandriva Online)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20027,8 +20027,8 @@ msgstr "কনফিগারেশন উইজার্ড"</div><div class='ctx'> # সাম</div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Mandrakesoft টুল বেছে নিন:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Mandriva টুল বেছে নিন:"</div><div class='ctx'> </div><div class='ctx'> # সাম</div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -20456,7 +20456,7 @@ msgstr "বুট হওয়ার সময় সচল হয়"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "এই ইন্টারফেস এখনো কন্‌ফিগার করা হয়নি।\n"</div><div class='ctx'> "ম্যানড্রেকলিনাক্স নিয়ন্ত্রক কেন্দ্র থেকে সহকারী \"ইন্টারফেস যুক্ত করো\" চালান"</div><div class='hunk'>@@ -20466,10 +20466,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "আপনার সিস্টেমে কোন ইন্টারনেট সংযোগ কনফিগার করা নেই।\n"</div><div class='del'>-"অনুগ্রহপূর্বক Mandrakelinux নিয়ন্ত্রণকেন্দ্র থেকে \"%s\" চালান।"</div><div class='add'>+"অনুগ্রহপূর্বক Mandrivalinux নিয়ন্ত্রণকেন্দ্র থেকে \"%s\" চালান।"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20520,7 +20520,7 @@ msgstr "KDM (কেডিই ডিসপ্লে ম্যানেজার)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr "MdkKDM (ম্যানড্রেকলিনাক্স ডিসপ্লে ম্যানেজার)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -20824,7 +20824,7 @@ msgstr "ইমপোর্ট"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21381,7 +21381,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21417,8 +21417,8 @@ msgstr " --doc &lt;link&gt;          - অন্য ওয়েব পেজে সং�</div><div class='ctx'> # সাম</div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux সাহায্যকেন্দ্র"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux সাহায্যকেন্দ্র"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24934,8 +24934,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux টুলসমুহের লগ"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux টুলসমুহের লগ"</div><div class='ctx'> </div><div class='ctx'> # ##যন্ত্রপাতি</div><div class='ctx'> # Logdrake-এর কোন বাংলা হবে বলে আমার মনে হয়না।</div><div class='hunk'>@@ -25476,7 +25476,7 @@ msgstr "সংযোগ সম্পন্ন হয়েছে।"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "কানেকশন হয়নি।\n"</div><div class='ctx'> "ম্যান্ড্রেক-লিনাক্স কন্ট্রোল প্যানেলে আপনার কনফিগারেশন যাচাই করুন।"</div><div class='head'>diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po<br/>index 62dd61d81..f4d17e1e3 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/br.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/br.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/br.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/br.po</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> # DrakX e Brezhoneg.</div><div class='del'>-# Copyright (C) 1999-2003 Mandrakesoft</div><div class='add'>+# Copyright (C) 1999-2003 Mandriva</div><div class='ctx'> # Thierry Vignaud &lt;tvignaud@mandrakesoft.com&gt;, 1999-2005</div><div class='ctx'> # Jañ-Mai Drapier &lt;jan-mai.drapier@mail.dotcom.fr&gt;, 1999-2000</div><div class='ctx'> #</div><div class='hunk'>@@ -59,7 +59,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -78,7 +78,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -86,7 +86,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -94,7 +94,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -223,7 +223,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1230,7 +1230,7 @@ msgstr "Diba ho yezh"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "Gallout a rit dibab yezhoù all hag a vo hegerz goude staliañ"</div><div class='hunk'>@@ -3503,7 +3503,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3613,7 +3613,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3624,11 +3624,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3735,10 +3735,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3855,7 +3855,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -3953,12 +3953,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -3985,7 +3985,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -3994,7 +3994,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4123,7 +4123,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4141,7 +4141,7 @@ msgstr "Diaraog"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4170,7 +4170,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4186,7 +4186,7 @@ msgstr "Melestradur an surentez"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4272,7 +4272,7 @@ msgstr "Tremen er mod boas/mailh"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4317,7 +4317,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4326,13 +4326,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4373,7 +4373,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4532,7 +4532,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4553,7 +4553,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4653,7 +4653,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4670,7 +4670,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4732,7 +4732,7 @@ msgstr "Servijerioù"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5055,7 +5055,7 @@ msgstr "Emaon o jediñ ment ar barzhadur Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5170,19 +5170,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5204,7 +5204,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5212,14 +5212,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5229,7 +5229,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5249,10 +5249,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5263,11 +5263,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5283,7 +5283,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5340,7 +5340,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5348,13 +5348,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gourc'hemennoù, peurc'hraet eo ar staliadur.\n"</div><div class='ctx'> "Lamit ar bladenn loc'hañ ha gwaskit enkas evit adloc'hañ.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Evit titouroù war palastroù hegerz evit stumm-mañ Mandrakelinux,\n"</div><div class='add'>+"Evit titouroù war palastroù hegerz evit stumm-mañ Mandrivalinux,\n"</div><div class='ctx'> "sellit ouzh ar Errata war : \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5362,7 +5362,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Titouroù war gefluniañ ho reizhiad a zo hegerz e rannbennad Goude\n"</div><div class='del'>-"Staliañ Sturier ofisiel an Arveriad Mandrakelinux."</div><div class='add'>+"Staliañ Sturier ofisiel an Arveriad Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -5393,7 +5393,7 @@ msgstr "O kregiñ gant al lankad `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -5911,9 +5911,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"O taremprediñ al lec'hienn Mandrakelinux evit kaout roll ar pakadoù "</div><div class='add'>+"O taremprediñ al lec'hienn Mandrivalinux evit kaout roll ar pakadoù "</div><div class='ctx'> "hegerz ..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6123,8 +6123,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Staliadur Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Staliadur Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -8697,7 +8697,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12294,7 +12294,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14042,18 +14042,18 @@ msgstr "Plaenaozañ"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Petra eo Mandrakelinux ?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Petra eo Mandrivalinux ?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Degemer e &lt;b&gt;Mandrakelinux&lt;/b&gt; !"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Degemer e &lt;b&gt;Mandrivalinux&lt;/b&gt; !"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14062,7 +14062,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14079,9 +14079,9 @@ msgstr "Degemer er &lt;b&gt;bed dieub&lt;/b&gt; !"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14101,7 +14101,7 @@ msgstr "&lt;b&gt;Ar GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14127,10 +14127,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14149,8 +14149,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14177,7 +14177,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14187,7 +14187,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14206,13 +14206,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14224,7 +14224,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14238,20 +14238,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux Control Center"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux Control Center"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -14271,61 +14271,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14363,7 +14363,7 @@ msgstr "All burevioù c'hrafek"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14384,7 +14384,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14501,7 +14501,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14736,14 +14736,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Kreizenn ren Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Kreizenn ren Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14765,9 +14765,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14779,7 +14779,7 @@ msgstr "&lt;b&gt;MandrakeStore&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14802,20 +14802,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -14834,33 +14834,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -14883,32 +14883,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15199,8 +15199,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15295,7 +15295,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15343,7 +15343,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17815,13 +17815,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux Control Center"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Kreizenn ren Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Kreizenn ren Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17841,8 +17841,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17886,8 +17886,8 @@ msgstr "Skoazellerien kefluniadur"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Dibabit un ostilh Mandrakesoft :"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Dibabit un ostilh Mandriva :"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18299,14 +18299,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -18357,7 +18357,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18642,7 +18642,7 @@ msgstr "Enporzh"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19102,7 +19102,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -19129,8 +19129,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Kreizenn sikourMandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Kreizenn sikourMandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -22106,8 +22106,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux Control Center"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -22613,7 +22613,7 @@ msgstr "Echu eo ar gevreadenn"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -23452,8 +23452,8 @@ msgstr " Sac'het eo ar staliadur"</div><div class='ctx'> #~ msgid "You've not selected any font"</div><div class='ctx'> #~ msgstr "N'oc'h eus ket dibabet un nodrezh bennak"</div><div class='ctx'> </div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Skozelerien MandrakeSoft"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Skozelerien Mandriva"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "N'eus furcher da gaout ebet ! Stalit unan mar plij"</div><div class='head'>diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po<br/>index 56c38a80a..9f1f91f2a 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/bs.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/bs.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/bs.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/bs.po</a></div><div class='hunk'>@@ -68,14 +68,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Izgleda da je na USB ključu aktivirana zaštita, ali ga sada ne možemo\n"</div><div class='ctx'> "bezbjedno isključiti.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknite na dugme da restartujete računar, isključite ga, uklonite zašitu\n"</div><div class='del'>-"od pisanja, ponovo utaknite ključ i pokrenite Mandrake Move."</div><div class='add'>+"od pisanja, ponovo utaknite ključ i pokrenite Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -93,7 +93,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vaš USB ključ ne sadrži ispravne Windows (FAT) particije.\n"</div><div class='hunk'>@@ -104,13 +104,13 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Takođe možete nastaviti bez USB ključ - još uvijek možete\n"</div><div class='del'>-"koristiti Mandrake Move kao običan Mandrake operativni sistem."</div><div class='add'>+"koristiti Mandriva Move kao običan Mandrake operativni sistem."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -118,11 +118,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nisam pronašao USB ključ na vašem sistemu. Ako\n"</div><div class='del'>-"uključite USB ključ, Mandrake Move će imati mogućnost\n"</div><div class='add'>+"uključite USB ključ, Mandriva Move će imati mogućnost\n"</div><div class='ctx'> "da transparentno čuva vaše podatke u vašem home direktoriju\n"</div><div class='ctx'> "kao i konfiguraciju sistema za sljedeće pokretanje sistema na\n"</div><div class='ctx'> "ovom ili nekom drugom računaru. Pažnja: ako sada uključite\n"</div><div class='hunk'>@@ -130,7 +130,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Takođe možete nastaviti bez USB ključa - još uvijek možete\n"</div><div class='del'>-"koristiti Mandrake Move kao običan Mandrake operativni sistem."</div><div class='add'>+"koristiti Mandriva Move kao običan Mandrake operativni sistem."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -255,7 +255,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -271,7 +271,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Ovo je možda posljedica korumpiranih sistemskih datoteka\n"</div><div class='ctx'> "na USB ključu, u kojem slučaju će njihovo brisanje i restart\n"</div><div class='del'>-"Mandrake Move riješiti problem. Da to uradite, kliknite na\n"</div><div class='add'>+"Mandriva Move riješiti problem. Da to uradite, kliknite na\n"</div><div class='ctx'> "odgovarajuće dugme.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1305,11 +1305,11 @@ msgstr "Izbor jezika"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux podržava više jezika. Izaberite jezike koje\n"</div><div class='add'>+"Mandrivalinux podržava više jezika. Izaberite jezike koje\n"</div><div class='ctx'> "želite instalirati. Oni će biti dostupni kada se završi vaša\n"</div><div class='ctx'> "instalacija i restartujete vaš sistem."</div><div class='ctx'> </div><div class='hunk'>@@ -3735,12 +3735,12 @@ msgstr "uključi radio podršku"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Prije nego što nastavimo, trebate pažljivo pročitati uvjete licence. Ona\n"</div><div class='del'>-"pokriva cijelu Mandrakelinux distribuciju. Ako se slažete sa svim\n"</div><div class='add'>+"pokriva cijelu Mandrivalinux distribuciju. Ako se slažete sa svim\n"</div><div class='ctx'> "uvjetima u njoj, izaberite opciju \"%s\". Ako ne, klikom na \"%s\" ćete\n"</div><div class='ctx'> "restartovati vaš računar."</div><div class='ctx'> </div><div class='hunk'>@@ -3928,13 +3928,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux instalacija se prostire na nekoliko CDova. Ako je neki\n"</div><div class='add'>+"Mandrivalinux instalacija se prostire na nekoliko CDova. Ako je neki\n"</div><div class='ctx'> "paket smješten na drugom CDu, DrakX će izbaciti trenutni CD i zamoliti vas\n"</div><div class='ctx'> "da ubacite neki drugi po potrebi. Ako nemate potreban CD pri ruci,\n"</div><div class='ctx'> "samo kliknite na \"%s\", odgovarajući paketi neće biti instalirani."</div><div class='hunk'>@@ -3943,11 +3943,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3999,12 +3999,12 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sada je vrijeme da izaberete koje programe želite instalirati na vaš\n"</div><div class='del'>-"sistem. Za Mandrakelinux su dostupne hiljade paketa, pa da bi\n"</div><div class='add'>+"sistem. Za Mandrivalinux su dostupne hiljade paketa, pa da bi\n"</div><div class='ctx'> "njihovo upravljanje bilo lakše, organizovani su u grupe slične\n"</div><div class='ctx'> "primjene.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Paketi su sortirani u grupe ovisno o tipičnoj namjeni vašeg računara.\n"</div><div class='del'>-"U Mandrakelinuxu date su četiri predefinisane kategorije. Možete\n"</div><div class='add'>+"U Mandrivalinuxu date su četiri predefinisane kategorije. Možete\n"</div><div class='ctx'> "miješati i poklapati programe iz raznih grupa, pa tako instalacija ``Radna\n"</div><div class='ctx'> "stanica'' može sadržavati programe iz grupe ``Programiranje''.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4110,10 +4110,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4143,11 +4143,11 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Ako izaberete neki serverski paket, zato što ste specifično izabrali taj\n"</div><div class='ctx'> "paket ili zato što je on dio grupe paketa, bićete zamoljeni da potvrdite da\n"</div><div class='del'>-"zaista želite da taj server bude instaliran. Mandrakelinux obično\n"</div><div class='add'>+"zaista želite da taj server bude instaliran. Mandrivalinux obično\n"</div><div class='ctx'> "automatski pokreće sve instalirane servise prilikom pokretanja sistema.\n"</div><div class='ctx'> "Čak i ako su sigurni i nemaju poznatih problema u trenutku pakovanja\n"</div><div class='ctx'> "distribucije, sasvim je moguće da su neke sigurnosne rupe otkrivene\n"</div><div class='del'>-"nakon što je dovršena ova verzija Mandrakelinuxa. Ako niste sigurni\n"</div><div class='add'>+"nakon što je dovršena ova verzija Mandrivalinuxa. Ako niste sigurni\n"</div><div class='ctx'> "čemu tačno služi taj paket ili zašto ga treba instalirati, kliknite na \"%s"</div><div class='ctx'> "\".\n"</div><div class='ctx'> "Klikom na \"%s\" instalirate navedene servise i oni će biti automatski\n"</div><div class='hunk'>@@ -4304,7 +4304,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4360,7 +4360,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (skraćeno od X Window System) je srce GNU/Linux grafičkog interfejsa\n"</div><div class='ctx'> "o kojem ovise sve grafičke okoline (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker itd.) uključene u Mandrakelinux.\n"</div><div class='add'>+"WindowMaker itd.) uključene u Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Biće vam predstavljena lista različitih parametara koje možete promijeniti\n"</div><div class='ctx'> "da biste dobili optimalan grafički prikaz.\n"</div><div class='hunk'>@@ -4477,12 +4477,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4509,7 +4509,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4518,7 +4518,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4538,12 +4538,12 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Na ovom mjestu trebate izabrati gdje želite instalirati Mandrakelinux\n"</div><div class='add'>+"Na ovom mjestu trebate izabrati gdje želite instalirati Mandrivalinux\n"</div><div class='ctx'> "operativni sistem na vašem hard disku. Ako je disk prazan ili ako postojeći\n"</div><div class='ctx'> "operativni sistem koristi sav prostor na njemu, potrebno je da ga\n"</div><div class='ctx'> "particionirate. U biti, particioniranje hard diska predstavlja logičko\n"</div><div class='ctx'> "organiziranje kako bi se stvorio prostor za instaliranje vašeg novog\n"</div><div class='del'>-"Mandrakelinux sistema.\n"</div><div class='add'>+"Mandrivalinux sistema.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Pošto su efekti particioniranja obično nepovratni, i mogu voditi do gubitka\n"</div><div class='ctx'> "podataka na eventualnom postojećem operativnom sistemu, particioniranje\n"</div><div class='hunk'>@@ -4575,7 +4575,7 @@ msgstr ""</div><div class='ctx'> "podataka, pod uslovom da prethodno defragmentirate Windows particiju\n"</div><div class='ctx'> "i da ona koristi FAT format. Backupovanje vaših podataka je strogo\n"</div><div class='ctx'> "preporučeno. Ova mogućnost je preporučena ako namjeravate koristiti i\n"</div><div class='del'>-"Mandrakelinux i Microsoft Windows na istom računaru.\n"</div><div class='add'>+"Mandrivalinux i Microsoft Windows na istom računaru.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "    Prije izbora ove opcije, molim da imate na umu da će, nakon ove\n"</div><div class='ctx'> "procedure, veličina vaše Microsoft Windows particije biti manja nego\n"</div><div class='hunk'>@@ -4743,7 +4743,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4765,7 +4765,7 @@ msgstr ""</div><div class='ctx'> "Kliknite na \"%s\" kada budete spremni za formatiranje particija.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknite na \"%s\" ako želite da izaberete druge particije za instalaciju\n"</div><div class='del'>-"vašeg novog Mandrakelinux operativnog sistema.\n"</div><div class='add'>+"vašeg novog Mandrivalinux operativnog sistema.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknite na \"%s\" da izaberete particije koje želite provjeriti radi\n"</div><div class='ctx'> "loših blokova."</div><div class='hunk'>@@ -4782,7 +4782,7 @@ msgstr "Nazad"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4794,7 +4794,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kada završite instalaciju Mandrakelinuxa, moguće je da su neki paketi\n"</div><div class='add'>+"Kada završite instalaciju Mandrivalinuxa, moguće je da su neki paketi\n"</div><div class='ctx'> "ažurirani od zadnjeg izdanja. Moguće je da su ispravljeni bugovi ili\n"</div><div class='ctx'> "rješena neka sigurnosna pitanja. Ako želite iskoristiti ova unaprjeđenja,\n"</div><div class='ctx'> "možete ih sada dobaviti sa Interneta. Izaberite \"%s\" ako imate ispravnu\n"</div><div class='hunk'>@@ -4822,7 +4822,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4835,7 +4835,7 @@ msgstr ""</div><div class='ctx'> "jednostavnosti korištenja.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ako ne znate šta izabrati, zadržite ponuđenu opciju. Možete promijeniti\n"</div><div class='del'>-"nivo sigurnosti naknadno koristeći program draksec iz Mandrakelinux\n"</div><div class='add'>+"nivo sigurnosti naknadno koristeći program draksec iz Mandrivalinux\n"</div><div class='ctx'> "Kontrolnog centra.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Polje \"%s\" obavještava sistem o korisniku koji će biti odgovoran za\n"</div><div class='hunk'>@@ -4850,7 +4850,7 @@ msgstr "Sigurnosni administrator"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4921,7 +4921,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sada trebate izabrati koje particije želite koristiti za instalaciju vašeg\n"</div><div class='del'>-"Mandrakelinux sistema. Ako su particije već definisane, iz prijašnje\n"</div><div class='add'>+"Mandrivalinux sistema. Ako su particije već definisane, iz prijašnje\n"</div><div class='ctx'> "GNU/Linux instalacije ili nekim drugim alatom za particioniranje, možete\n"</div><div class='ctx'> "koristiti postojeće particije. U suprotnom, sada morate definisati\n"</div><div class='ctx'> "particije vašeg hard diska.\n"</div><div class='hunk'>@@ -5008,7 +5008,7 @@ msgstr "Prekidač normalnog/ekspertnog moda"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5038,7 +5038,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Na vašem hard disku ustanovljeno je više od jedne Microsoft particije.\n"</div><div class='ctx'> "Molim izaberite onu koju želite smanjiti kako biste instalirali vaš\n"</div><div class='del'>-"Mandrakelinux operativni sistem.\n"</div><div class='add'>+"Mandrivalinux operativni sistem.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Svaka particija je navedena ovako: \"Linux ime\", \"Windows ime\",\n"</div><div class='ctx'> "\"Kapacitet\".\n"</div><div class='hunk'>@@ -5086,7 +5086,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5095,19 +5095,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ovaj korak se aktivira samo ako je na vašem računaru pronađena postojeća\n"</div><div class='ctx'> "GNU/Linux particija.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX sada treba znati da li želite izvršiti novu instalaciju ili\n"</div><div class='del'>-"nadogradnju postojećeg Mandrakelinux sistema:\n"</div><div class='add'>+"nadogradnju postojećeg Mandrivalinux sistema:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". Najčešće ovo će u potpunosti obrisati stari sistem. Ipak,\n"</div><div class='ctx'> "ovisno o vašoj šemi particioniranja, možete spriječiti da neki od vaših\n"</div><div class='hunk'>@@ -5116,14 +5116,14 @@ msgstr ""</div><div class='ctx'> "datotečni sistem, trebate koristiti ovu opciju.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". Ova vrsta instalacije vam omogućuje da ažurirate pakete\n"</div><div class='del'>-"koji su trenutno instalirani na vašem Mandrakelinux sistemu. Vaša trenutna\n"</div><div class='add'>+"koji su trenutno instalirani na vašem Mandrivalinux sistemu. Vaša trenutna\n"</div><div class='ctx'> "šema particioniranja i korisnički podaci neće biti izmijenjeni. Većina\n"</div><div class='ctx'> "ostalih koraka konfiguracije ostaju kao što jesu, slično običnoj "</div><div class='ctx'> "instalaciji.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Opcija ''Nadogradi'' bi trebala raditi ispravno na Mandrakelinux sistemima\n"</div><div class='add'>+"Opcija ''Nadogradi'' bi trebala raditi ispravno na Mandrivalinux sistemima\n"</div><div class='ctx'> "koji koriste verziju \"8.1\" ili kasniju. Obavljanje nadogradnje na ranijim\n"</div><div class='del'>-"verzijama Mandrakelinuxa, prije verzije \"8.1\", nije preporučeno."</div><div class='add'>+"verzijama Mandrivalinuxa, prije verzije \"8.1\", nije preporučeno."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5181,7 +5181,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5221,7 +5221,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "O UTF-8 (Unicode) podršci. Unicode je novi način kodiranja znakova čiji\n"</div><div class='ctx'> "je cilj da obuhvati sve postojeće jezike. Ipak puna podrška za njega pod\n"</div><div class='del'>-"GNU/Linuxom je još uvijek u razvoju. Iz tog razloga, Mandrakelinux će ga\n"</div><div class='add'>+"GNU/Linuxom je još uvijek u razvoju. Iz tog razloga, Mandrivalinux će ga\n"</div><div class='ctx'> "koristiti ovisno o drugim izborima korisnika:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Ako izaberete jezike sa raširenim starim kodiranjem (latin1 jezici, "</div><div class='hunk'>@@ -5462,7 +5462,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5483,11 +5483,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sada je vrijeme da izaberete sistem štampe za vaš računar. Drugi\n"</div><div class='del'>-"operativni sistemi vam možda nude jedan, ali Mandrakelinux nudi\n"</div><div class='add'>+"operativni sistemi vam možda nude jedan, ali Mandrivalinux nudi\n"</div><div class='ctx'> "dva. Svaki od ovih sistema je najbolji za određenu vrstu konfiguracije.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "* \"%s\" -- skraćeno za ``štampaj i nemoj stavljati u red'' (print, do not\n"</div><div class='hunk'>@@ -5514,7 +5514,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Ako sada napravite izbor, pa kasnije zaključite da vam se ne sviđa izabrani\n"</div><div class='ctx'> "sistem štampe, možete ga promijeniti pokretanjem PrinterDrake iz\n"</div><div class='del'>-"Mandrakelinux Kontrolnog centra i klikanjem na dugme \"%s\"."</div><div class='add'>+"Mandrivalinux Kontrolnog centra i klikanjem na dugme \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5632,7 +5632,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5649,7 +5649,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5701,7 +5701,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "* \"%s\": ako želite, možete podesiti vaš Internet pristup ili pristup\n"</div><div class='ctx'> "lokalnoj mreži. Pogledajte štampanu dokumentaciju ili koristite\n"</div><div class='del'>-"Mandrakelinux Kontrolni centar nakon što je završena instalacija\n"</div><div class='add'>+"Mandrivalinux Kontrolni centar nakon što je završena instalacija\n"</div><div class='ctx'> "kako biste koristili ugrađenu pomoć. \n"</div><div class='ctx'> " * \"%s\": omogućuje vam da podesite adrese HTTP i FTP proxyja ako\n"</div><div class='ctx'> "se računar na koji instalirate nalazi iza proxy servera.\n"</div><div class='hunk'>@@ -5716,7 +5716,7 @@ msgstr ""</div><div class='ctx'> "* \"%s\": ako želite promijeniti postavke bootloadera, kliknite na to\n"</div><div class='ctx'> "dugme. Ovo bi trebalo biti rezervisano za napredne korisnike. Pogledajte\n"</div><div class='ctx'> "štampanu dokumentaciju ili pomoć za bootloader konfiguraciju uključenu\n"</div><div class='del'>-"u Mandrakelinux Kontrolni centar.\n"</div><div class='add'>+"u Mandrivalinux Kontrolni centar.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "* \"%s\": ovdje možete fino podešavati koji servisi će biti pokrenuti\n"</div><div class='ctx'> "na vašem računaru. Ako planirate koristiti ovaj računar kao server,\n"</div><div class='hunk'>@@ -5777,11 +5777,11 @@ msgstr "Servisi"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Izaberite hard disk koji želite obrisati kako biste instalirali vašu novu\n"</div><div class='del'>-"Mandrakelinux particiju. Budite pažljivi, svi podaci koji se nalaze na\n"</div><div class='add'>+"Mandrivalinux particiju. Budite pažljivi, svi podaci koji se nalaze na\n"</div><div class='ctx'> "njemu će biti izgubljeni i neće se moći vratiti!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6137,12 +6137,12 @@ msgstr "Izračunavam veličinu Windows particije"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vaša Windows particija je previše fragmentirana. Molim restartujte vaš "</div><div class='ctx'> "računar pod Windows-om, pokrenite ``defrag'' alat, zatim pokrenite "</div><div class='del'>-"Mandrakelinux instalaciju."</div><div class='add'>+"Mandrivalinux instalaciju."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6260,19 +6260,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6294,7 +6294,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6302,14 +6302,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6319,7 +6319,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6339,10 +6339,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6353,11 +6353,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6373,7 +6373,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Budući da prevodilac ovog teksta nije u mogućnosti da osigura pravnu\n"</div><div class='ctx'> "provjeru prevedenog teksta, tekst licence je ostavljen u originalnom "</div><div class='hunk'>@@ -6384,19 +6384,19 @@ msgstr ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6418,7 +6418,7 @@ msgstr ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6426,14 +6426,14 @@ msgstr ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6443,7 +6443,7 @@ msgstr ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6463,10 +6463,10 @@ msgstr ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6477,11 +6477,11 @@ msgstr ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6497,7 +6497,7 @@ msgstr ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6592,7 +6592,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6600,13 +6600,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Čestitamo, instalacija je završena.\n"</div><div class='ctx'> "Uklonite boot medij i pritisnite Enter da restartujete računar.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Za informacije o ispravkama koje su dostupne za ovu verziju Mandrakelinuxa,\n"</div><div class='add'>+"Za informacije o ispravkama koje su dostupne za ovu verziju Mandrivalinuxa,\n"</div><div class='ctx'> "pogledajte Errata koja je dostupna na:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6614,7 +6614,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informacije o podešavanju vašeg sistema su dostupne u poglavlju\n"</div><div class='del'>-"\"Nakon instalacije\" vašeg zvaničnog Mandrakelinux Priručnika za upotrebu."</div><div class='add'>+"\"Nakon instalacije\" vašeg zvaničnog Mandrivalinux Priručnika za upotrebu."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6649,12 +6649,12 @@ msgstr "Prelazim na korak `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vašem sistemu ponestaje resursa. Možda imate neki problem sa instalacijom\n"</div><div class='del'>-"Mandrakelinuxa. Ako se ovo desi, možete pokušati tekstualnu instalaciju. Za "</div><div class='add'>+"Mandrivalinuxa. Ako se ovo desi, možete pokušati tekstualnu instalaciju. Za "</div><div class='ctx'> "ovo,\n"</div><div class='ctx'> "pritisnite `F1' prilikom bootanja CDROMa, zatim unesite `text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7193,9 +7193,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kontaktiram Mandrakelinux web stranicu da bih saznao listu dostupnih "</div><div class='add'>+"Kontaktiram Mandrivalinux web stranicu da bih saznao listu dostupnih "</div><div class='ctx'> "mirrora..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7419,8 +7419,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux instalacija %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux instalacija %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10006,13 +10006,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall podešavanje\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Podesite lični firewall na ovom Mandrakelinux računaru.\n"</div><div class='add'>+"Podesite lični firewall na ovom Mandrivalinux računaru.\n"</div><div class='ctx'> "Ako želite moćnu soluciju posebnog firewalla, molim pogledajte\n"</div><div class='ctx'> "specijaliziranu MandrakeSecurity Firewall distribuciju."</div><div class='ctx'> </div><div class='hunk'>@@ -14062,11 +14062,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pokrenite Scannerdrake (Hardver/Skener u Mandrakelinux Kontrolnom centru) "</div><div class='add'>+"Pokrenite Scannerdrake (Hardver/Skener u Mandrivalinux Kontrolnom centru) "</div><div class='ctx'> "kako biste dijelili vaš skener putem mreže.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -16001,23 +16001,23 @@ msgstr "Stop"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Šta je Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Šta je Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Dobro došli u &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Dobro došli u &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux je &lt;b&gt;Linux distribucija&lt;/b&gt; koja sadržava jezgru sistema, "</div><div class='add'>+"Mandrivalinux je &lt;b&gt;Linux distribucija&lt;/b&gt; koja sadržava jezgru sistema, "</div><div class='ctx'> "koja se naziva &lt;b&gt;operativni sistem&lt;/b&gt; (baziranu na Linux kernelu) kao i "</div><div class='ctx'> "&lt;b&gt;mnoštvo programa&lt;/b&gt; koji zadovoljavaju sve potrebe koje vam mogu pasti "</div><div class='ctx'> "na pamet."</div><div class='hunk'>@@ -16025,10 +16025,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux je &lt;b&gt;najprijateljskija&lt;/b&gt; Linux distribucija danas. On je "</div><div class='add'>+"Mandrivalinux je &lt;b&gt;najprijateljskija&lt;/b&gt; Linux distribucija danas. On je "</div><div class='ctx'> "takođe i jedna od &lt;b&gt;najšire korištenih&lt;/b&gt; Linux distribucija na svijetu!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16044,14 +16044,14 @@ msgstr "Dobro došli u svijet &lt;b&gt;otvorenog izvornog koda&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux u potpunosti podržava open-source model. To znači da je ovo "</div><div class='del'>-"novo izdanje je rezultat &lt;b&gt;saradnje&lt;/b&gt; između &lt;b&gt;Mandrakesoft-ovog tima "</div><div class='del'>-"programera&lt;/b&gt; i &lt;b&gt;međunarodne zajednice&lt;/b&gt; Mandrakelinux saradnika."</div><div class='add'>+"Mandrivalinux u potpunosti podržava open-source model. To znači da je ovo "</div><div class='add'>+"novo izdanje je rezultat &lt;b&gt;saradnje&lt;/b&gt; između &lt;b&gt;Mandriva-ovog tima "</div><div class='add'>+"programera&lt;/b&gt; i &lt;b&gt;međunarodne zajednice&lt;/b&gt; Mandrivalinux saradnika."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16071,10 +16071,10 @@ msgstr "&lt;b&gt;GPL - General Public License&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Većina softvera koji je uključen u ovoj distribuciji, kao i svi "</div><div class='del'>-"Mandrakelinux alati, koriste &lt;b&gt;GNU General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux alati, koriste &lt;b&gt;GNU General Public License&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16104,15 +16104,15 @@ msgstr "&lt;b&gt;Uključite se u zajednicu&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux ima jednu od &lt;b&gt;najvećih zajednica&lt;/b&gt; korisnika i programera. "</div><div class='add'>+"Mandrivalinux ima jednu od &lt;b&gt;najvećih zajednica&lt;/b&gt; korisnika i programera. "</div><div class='ctx'> "Uloga takve zajednice je raznolika, počevši od prijavljivanja bugova do "</div><div class='ctx'> "razvoja novih programa. Zajednica igra &lt;b&gt;ključnu ulogu&lt;/b&gt; u svijetu "</div><div class='del'>-"Mandrakelinuxa."</div><div class='add'>+"Mandrivalinuxa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16133,11 +16133,11 @@ msgstr "&lt;b&gt;Download verzija&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Trenutno instalirate &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. To je besplatna verzija "</div><div class='del'>-"koju Mandrakesoft želi zadržati &lt;b&gt;dostupnom svima&lt;/b&gt;."</div><div class='add'>+"Trenutno instalirate &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. To je besplatna verzija "</div><div class='add'>+"koju Mandriva želi zadržati &lt;b&gt;dostupnom svima&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16169,10 +16169,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Takođe nećete imati pristup &lt;b&gt;servisima&lt;/b&gt; koji su sastavni dio nekih "</div><div class='del'>-"drugih Mandrakesoft proizvoda."</div><div class='add'>+"drugih Mandriva proizvoda."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16181,8 +16181,8 @@ msgstr "&lt;b&gt;Discovery, Tvoj prvi Linux Desktop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Trenutno instalirate &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Trenutno instalirate &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16204,17 +16204,17 @@ msgstr "&lt;b&gt;PowerPack, Najbolji Linux Desktop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Trenutno instalirate &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Trenutno instalirate &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack je Mandrakesoft-ov &lt;b&gt;premijerni Linux desktop&lt;/b&gt; proizvod. "</div><div class='add'>+"PowerPack je Mandriva-ov &lt;b&gt;premijerni Linux desktop&lt;/b&gt; proizvod. "</div><div class='ctx'> "PowerPack uključuje &lt;b&gt;hiljade programa&lt;/b&gt; - sve od najpopularnijih do "</div><div class='ctx'> "najsloženijih."</div><div class='ctx'> </div><div class='hunk'>@@ -16225,8 +16225,8 @@ msgstr "&lt;b&gt;PowerPack+, Linux rješenje za Desktop i Server&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Trenutno instalirate &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Trenutno instalirate &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16242,21 +16242,21 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft proizvodi&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva proizvodi&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; je razvio širok raspon &lt;b&gt;Mandrakelinux&lt;/b&gt; proizvoda."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; je razvio širok raspon &lt;b&gt;Mandrivalinux&lt;/b&gt; proizvoda."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux proizvodi su:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux proizvodi su:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16276,74 +16276,74 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, Linux rješenje za Desktop i Server."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux za x86-64&lt;/b&gt;, Mandrakelinux rješenje kojim ćete izvući "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux za x86-64&lt;/b&gt;, Mandrivalinux rješenje kojim ćete izvući "</div><div class='ctx'> "maksimum iz vašeg 64-bitnog procesora."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft proizvodi (mobilni proizvodi)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva proizvodi (mobilni proizvodi)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft je razvio dva proizvoda koji vam omogućuju da koristite "</div><div class='del'>-"Mandrakelinux &lt;b&gt;na bilo kojem računaru&lt;/b&gt; bez potrebe da ga ustvari "</div><div class='add'>+"Mandriva je razvio dva proizvoda koji vam omogućuju da koristite "</div><div class='add'>+"Mandrivalinux &lt;b&gt;na bilo kojem računaru&lt;/b&gt; bez potrebe da ga ustvari "</div><div class='ctx'> "instalirate:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, Mandrakelinux distribucija koja se izvršava u potpunosti sa "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, Mandrivalinux distribucija koja se izvršava u potpunosti sa "</div><div class='ctx'> "bootabilnog CD-ROMa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, Mandrakelinux distribucija preinstalirana na "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, Mandrivalinux distribucija preinstalirana na "</div><div class='ctx'> "kompaktnom USB hard disku - “LaCie Mobile Hard Drive”."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft proizvodi (profesionalna rješenja)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva proizvodi (profesionalna rješenja)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ispod su navedeni Mandrakesoft proizvodi dizajnirani da zadovolje "</div><div class='add'>+"Ispod su navedeni Mandriva proizvodi dizajnirani da zadovolje "</div><div class='ctx'> "&lt;b&gt;profesionalne potrebe&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrakelinux Desktop za preduzeća."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrivalinux Desktop za preduzeća."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrakelinux rješenje za servere."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrivalinux rješenje za servere."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrakelinux rješenje za sigurnost mreža."</div><div class='add'>+"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrivalinux rješenje za sigurnost mreža."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16386,10 +16386,10 @@ msgstr "&lt;b&gt;Izaberite vaše grafičko radno okruženje&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sa PowerPack-om, imaćete izbor &lt;b&gt;grafičkog radnog okruženja&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft je izabrao &lt;b&gt;KDE&lt;/b&gt; kao podrazumijevano okruženje."</div><div class='add'>+"Mandriva je izabrao &lt;b&gt;KDE&lt;/b&gt; kao podrazumijevano okruženje."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16414,9 +16414,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Uz PowerPack+, imaćete izbor &lt;b&gt;grafičkog radnog okruženja&lt;/b&gt;. Mandrakesoft "</div><div class='add'>+"Uz PowerPack+, imaćete izbor &lt;b&gt;grafičkog radnog okruženja&lt;/b&gt;. Mandriva "</div><div class='ctx'> "je izabrao &lt;b&gt;KDE&lt;/b&gt; kao podrazumijevano okruženje."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16544,10 +16544,10 @@ msgstr "&lt;b&gt;Uživajte u širokoj paleti programa&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"U Mandrakelinux meniju naći ćete &lt;b&gt;jednostavne&lt;/b&gt; programe &lt;b&gt;za sve "</div><div class='add'>+"U Mandrivalinux meniju naći ćete &lt;b&gt;jednostavne&lt;/b&gt; programe &lt;b&gt;za sve "</div><div class='ctx'> "zadatke&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16809,18 +16809,18 @@ msgstr "\t* &lt;b&gt;Postfix&lt;/b&gt; i &lt;b&gt;Sendmail&lt;/b&gt;: Popularni i moćni mail serveri."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Kontrolni centar&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Kontrolni centar&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakelinux Kontrolni centar&lt;/b&gt; je kolecija najvažnijih alata "</div><div class='del'>-"specifičnih za Mandrakelinux koji olakšavaju podešavanje vašeg računara."</div><div class='add'>+"&lt;b&gt;Mandrivalinux Kontrolni centar&lt;/b&gt; je kolecija najvažnijih alata "</div><div class='add'>+"specifičnih za Mandrivalinux koji olakšavaju podešavanje vašeg računara."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16844,16 +16844,16 @@ msgstr "&lt;b&gt;Open-source model&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Kao i svo računarsko programiranje, za razvoj open-source softwara je "</div><div class='ctx'> "&lt;b&gt;potrebno vrijeme i ljudi&lt;/b&gt;. Kako bi poštovao open-source filozofiju, "</div><div class='del'>-"Mandrakesoft vam prodaje dodatnu vrijednost proizvoda i usluga kako bi "</div><div class='del'>-"&lt;b&gt;nastavio usavršavati Mandrakelinux&lt;/b&gt;. Ako želite &lt;b&gt;podržati open-"</div><div class='del'>-"source filozofiju&lt;/b&gt; kao i razvoj Mandrakelinuxa, &lt;b&gt;molimo vas&lt;/b&gt; da "</div><div class='add'>+"Mandriva vam prodaje dodatnu vrijednost proizvoda i usluga kako bi "</div><div class='add'>+"&lt;b&gt;nastavio usavršavati Mandrivalinux&lt;/b&gt;. Ako želite &lt;b&gt;podržati open-"</div><div class='add'>+"source filozofiju&lt;/b&gt; kao i razvoj Mandrivalinuxa, &lt;b&gt;molimo vas&lt;/b&gt; da "</div><div class='ctx'> "razmotrite kupovinu nekog od naših proizvoda ili usluga!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16864,7 +16864,7 @@ msgstr "&lt;b&gt;On-line prodavnica&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Da naučite više o našim proizvodima i uslugama, možete posjetiti našu e-"</div><div class='hunk'>@@ -16893,24 +16893,24 @@ msgstr "Navratite danas u &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; je &lt;b&gt;savršen dodatak&lt;/b&gt; vašem Mandrakelinux proizvodu."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; je &lt;b&gt;savršen dodatak&lt;/b&gt; vašem Mandrivalinux proizvodu."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Iskoristite razne &lt;b&gt;vrijedne pogodnosti&lt;b&gt; tako što ćete se učlaniti u "</div><div class='del'>-"Mandrakeclub, među kojima su:"</div><div class='add'>+"Mandriva Club, među kojima su:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16932,40 +16932,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Učešće u Mandrakelinux &lt;b&gt;korisničkim forumima&lt;/b&gt;"</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Učešće u Mandrivalinux &lt;b&gt;korisničkim forumima&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Rani i privilegovani pristup&lt;/b&gt;, prije javnog izdanja, Mandrakelinux "</div><div class='add'>+"\t* &lt;b&gt;Rani i privilegovani pristup&lt;/b&gt;, prije javnog izdanja, Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;ISO imidžima&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; je nova premijum usluga koju Mandrakesoft s ponosom "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; je nova premijum usluga koju Mandriva s ponosom "</div><div class='ctx'> "nudi svojim klijentima!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline vam pruža širok izbor usluga za &lt;b&gt;jednostavno ažuriranje&lt;/b&gt; "</div><div class='del'>-"vaših Mandrakelinux sistema:"</div><div class='add'>+"Mandriva Online vam pruža širok izbor usluga za &lt;b&gt;jednostavno ažuriranje&lt;/b&gt; "</div><div class='add'>+"vaših Mandrivalinux sistema:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16990,42 +16990,42 @@ msgstr "\t* Fleksibilno &lt;b&gt;planiranje&lt;/b&gt; ažuriranja."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Menadžment &lt;b&gt;svih vaših Mandrakelinux sistema&lt;/b&gt; putem jednog "</div><div class='add'>+"\t* Menadžment &lt;b&gt;svih vaših Mandrivalinux sistema&lt;/b&gt; putem jednog "</div><div class='ctx'> "korisničkog računa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Da li vam je potrebna &lt;b&gt;podrška?&lt;/b&gt; Upoznajte Mandrakesoft tehničke "</div><div class='add'>+"Da li vam je potrebna &lt;b&gt;podrška?&lt;/b&gt; Upoznajte Mandriva tehničke "</div><div class='ctx'> "eksperte na našoj &lt;b&gt;platformi za tehničku podršku&lt;/b&gt; www.mandrakeexpert."</div><div class='ctx'> "com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Zahvaljujući pomoći &lt;b&gt;kvalificiranih eksperata za Mandrakelinux&lt;/b&gt;, "</div><div class='add'>+"Zahvaljujući pomoći &lt;b&gt;kvalificiranih eksperata za Mandrivalinux&lt;/b&gt;, "</div><div class='ctx'> "uštedićete mnogo vremena."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Za bilo kakva pitanja u vezi Mandrakelinuxa, možete kupiti incidente za "</div><div class='add'>+"Za bilo kakva pitanja u vezi Mandrivalinuxa, možete kupiti incidente za "</div><div class='ctx'> "podršku na &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17324,8 +17324,8 @@ msgstr "Alati za nadzor, praćenje potrošnje, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft čarobnjaci"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva čarobnjaci"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17474,7 +17474,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17488,7 +17488,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Podešavanje Mandrakelinux Terminal Servera\n"</div><div class='add'>+"Podešavanje Mandrivalinux Terminal Servera\n"</div><div class='ctx'> "--enable         : omogući MTS\n"</div><div class='ctx'> "--disable        : onemogući MTS\n"</div><div class='ctx'> "--start          : pokreni MTS\n"</div><div class='hunk'>@@ -17545,14 +17545,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='del'>-"  --no-confirmation      ne postavljaj prvo pitanje u MandrakeUpdate modu\n"</div><div class='add'>+"  --no-confirmation      ne postavljaj prvo pitanje u Mandriva Update modu\n"</div><div class='ctx'> "  --no-verify-rpm        ne provjeravaj potpise paketa\n"</div><div class='ctx'> "  --changelog-first      prikaži changelog prije filelist u opisnom prozoru\n"</div><div class='ctx'> "  --merge-all-rpmnew     predloži merge svih pronađenih .rpmnew/.rpmsave "</div><div class='hunk'>@@ -20328,13 +20328,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux alat za prijavu bugova"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux alat za prijavu bugova"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Kontrolni centar"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Kontrolni centar"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20354,8 +20354,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20399,8 +20399,8 @@ msgstr "Čarobnjaci za podešavanje"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Izaberite Mandrakesoft alat:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Izaberite Mandriva alat:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20825,19 +20825,19 @@ msgstr "Pokrenut na bootu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Interfejs još nije podešen.\n"</div><div class='del'>-"Pokrenite asistent \"Dodaj interfejs\" iz Mandrakelinux Kontrolnog centra"</div><div class='add'>+"Pokrenite asistent \"Dodaj interfejs\" iz Mandrivalinux Kontrolnog centra"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Niste podesili nijednu Internet konekciju.\n"</div><div class='del'>-"Pokrenite asistent \"%s\" iz Mandrakelinux Kontrolnog centra"</div><div class='add'>+"Pokrenite asistent \"%s\" iz Mandrivalinux Kontrolnog centra"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20887,8 +20887,8 @@ msgstr "KDM (KDE Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21187,7 +21187,7 @@ msgstr "Uvezi"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21196,7 +21196,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (originalna verzija)\n"</div><div class='hunk'>@@ -21739,14 +21739,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Ovo je slobodan softver i može se distribuirati pod uslovima GNU GPLa.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Upotreba: \n"</div><div class='hunk'>@@ -21775,8 +21775,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux Centar za pomoć"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux Centar za pomoć"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -22046,7 +22046,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sada ćete podesiti instalacioni server, koji se sastoji od PXE servera (DHCP "</div><div class='ctx'> "servera) i TFTP servera.\n"</div><div class='del'>-"Sa ovom opcijom, moći ćete instalirati Mandrakelinux na druge računare na "</div><div class='add'>+"Sa ovom opcijom, moći ćete instalirati Mandrivalinux na druge računare na "</div><div class='ctx'> "vašoj lokalnoj mreži koristećiovaj računar kao izvor.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Prije nego što nastavite, provjerite da li ste podesili mrežni/internet "</div><div class='hunk'>@@ -25302,8 +25302,8 @@ msgstr "Izmjena je napravljena, ali da bi stupila na snagu morate se odjaviti"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Dnevnici Mandrakelinux alata"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Dnevnici Mandrivalinux alata"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25816,10 +25816,10 @@ msgstr "Konekcija završena."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Konekcija nije uspjela.\n"</div><div class='del'>-"Provjerite konfiguraciju u Mandrakelinux Kontrolnom centru."</div><div class='add'>+"Provjerite konfiguraciju u Mandrivalinux Kontrolnom centru."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26701,8 +26701,8 @@ msgstr "Instalacija nije uspjela"</div><div class='ctx'> #~ msgid "You've not selected any font"</div><div class='ctx'> #~ msgstr "Niste izabrali nijedan font"</div><div class='ctx'> </div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Mandrakesoft čarobnjaci"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Mandriva čarobnjaci"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Nemate nijedan browser! Molim instalirajte neki browser"</div><div class='head'>diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po<br/>index d88f56d01..068b7ed9e 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/ca.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/ca.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/ca.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ca.po</a></div><div class='hunk'>@@ -63,7 +63,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -82,7 +82,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -90,7 +90,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -98,7 +98,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -227,7 +227,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1276,11 +1276,11 @@ msgstr "Tria d'idioma"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux pot utilitzar múltiples idiomes. Seleccioneu\n"</div><div class='add'>+"Mandrivalinux pot utilitzar múltiples idiomes. Seleccioneu\n"</div><div class='ctx'> "els llenguatges que vulgueu instal·lar. Estaran disponibles\n"</div><div class='ctx'> "quan reinicieu el sistema, després que la instal·lació s'hagi completat."</div><div class='ctx'> </div><div class='hunk'>@@ -3751,13 +3751,13 @@ msgstr "habilita l'ús de la ràdio"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Abans de continuar, llegiu atentament les clàusules de la llicència. "</div><div class='ctx'> "Cobreix\n"</div><div class='del'>-"tota la distribució Mandrakelinux. Si esteu d'acord amb tots els termes de "</div><div class='add'>+"tota la distribució Mandrivalinux. Si esteu d'acord amb tots els termes de "</div><div class='ctx'> "la\n"</div><div class='ctx'> "llicència, feu clic al quadre \"%s\"; si no, prémer el botó \"%s\"\n"</div><div class='ctx'> "reiniciarà el vostre ordinador."</div><div class='hunk'>@@ -3959,13 +3959,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"La instal·lació del Mandrakelinux està repartida en diversos CD-ROM. Si\n"</div><div class='add'>+"La instal·lació del Mandrivalinux està repartida en diversos CD-ROM. Si\n"</div><div class='ctx'> "un dels paquets escollits està en un altre CD-ROM, DrakX expulsarà el CD\n"</div><div class='ctx'> "actual i us demanarà que n'inseriu un altre. Si no teniu el CD necessari a\n"</div><div class='ctx'> "mà, premeu \"%s\" i els paquets corresponents no s'instal·laran."</div><div class='hunk'>@@ -3974,11 +3974,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4030,10 +4030,10 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ha arribat el moment d'indicar els programes que voleu instal·lar en el\n"</div><div class='del'>-"sistema. Mandrakelinux té milers de paquets, i per facilitar-ne la\n"</div><div class='add'>+"sistema. Mandrivalinux té milers de paquets, i per facilitar-ne la\n"</div><div class='ctx'> "gestió s'han distribuït en grups d'aplicacions similars.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux agrupa els paquets en quatre categories. Podeu mesclar i fer\n"</div><div class='add'>+"Mandrivalinux agrupa els paquets en quatre categories. Podeu mesclar i fer\n"</div><div class='ctx'> "coincidir aplicacions de grups diversos, de manera que una instal·lació\n"</div><div class='ctx'> "d'``Estació de treball'' pot perfectament tenir instal·lades aplicacions\n"</div><div class='ctx'> "de la categoria ``Servidor'' \n"</div><div class='hunk'>@@ -4139,10 +4139,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4173,11 +4173,11 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Si heu seleccionat un paquet de servidor, intencionadament o perquè\n"</div><div class='ctx'> "formava part d'un grup, se us demanarà que confirmeu si realment voleu\n"</div><div class='del'>-"instal·lar aquests servidors. Per defecte, Mandrakelinux iniciarà i "</div><div class='add'>+"instal·lar aquests servidors. Per defecte, Mandrivalinux iniciarà i "</div><div class='ctx'> "instal·larà automàticament qualsevol servidor durant l'arrencada. Tot i que\n"</div><div class='ctx'> "siguin segurs i no tinguin cap problema conegut quan es publica la\n"</div><div class='ctx'> "distribució, és totalment possible que es descobreixin forats de seguretat\n"</div><div class='del'>-"després que aquesta versió de Mandrakelinux quedi finalitzada.\n"</div><div class='add'>+"després que aquesta versió de Mandrivalinux quedi finalitzada.\n"</div><div class='ctx'> "Si no sabeu què se suposa que fa un servei en particular, o per què s'està\n"</div><div class='ctx'> "instal·lant, feu clic a \"%s\". Per defecte, si feu clic a \"%s\" els "</div><div class='ctx'> "serveis\n"</div><div class='hunk'>@@ -4339,7 +4339,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4396,7 +4396,7 @@ msgstr ""</div><div class='ctx'> "L'X (per sistema X Window) és el cor de la interfície gràfica de GNU/Linux\n"</div><div class='ctx'> "de què depenen tots els entorns gràfics (KDE, GNOME, AfterStep, "</div><div class='ctx'> "WindowMaker,\n"</div><div class='del'>-"etc.) que venen amb Mandrakelinux.\n"</div><div class='add'>+"etc.) que venen amb Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Veureu una relació de diferents paràmetres que podeu canviar per aconseguir\n"</div><div class='ctx'> "una visualització gràfica òptima: Targeta gràfica\n"</div><div class='hunk'>@@ -4512,12 +4512,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4544,7 +4544,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4553,7 +4553,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4575,11 +4575,11 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ara és quan heu de decidir en quin lloc del vostre disc dur voleu "</div><div class='ctx'> "instal·lar\n"</div><div class='del'>-"el sistema operatiu Mandrakelinux. Si el disc és buit, o si un sistema\n"</div><div class='add'>+"el sistema operatiu Mandrivalinux. Si el disc és buit, o si un sistema\n"</div><div class='ctx'> "operatiu existent n'utilitza tot l'espai disponible, us caldrà \n"</div><div class='ctx'> "particionar-lo. Bàsicament, particionar un disc dur consisteix a dividir-lo "</div><div class='ctx'> "de\n"</div><div class='del'>-"manera lògica per crear espai on instal·lar el nou sistema Mandrakelinux.\n"</div><div class='add'>+"manera lògica per crear espai on instal·lar el nou sistema Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Atès que els efectes d'aquest procés solen ser irreversibles i poden\n"</div><div class='ctx'> "implicar pèrdua de dades si ja teniu un sistema operatiu instal·lat, el\n"</div><div class='hunk'>@@ -4613,7 +4613,7 @@ msgstr ""</div><div class='ctx'> "de\n"</div><div class='ctx'> "daDES, sempre que la partició de Windows hagi estat desfragmentada\n"</div><div class='ctx'> "prèviament. És molt recomenable, fer una còpia de seguretat de les dades.\n"</div><div class='del'>-"Aquesta opció és la més recomanable si voleu utilitzar tant Mandrakelinux\n"</div><div class='add'>+"Aquesta opció és la més recomanable si voleu utilitzar tant Mandrivalinux\n"</div><div class='ctx'> "com Microsoft Windows al mateix ordinador.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "  Abans de decidir-vos per aquesta opció, penseu que en acabar la partició\n"</div><div class='hunk'>@@ -4622,7 +4622,7 @@ msgstr ""</div><div class='ctx'> "programari.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " *\"%s\": si voleu suprimir totes les dades i particions que teniu al disc\n"</div><div class='del'>-"dur i substituir-les pel sistema Mandrakelinux, podeu escollir aquesta\n"</div><div class='add'>+"dur i substituir-les pel sistema Mandrivalinux, podeu escollir aquesta\n"</div><div class='ctx'> "opció. Aneu amb compte, però, perquè, un cop la confirmeu, no podreu fer-vos "</div><div class='ctx'> "enrere.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4782,7 +4782,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4805,7 +4805,7 @@ msgstr ""</div><div class='ctx'> "Feu clic a \"%s\" quan estigueu a punt per formatar les particions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Feu clic a \"%s\" si voleu seleccionar una altra partició per instal·lar\n"</div><div class='del'>-"el nou sistema Mandrakelinux.\n"</div><div class='add'>+"el nou sistema Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Feu clic a \"%s\" si voleu seleccionar particions on cercar-hi blocs "</div><div class='ctx'> "defectuosos."</div><div class='hunk'>@@ -4822,7 +4822,7 @@ msgstr "Anterior"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4834,7 +4834,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ara esteu instal·lant Mandrakelinux, és probable que alguns paquets\n"</div><div class='add'>+"Ara esteu instal·lant Mandrivalinux, és probable que alguns paquets\n"</div><div class='ctx'> "hagin estat actualitzats desde la data de llançament. Alguns errors poden\n"</div><div class='ctx'> "haver estat resolts, i altres problemes de seguretat poden estar ja "</div><div class='ctx'> "corregits.\n"</div><div class='hunk'>@@ -4864,7 +4864,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4878,7 +4878,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Si no sabeu quin escollir, deixeu l'opció per defecte.. Podreu canviar\n"</div><div class='ctx'> "el nivell de seguretat més tard amb l'eina draksec del\n"</div><div class='del'>-"Centre de Control Mandrakelinux.\n"</div><div class='add'>+"Centre de Control Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "El camp \"%s\" pot informar l'usuari del sistema qui serà el responsable\n"</div><div class='ctx'> "de la seguretat. Els missatges de seguretat s'enviaran a aquesta adreça."</div><div class='hunk'>@@ -4892,7 +4892,7 @@ msgstr "Administrador de seguretat"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4963,7 +4963,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ara és quan heu de decidir quina(es) partició(ns) voleu utilitzar per\n"</div><div class='del'>-"instal·lar el sistema Mandrakelinux. Si ja s'han definit les particions\n"</div><div class='add'>+"instal·lar el sistema Mandrivalinux. Si ja s'han definit les particions\n"</div><div class='ctx'> "en una instal·lació anterior de GNU/Linux o mitjançant una altra eina de\n"</div><div class='ctx'> "particionament, podeu utilitzar les particions existents. En cas contrari,\n"</div><div class='ctx'> "s'han de definir particions al disc dur.\n"</div><div class='hunk'>@@ -5054,7 +5054,7 @@ msgstr "Commuta entre els modes normal i expert"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5084,7 +5084,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "S'ha detectat més d'una partició de Microsoft a la unitat de disc.\n"</div><div class='ctx'> "Si us plau, trieu quina d'elles voleu redimensionar per instal·lar el nou\n"</div><div class='del'>-"sistema operatiu Mandrakelinux.\n"</div><div class='add'>+"sistema operatiu Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cada partició està identificada d'aquesta manera: \"Nom Linux\",\n"</div><div class='ctx'> "\"Nom Windows\" \"Capacitat\".\n"</div><div class='hunk'>@@ -5136,7 +5136,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5145,19 +5145,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Aquest pas només s'activa si s'ha trobat una partició GNU/Linux antiga\n"</div><div class='ctx'> "al vostre ordinador.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX necessita saber si voleu realitzar una instal·lació nova o\n"</div><div class='del'>-"una actualització d'un sistema Mandrakelinux existent:\n"</div><div class='add'>+"una actualització d'un sistema Mandrivalinux existent:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": aquesta opció destrueix gairebé del tot el sistema antic. Si\n"</div><div class='ctx'> "voleu canviar les particions dels discs durs, o el sistema de fitxers,\n"</div><div class='hunk'>@@ -5167,14 +5167,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": aquest tipus d'instal·lació us permet actualitzar els paquets "</div><div class='ctx'> "que\n"</div><div class='del'>-"ja estan instal·lats al sistema Mandrakelinux. L'esquema de particionament\n"</div><div class='add'>+"ja estan instal·lats al sistema Mandrivalinux. L'esquema de particionament\n"</div><div class='ctx'> "actual i les dades d'usuari no queden afectades. La majoria de les altres\n"</div><div class='ctx'> "fases de configuració queden disponibles, de manera similar a una\n"</div><div class='ctx'> "instal·lació estàndard.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"L'opció “Actualitza” ha de funcionar correctament en sistemes Mandrakelinux\n"</div><div class='add'>+"L'opció “Actualitza” ha de funcionar correctament en sistemes Mandrivalinux\n"</div><div class='ctx'> "amb la versió \"8.1\" o posteriors. No es recomana realitzar una\n"</div><div class='del'>-"actualització en versions de Mandrakelinux anteriors a la \"8.1\"."</div><div class='add'>+"actualització en versions de Mandrivalinux anteriors a la \"8.1\"."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -5233,7 +5233,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5271,7 +5271,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "En quant al suport UTF-8 (unicode): Unicode és una nova codificació de\n"</div><div class='ctx'> "caràcters que cobreix tots els idiomes existents. El suport complet a\n"</div><div class='del'>-"GNU/Linux encara està sota desenvolupament. Per aquesta raó, Mandrakelinux\n"</div><div class='add'>+"GNU/Linux encara està sota desenvolupament. Per aquesta raó, Mandrivalinux\n"</div><div class='ctx'> "l'usarà o no depenent de les opcions que esculli l'usuari:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Si escolliu un idioma amb una codificació existent forta(idiomes\n"</div><div class='hunk'>@@ -5510,7 +5510,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5531,11 +5531,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ara cal seleccionar el sistema d'impressió del vostre ordinador. Altres\n"</div><div class='del'>-"sistemes operatius us poden oferir un, però el Mandrakelinux n'ofereix\n"</div><div class='add'>+"sistemes operatius us poden oferir un, però el Mandrivalinux n'ofereix\n"</div><div class='ctx'> "dos. Cada sistema d'impressió és el més convenient per a un tipus de\n"</div><div class='ctx'> "configuració determinat.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5562,7 +5562,7 @@ msgstr ""</div><div class='ctx'> "Si ara feu una tria, i després veieu que el sistema d'impressió no us\n"</div><div class='ctx'> "agrada, podeu canviar-lo executant el PrinterDrake des del Centre de "</div><div class='ctx'> "control\n"</div><div class='del'>-"de Mandrakelinux i fent clic al botó Expert."</div><div class='add'>+"de Mandrivalinux i fent clic al botó Expert."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5684,7 +5684,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5701,7 +5701,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5826,11 +5826,11 @@ msgstr "Serveis"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Escolliu el disc dur que voleu buidar per instal·lar la nova partició\n"</div><div class='del'>-"Mandrakelinux. Aneu amb compte, totes les dades actuals es perdran i no\n"</div><div class='add'>+"Mandrivalinux. Aneu amb compte, totes les dades actuals es perdran i no\n"</div><div class='ctx'> "es podran recuperar!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6187,12 +6187,12 @@ msgstr "S'està calculant la mida de la partició de Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "La partició de Windows està massa fragmentada. Si us plau, reinicieu "</div><div class='ctx'> "l'ordinador sota Windows i executeu l'eina \"defrag\". Llavors, torneu a "</div><div class='del'>-"començar la instal·lació del Mandrakelinux."</div><div class='add'>+"començar la instal·lació del Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6312,19 +6312,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6346,7 +6346,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6354,14 +6354,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6371,7 +6371,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6391,10 +6391,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6405,11 +6405,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6425,22 +6425,22 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Introducció\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "D'ara endavant, hom es referirà al sistema operatiu i als diferents\n"</div><div class='del'>-"components disponibles en la distribució Mandrakelinux com als\n"</div><div class='add'>+"components disponibles en la distribució Mandrivalinux com als\n"</div><div class='ctx'> "\"Productes de programari\". Els Productes de programari inclouen,\n"</div><div class='ctx'> "però no estan restringits a, el conjunt de programes, mètoDES, regles\n"</div><div class='ctx'> "i documentació relativa al sistema operatiu i els diferents\n"</div><div class='del'>-"components de la distribució Mandrakelinux.\n"</div><div class='add'>+"components de la distribució Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Acord de llicència\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Si us plau, llegiu atentament aquest document. Aquest document és un\n"</div><div class='del'>-"acord de llicència entre la vostra persona i Mandrakesoft S.A., que\n"</div><div class='add'>+"acord de llicència entre la vostra persona i Mandriva S.A., que\n"</div><div class='ctx'> "s'aplica als Productes de programari. Pel fet d'instal·lar, duplicar\n"</div><div class='ctx'> "o utilitzar els Productes de programari en qualsevol forma esteu\n"</div><div class='ctx'> "acceptant explícitament, i expressant el vostre acord a avenir-vos a\n"</div><div class='hunk'>@@ -6458,27 +6458,27 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Els Productes de programari i documentació adjunta es subministren\n"</div><div class='ctx'> "\"tal com són\", sense cap garantia, fins al punt permés per la llei.\n"</div><div class='del'>-"Mandrakesoft S.A. no serà, sota cap circumstància, i fins al punt\n"</div><div class='add'>+"Mandriva S.A. no serà, sota cap circumstància, i fins al punt\n"</div><div class='ctx'> "permés per la llei, responsable de cap dany especial, incidental ni\n"</div><div class='ctx'> "directe (incloent, sense limitar-se a, els danys per pèrdua de\n"</div><div class='ctx'> "negocis, interrupció de negocis, pèrdues financeres, multes i costes\n"</div><div class='ctx'> "judicials, o qualsevol altre dany que resultin d'un judici, o\n"</div><div class='ctx'> "qualsevol altre pèrdua d'importància) que resulti de l'ús o de la\n"</div><div class='ctx'> "impossibilitat d'utilitzar els Productes de programari, fins i tot si\n"</div><div class='del'>-"Mandrakesoft S.A. ha estat avisat de la possibilitat que\n"</div><div class='add'>+"Mandriva S.A. ha estat avisat de la possibilitat que\n"</div><div class='ctx'> "s'esdevinguin aquests danys.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "RESPONSABILITAT LIMITADA RELATIVA A LA POSSESSIÓ O UTILITZACIÓ DE PROGRAMARI "</div><div class='ctx'> "PROHIBIT EN ALGUNS PAÏSOS\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Fins al punt permés per la llei, Mandrakesoft S.A. o els seus\n"</div><div class='add'>+"Fins al punt permés per la llei, Mandriva S.A. o els seus\n"</div><div class='ctx'> "distribuïdors no seran, sota cap circumstància, responsables de cap\n"</div><div class='ctx'> "dany especial, incidental ni directe (incloent, sense limitar-se a,\n"</div><div class='ctx'> "els danys per pèrdua de negocis, interrupció de negocis, pèrdues\n"</div><div class='ctx'> "financeres, multes i costes judicials, o qualsevol altre dany que\n"</div><div class='ctx'> "resultin d'un judici, o qualsevol altre pèrdua d'importància) que\n"</div><div class='ctx'> "resulti de la possessió i utilització dels components de programari o\n"</div><div class='del'>-"de la seva descàrrega des d'un dels llocs de Mandrakelinux, que\n"</div><div class='add'>+"de la seva descàrrega des d'un dels llocs de Mandrivalinux, que\n"</div><div class='ctx'> "estiguin prohibides o restringides en alguns països per les lleis\n"</div><div class='ctx'> "locals. Aquesta responsabilitat limitada s'aplica, però no hi està\n"</div><div class='ctx'> "restringida, als potents components criptogràfics inclosos als\n"</div><div class='hunk'>@@ -6496,9 +6496,9 @@ msgstr ""</div><div class='ctx'> "cobreixen. Si us plau, llegiu atentament les clàusules i condicions\n"</div><div class='ctx'> "de l'acord de llicència de cada component abans d'utilitzar-lo.\n"</div><div class='ctx'> "Qualsevol pregunta sobre la llicència d'un component s'ha d'adreçar\n"</div><div class='del'>-"al seu autor i no a Mandrakesoft.\n"</div><div class='del'>-"Els programes desenvolupats per Mandrakesoft S.A. es regeixen per la\n"</div><div class='del'>-"llicència GPL.La documentació escrita per Mandrakesoft S.A. està regida per "</div><div class='add'>+"al seu autor i no a Mandriva.\n"</div><div class='add'>+"Els programes desenvolupats per Mandriva S.A. es regeixen per la\n"</div><div class='add'>+"llicència GPL.La documentació escrita per Mandriva S.A. està regida per "</div><div class='ctx'> "una\n"</div><div class='ctx'> "llicència específica; consulteu la documentació per a més\n"</div><div class='ctx'> "informació.\n"</div><div class='hunk'>@@ -6510,11 +6510,11 @@ msgstr ""</div><div class='ctx'> "pertanyen als seus autors respectius i estan protegits per les lleis\n"</div><div class='ctx'> "de propietat intel·lectual i de copyright aplicables als programes\n"</div><div class='ctx'> "informàtics.\n"</div><div class='del'>-"Mandrakesoft S.A. es reserva els drets de modificar o adaptar els\n"</div><div class='add'>+"Mandriva S.A. es reserva els drets de modificar o adaptar els\n"</div><div class='ctx'> "Productes de programari, totalment o parcialment, per tots els\n"</div><div class='ctx'> "mitjans i amb totes les finalitats.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" i els logotips associats son marques\n"</div><div class='del'>-"registrades de Mandrakesoft S.A.\n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" i els logotips associats son marques\n"</div><div class='add'>+"registrades de Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Lleis rectores \n"</div><div class='hunk'>@@ -6529,7 +6529,7 @@ msgstr ""</div><div class='ctx'> "preferiblement fora dels tribunals. Com a últim recurs, el litigi es\n"</div><div class='ctx'> "portarà als tribunals competents de París, França.\n"</div><div class='ctx'> "Per a qualsevol tema relacionat amb aquest document, poseu-vos en\n"</div><div class='del'>-"contacte amb Mandrakesoft S.A.\n"</div><div class='add'>+"contacte amb Mandriva S.A.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6626,7 +6626,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6634,14 +6634,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Felicitats! La instal·lació ha acabat.\n"</div><div class='ctx'> "Traieu el suport d'arrencada i premeu Retorn per tornar a arrencar.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Trobareu la solució als problemes coneguts d'aquesta versió del\n"</div><div class='del'>-"Mandrakelinux a la fe d'errates que hi ha a \n"</div><div class='add'>+"Mandrivalinux a la fe d'errates que hi ha a \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='hunk'>@@ -6649,7 +6649,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "La informació sobre com configurar el vostre sistema està disponible a\n"</div><div class='ctx'> "l'últim capítol d'instal·lació de la Guia Oficial de l'Usuari del\n"</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6684,12 +6684,12 @@ msgstr "S'està entrant en el pas '%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "El vostre sistema està baix de recursos; podeu tenir algun problema en\n"</div><div class='del'>-"instal·lar el Mandrakelinux. Si això passa, podeu provar d'instal·lar-lo en\n"</div><div class='add'>+"instal·lar el Mandrivalinux. Si això passa, podeu provar d'instal·lar-lo en\n"</div><div class='ctx'> "mode text. Per fer-ho, premeu 'F1' en arrencar des del CD-ROM i escriviu "</div><div class='ctx'> "'text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7240,9 +7240,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"S'està contactant amb el servidor Mandrakelinux per obtenir la llista de "</div><div class='add'>+"S'està contactant amb el servidor Mandrivalinux per obtenir la llista de "</div><div class='ctx'> "rèpliques disponibles..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7476,8 +7476,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Instal·lació del Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Instal·lació del Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10085,14 +10085,14 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Configuració del drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Aquí es configura un tallafocs personal per a aquest ordinador "</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "Per a una potent solució de tallafocs dedicada, consulteu si us plau la \n"</div><div class='ctx'> "distribució especialitzada MandrakeSecurity Firewall."</div><div class='ctx'> </div><div class='hunk'>@@ -14208,7 +14208,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16192,18 +16192,18 @@ msgstr "Atura"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Què és Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Què és Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Benvingut al &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Benvingut al &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -16212,10 +16212,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux és ampliament coneguda com la distribució de Linux més "</div><div class='add'>+"Mandrivalinux és ampliament coneguda com la distribució de Linux més "</div><div class='ctx'> "amigable, fàcil d'instal·lar i usar."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16231,15 +16231,15 @@ msgstr "Benvingut al &lt;b&gt;món del Codi Font Obert&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux està compromès amb el model de codi font obert i respecta "</div><div class='add'>+"Mandrivalinux està compromès amb el model de codi font obert i respecta "</div><div class='ctx'> "completament la General Public License. Aquesta nova versió és el resultat "</div><div class='del'>-"de l'esforç col·laboratiu dels desenvolupadors de Mandrakesoft i els "</div><div class='del'>-"contribuïdors de Mandrakelinux al voltant del món."</div><div class='add'>+"de l'esforç col·laboratiu dels desenvolupadors de Mandriva i els "</div><div class='add'>+"contribuïdors de Mandrivalinux al voltant del món."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16259,10 +16259,10 @@ msgstr "&lt;b&gt;La GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "La major part dels programes inclosos en aquesta distribució i totes les "</div><div class='del'>-"eines de Mandrakelinux estan llicenciades sota la &lt;b&gt;General Public License&lt;/"</div><div class='add'>+"eines de Mandrivalinux estan llicenciades sota la &lt;b&gt;General Public License&lt;/"</div><div class='ctx'> "b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16294,10 +16294,10 @@ msgstr "&lt;b&gt;Uniu-vos a la comunitat&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -16316,8 +16316,8 @@ msgstr "&lt;b&gt;Versió de descàrrega&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -16348,7 +16348,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -16358,8 +16358,8 @@ msgstr "&lt;b&gt;Discovery, El vostre primer escriptori Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Esteu instal·lant &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Esteu instal·lant &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -16379,13 +16379,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Esteu instal·lant &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Esteu instal·lant &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16397,8 +16397,8 @@ msgstr "&lt;b&gt;PowerPack+, La solució Linux per escriptoris i servidors&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Esteu instal·lant &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Esteu instal·lant &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16411,22 +16411,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Productes de Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Productes de Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; ha desenvolupat una àmplia gama de productes "</div><div class='del'>-"&lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; ha desenvolupat una àmplia gama de productes "</div><div class='add'>+"&lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Els productes Mandrakelinux són:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Els productes Mandrivalinux són:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16446,63 +16446,63 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, La solució Linux per escriptoris i servidors."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux per x86-64&lt;/b&gt;, La solució Mandrakelinux per obtenir el "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux per x86-64&lt;/b&gt;, La solució Mandrivalinux per obtenir el "</div><div class='ctx'> "màxim del vostre processador de 64-bit."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Productes de Mandrakesoft (Solucions professionals)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Productes de Mandriva (Solucions professionals)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -16540,7 +16540,7 @@ msgstr "&lt;b&gt;Escolliu el vostre entorn d'escriptori favorit&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -16561,7 +16561,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16681,10 +16681,10 @@ msgstr "&lt;b&gt;Disfruteu de la àmplia gama d'aplicacions&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Al menú de Mandrakelinux trobareu aplicacions fàcils d'usar per totes les "</div><div class='add'>+"Al menú de Mandrivalinux trobareu aplicacions fàcils d'usar per totes les "</div><div class='ctx'> "tasques:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16933,18 +16933,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Centre de Control Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Centre de Control Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"El &lt;b&gt;Centre de Control Mandrakelinux&lt;/b&gt; és una col·lecció essencial de "</div><div class='del'>-"utilitats específiques de Mandrakelinux per simplificar la configuració del "</div><div class='add'>+"El &lt;b&gt;Centre de Control Mandrivalinux&lt;/b&gt; és una col·lecció essencial de "</div><div class='add'>+"utilitats específiques de Mandrivalinux per simplificar la configuració del "</div><div class='ctx'> "vostre ordinador."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16965,9 +16965,9 @@ msgstr "&lt;b&gt;El model del codi font obert&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16979,10 +16979,10 @@ msgstr "&lt;b&gt;Tenda en línia&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Conegui tots els productes i serveis de Mandrakesoft a &lt;b&gt;Mandrakestore&lt;/b&gt; "</div><div class='add'>+"Conegui tots els productes i serveis de Mandriva a &lt;b&gt;Mandriva Store&lt;/b&gt; "</div><div class='ctx'> "-- la nostra plataforma de serveis de comerç electrònic."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -17004,22 +17004,22 @@ msgstr "Passeu-vos avui per &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; és el &lt;b&gt;company perfecte&lt;/b&gt; pel vostre producte "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; és el &lt;b&gt;company perfecte&lt;/b&gt; pel vostre producte "</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -17027,7 +17027,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Special discounts&lt;/b&gt; on products and services of our online store "</div><div class='ctx'> "&lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Descomptes especials en productes i serveis de Mandrakestore"</div><div class='add'>+msgstr "\t* Descomptes especials en productes i serveis de Mandriva Store"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:21</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17040,33 +17040,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Participació en els &lt;b&gt;fòrums d'usuaris&lt;/b&gt; de Mandrakelinux"</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Participació en els &lt;b&gt;fòrums d'usuaris&lt;/b&gt; de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -17091,32 +17091,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -17422,8 +17422,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Auxiliars de Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Auxiliars de Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17519,8 +17519,8 @@ msgstr ""</div><div class='ctx'> "OPCIONS:\n"</div><div class='ctx'> "  --help            - imprimeix aquest missatge d'ajuda.\n"</div><div class='ctx'> "  --report          - el programa ha de ser una de les eines de "</div><div class='del'>-"Mandrakelinux\n"</div><div class='del'>-"  --incident        - el programa ha de ser una de les eines de Mandrakelinux"</div><div class='add'>+"Mandrivalinux\n"</div><div class='add'>+"  --incident        - el programa ha de ser una de les eines de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17571,7 +17571,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17585,7 +17585,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPCIONS]...\n"</div><div class='del'>-"Configurador del servidor de terminal de Mandrakelinux (MTS)\n"</div><div class='add'>+"Configurador del servidor de terminal de Mandrivalinux (MTS)\n"</div><div class='ctx'> "--enable         : habilita l'MTS\n"</div><div class='ctx'> "--disable        : inhabilita l'MTS\n"</div><div class='ctx'> "--start          : inicia l'MTS\n"</div><div class='hunk'>@@ -17642,7 +17642,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17650,7 +17650,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPCIÓ]...\n"</div><div class='ctx'> "  --no-confirmation      no facis la primera pregunta de confirmació en el "</div><div class='del'>-"mode MandrakeUpdate\n"</div><div class='add'>+"mode Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        no comprovis les signatures dels paquets\n"</div><div class='ctx'> "  --changelog-first      mostra el registre de canvis abans de la llista de "</div><div class='ctx'> "fitxers en la finestra de descripció\n"</div><div class='hunk'>@@ -20481,14 +20481,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Eina per a la comunicació d'errors de programació (bugs) de Mandrakelinux"</div><div class='add'>+"Eina per a la comunicació d'errors de programació (bugs) de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Centre de Control Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Centre de Control Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20508,8 +20508,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -20554,7 +20554,7 @@ msgstr "Auxiliars de configuració"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -20989,20 +20989,20 @@ msgstr "Iniciat en l'arrencada"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Aquesta interfície encara no s'ha configurat.\n"</div><div class='ctx'> "Executeu l'auxiliar \"Afegeix una interfície\" del Centre de Control de "</div><div class='del'>-"Mandrakelinux"</div><div class='add'>+"Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Aquesta interfície encara no s'ha configurat.\n"</div><div class='del'>-"Executeu l'auxiliar \"%s\" del Centre de Control de Mandrakelinux"</div><div class='add'>+"Executeu l'auxiliar \"%s\" del Centre de Control de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21052,8 +21052,8 @@ msgstr "KDM (KDE Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21360,7 +21360,7 @@ msgstr "Importa"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21369,7 +21369,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 per Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 per Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (versió original)\n"</div><div class='hunk'>@@ -21942,14 +21942,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Aquest programa és programari lliure i pot ser redistribuït sota els termes "</div><div class='ctx'> "de la GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21975,8 +21975,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Centre d'ajuda de Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Centre d'ajuda de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25132,7 +25132,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -25657,10 +25657,10 @@ msgstr "Connexió completa."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "La connexió ha fallat.\n"</div><div class='del'>-"Comproveu la vostra configuració al Centre de control de Mandrakelinux."</div><div class='add'>+"Comproveu la vostra configuració al Centre de control de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -26548,8 +26548,8 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ msgid "You've not selected any font"</div><div class='ctx'> #~ msgstr "No heu seleccionat cap tipus de lletra"</div><div class='ctx'> </div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Auxiliars de Mandrakesoft"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Auxiliars de Mandriva"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "No hi ha cap navegador disponible! Si us plau, instal·leu-ne un"</div><div class='hunk'>@@ -26732,14 +26732,14 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ msgstr "S'ha produït un error en obrir %s per escriure: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Aquest és el HardDrake, l'eina de configuració de maquinari de "</div><div class='del'>-#~ "Mandrakelinux.\n"</div><div class='add'>+#~ "Mandrivalinux.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Versió:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Autor:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -27183,17 +27183,17 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "És impossible de suprimir la impressora \"%s\" d'Star Office/OpenOffice."</div><div class='ctx'> #~ "org/GIMP."</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Congratulations for choosing Mandrakelinux!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Felicitats per triar Mandrakelinux!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Congratulations for choosing Mandrivalinux!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Felicitats per triar Mandrivalinux!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux operating system and its many applications is the "</div><div class='del'>-#~ "result of collaborative efforts between Mandrakesoft developers and "</div><div class='del'>-#~ "Mandrakelinux contributors throughout the world."</div><div class='add'>+#~ "Your new Mandrivalinux operating system and its many applications is the "</div><div class='add'>+#~ "result of collaborative efforts between Mandriva developers and "</div><div class='add'>+#~ "Mandrivalinux contributors throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "El vostre nou sistema operatiu Mandrakelinux i les seves múltiples "</div><div class='add'>+#~ "El vostre nou sistema operatiu Mandrivalinux i les seves múltiples "</div><div class='ctx'> #~ "aplicacions són el resultat de l'esforç col·laboratiu dels "</div><div class='del'>-#~ "desenvolupadors de Mandrakesoft i els contribuïdors de Mandrakelinux al "</div><div class='add'>+#~ "desenvolupadors de Mandriva i els contribuïdors de Mandrivalinux al "</div><div class='ctx'> #~ "voltant del món."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27290,18 +27290,18 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ msgstr "Veieu i editeu imatges i fotos amb &lt;b&gt;GQview&lt;/b&gt;i &lt;b&gt;El Gimp&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-#~ msgid "Become a &lt;b&gt;Mandrakeclub&lt;/b&gt; member!"</div><div class='del'>-#~ msgstr "Esdeveniu un membre del &lt;b&gt;Mandrakeclub&lt;/b&gt;!"</div><div class='add'>+#~ msgid "Become a &lt;b&gt;Mandriva Club&lt;/b&gt; member!"</div><div class='add'>+#~ msgstr "Esdeveniu un membre del &lt;b&gt;Mandriva Club&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Full access to commercial applications"</div><div class='ctx'> #~ msgstr "\t* Accés complet a aplicacions comercials"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"</div><div class='del'>-#~ msgstr "\t* Llista de rèpliques exclusiva pels membres del Mandrakeclub"</div><div class='add'>+#~ "\t* Special download mirror list exclusively for Mandriva Club Members"</div><div class='add'>+#~ msgstr "\t* Llista de rèpliques exclusiva pels membres del Mandriva Club"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Voting for software to put in Mandrakelinux"</div><div class='del'>-#~ msgstr "\t* Votació dels programes a posar en Mandrakelinux"</div><div class='add'>+#~ msgid "\t* Voting for software to put in Mandrivalinux"</div><div class='add'>+#~ msgstr "\t* Votació dels programes a posar en Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Plus much more"</div><div class='ctx'> #~ msgstr "\t* i molt més"</div><div class='hunk'>@@ -27312,14 +27312,14 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ msgid "Do you require assistance?"</div><div class='ctx'> #~ msgstr "Necessiteu ajuda?"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt; is the primary source for technical support."</div><div class='del'>-#~ msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt; és la font primària per suport tècnic."</div><div class='add'>+#~ msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt; is the primary source for technical support."</div><div class='add'>+#~ msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt; és la font primària per suport tècnic."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "If you have Linux questions, subscribe to Mandrakeexpert at &lt;b&gt;www."</div><div class='add'>+#~ "If you have Linux questions, subscribe to Mandriva Expert at &lt;b&gt;www."</div><div class='ctx'> #~ "mandrakeexpert.com&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Si teniu preguntes en quant a Linux, apunteu-vos a Mandrakeexpert &lt;b&gt;www."</div><div class='add'>+#~ "Si teniu preguntes en quant a Linux, apunteu-vos a Mandriva Expert &lt;b&gt;www."</div><div class='ctx'> #~ "mandrakeexpert.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27337,22 +27337,22 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "mandrake-linux.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "</div><div class='add'>+#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "</div><div class='ctx'> #~ "the latest versions of the most popular Open Source applications."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinux inclou els famosos entorns gràfics KDE i GNOME, a més de "</div><div class='add'>+#~ "Mandrivalinux inclou els famosos entorns gràfics KDE i GNOME, a més de "</div><div class='ctx'> #~ "les últimes versions de les aplicacions de Codi Font Obert més populars."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "</div><div class='add'>+#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "</div><div class='ctx'> #~ "to install and easy to use Linux distribution."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinux és ampliament coneguda com la distribució de Linux més "</div><div class='add'>+#~ "Mandrivalinux és ampliament coneguda com la distribució de Linux més "</div><div class='ctx'> #~ "amigable, fàcil d'instal·lar i usar."</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='add'>+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Conegui Mandrakelinux en un CD autoarrancable amb &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='add'>+#~ "\t* Conegui Mandrivalinux en un CD autoarrancable amb &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "</div><div class='hunk'>@@ -27379,14 +27379,14 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ msgstr "Conegui també les nostres &lt;b&gt;Solucions per empreses&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-#~ msgid "&lt;b&gt;Become a Mandrakeclub member!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Esdeveniu un membre del Mandrakeclub!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Become a Mandriva Club member!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Esdeveniu un membre del Mandriva Club!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Do you require assistance?&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Necessiteu ajuda?&lt;/b&gt;"</div><div class='ctx'> </div><div class='del'>-#~ msgid "This is the Mandrakelinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='del'>-#~ msgstr "Això és Mandrakelinux &lt;b&gt;versió de descàrrega&lt;/b&gt;."</div><div class='add'>+#~ msgid "This is the Mandrivalinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='add'>+#~ msgstr "Això és Mandrivalinux &lt;b&gt;versió de descàrrega&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "The free download version does not include commercial software, and "</div><div class='hunk'>@@ -27398,28 +27398,28 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "gràfiques (com ATI® i NVIDIA®)."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux distribution and its many applications are the "</div><div class='del'>-#~ "result of collaborative efforts between Mandrakesoft developers and "</div><div class='del'>-#~ "Mandrakelinux contributors throughout the world."</div><div class='add'>+#~ "Your new Mandrivalinux distribution and its many applications are the "</div><div class='add'>+#~ "result of collaborative efforts between Mandriva developers and "</div><div class='add'>+#~ "Mandrivalinux contributors throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "La vostra nova distribució Mandrakelinux i les seves múltiples "</div><div class='add'>+#~ "La vostra nova distribució Mandrivalinux i les seves múltiples "</div><div class='ctx'> #~ "aplicacions són el resultat de l'esforç col·laboratiu dels "</div><div class='del'>-#~ "desenvolupadors de Mandrakesoft i els contribuïdors de Mandrakelinux al "</div><div class='add'>+#~ "desenvolupadors de Mandriva i els contribuïdors de Mandrivalinux al "</div><div class='ctx'> #~ "voltant del món."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;PowerPack+&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;PowerPack+&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "It is the only Mandrakelinux product that includes the groupware solution."</div><div class='del'>-#~ msgstr "És l'únic producte Mandrakelinux que inclou la solució groupware."</div><div class='add'>+#~ "It is the only Mandrivalinux product that includes the groupware solution."</div><div class='add'>+#~ msgstr "És l'únic producte Mandrivalinux que inclou la solució groupware."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "When you log into your Mandrakelinux system for the first time, you can "</div><div class='add'>+#~ "When you log into your Mandrivalinux system for the first time, you can "</div><div class='ctx'> #~ "choose between several popular graphical desktops environments, "</div><div class='ctx'> #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Quan entreu per primer cop a Mandrakelinux, podeu escollir entre els "</div><div class='add'>+#~ "Quan entreu per primer cop a Mandrivalinux, podeu escollir entre els "</div><div class='ctx'> #~ "populars entorns gràfics d'escriptori, incloent: KDE, GNOME, WindowMaker, "</div><div class='ctx'> #~ "IceWM, i altres."</div><div class='ctx'> </div><div class='hunk'>@@ -27452,13 +27452,13 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ msgstr "\t* Llibreta d'adreces (servidor i client)"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux distribution is the result of collaborative "</div><div class='del'>-#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "</div><div class='add'>+#~ "Your new Mandrivalinux distribution is the result of collaborative "</div><div class='add'>+#~ "efforts between Mandriva developers and Mandrivalinux contributors "</div><div class='ctx'> #~ "throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "La vostra nova distribució Mandrakelinux és el resultat de l'esforç "</div><div class='del'>-#~ "col·laboratiu dels desenvolupadors de Mandrakesoft i els contribuïdors de "</div><div class='del'>-#~ "Mandrakelinux al voltant del món."</div><div class='add'>+#~ "La vostra nova distribució Mandrivalinux és el resultat de l'esforç "</div><div class='add'>+#~ "col·laboratiu dels desenvolupadors de Mandriva i els contribuïdors de "</div><div class='add'>+#~ "Mandrivalinux al voltant del món."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "We would like to thank everyone who participated in the development of "</div><div class='hunk'>@@ -27528,14 +27528,14 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Before continuing, you should carefully read the terms of the license. "</div><div class='ctx'> #~ "It\n"</div><div class='del'>-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "</div><div class='add'>+#~ "covers the entire Mandrivalinux distribution. If you do agree with all "</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"</div><div class='ctx'> #~ "will reboot your computer."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Abans de continuar, llegiu atentament les clàusules de la llicència. "</div><div class='ctx'> #~ "Cobreix\n"</div><div class='del'>-#~ "tota la distribució Mandrakelinux. Si esteu d'acord amb tots els termes "</div><div class='add'>+#~ "tota la distribució Mandrivalinux. Si esteu d'acord amb tots els termes "</div><div class='ctx'> #~ "de la\n"</div><div class='ctx'> #~ "llicència, feu clic al quadre \"%s\"; si no, prémer el botó \"%s\"\n"</div><div class='ctx'> #~ "reiniciarà el vostre ordinador."</div><div class='hunk'>@@ -27653,25 +27653,25 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "Si no hi esteu interessat, desactiveu el quadre \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+#~ "The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> #~ "selected package is located on another CD-ROM, DrakX will eject the "</div><div class='ctx'> #~ "current\n"</div><div class='ctx'> #~ "CD and ask you to insert the correct CD as required."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "La instal·lació del Mandrakelinux està repartida en diversos CD-ROM. Si\n"</div><div class='add'>+#~ "La instal·lació del Mandrivalinux està repartida en diversos CD-ROM. Si\n"</div><div class='ctx'> #~ "un dels paquets escollits està en un altre CD-ROM, DrakX expulsarà el CD\n"</div><div class='ctx'> #~ "actual i us demanarà que n'inseriu un altre."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "It is now time to specify which programs you wish to install on your\n"</div><div class='del'>-#~ "system. There are thousands of packages available for Mandrakelinux, and\n"</div><div class='add'>+#~ "system. There are thousands of packages available for Mandrivalinux, and\n"</div><div class='ctx'> #~ "to make it simpler to manage the packages have been placed into groups "</div><div class='ctx'> #~ "of\n"</div><div class='ctx'> #~ "similar applications.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Packages are sorted into groups corresponding to a particular use of "</div><div class='ctx'> #~ "your\n"</div><div class='del'>-#~ "machine. Mandrakelinux sorts packages groups in four categories. You can\n"</div><div class='add'>+#~ "machine. Mandrivalinux sorts packages groups in four categories. You can\n"</div><div class='ctx'> #~ "mix and match applications from the various categories, so a\n"</div><div class='ctx'> #~ "``Workstation'' installation can still have applications from the\n"</div><div class='ctx'> #~ "``Development'' category installed.\n"</div><div class='hunk'>@@ -27724,11 +27724,11 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "updating an existing system."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Ha arribat el moment d'indicar els programes que voleu instal·lar en el\n"</div><div class='del'>-#~ "sistema. Mandrakelinux té milers de paquets, i per facilitar-ne la\n"</div><div class='add'>+#~ "sistema. Mandrivalinux té milers de paquets, i per facilitar-ne la\n"</div><div class='ctx'> #~ "gestió s'han distribuït en grups d'aplicacions similars.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Els paquets s'agrupen segons l'ús que vulgueu donar a l'ordinador.\n"</div><div class='del'>-#~ "Mandrakelinux agrupa els paquets en quatre categories. Podeu mesclar i "</div><div class='add'>+#~ "Mandrivalinux agrupa els paquets en quatre categories. Podeu mesclar i "</div><div class='ctx'> #~ "fer\n"</div><div class='ctx'> #~ "coincidir aplicacions de grups diversos, de manera que una instal·lació\n"</div><div class='ctx'> #~ "d'``Estació de treball'' pot perfectament tenir instal·lades aplicacions\n"</div><div class='hunk'>@@ -27792,11 +27792,11 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "chose the individual package or because it was part of a group of "</div><div class='ctx'> #~ "packages,\n"</div><div class='ctx'> #~ "you will be asked to confirm that you really want those servers to be\n"</div><div class='del'>-#~ "installed. By default Mandrakelinux will automatically start any "</div><div class='add'>+#~ "installed. By default Mandrivalinux will automatically start any "</div><div class='ctx'> #~ "installed\n"</div><div class='ctx'> #~ "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> #~ "the time the distribution was shipped, it is entirely possible that that\n"</div><div class='del'>-#~ "security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+#~ "security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> #~ "finalized. If you do not know what a particular service is supposed to "</div><div class='ctx'> #~ "do\n"</div><div class='ctx'> #~ "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"</div><div class='hunk'>@@ -27835,13 +27835,13 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Si heu seleccionat un paquet de servidor, intencionadament o perquè\n"</div><div class='ctx'> #~ "formava part d'un grup, se us demanarà que confirmeu si realment voleu\n"</div><div class='del'>-#~ "instal·lar aquests servidors. Per defecte, Mandrakelinux iniciarà i "</div><div class='add'>+#~ "instal·lar aquests servidors. Per defecte, Mandrivalinux iniciarà i "</div><div class='ctx'> #~ "instal·larà automàticament qualsevol servidor durant l'arrencada. Tot i "</div><div class='ctx'> #~ "que\n"</div><div class='ctx'> #~ "siguin segurs i no tinguin cap problema conegut quan es publica la\n"</div><div class='ctx'> #~ "distribució, és totalment possible que es descobreixin forats de "</div><div class='ctx'> #~ "seguretat\n"</div><div class='del'>-#~ "després que aquesta versió de Mandrakelinux quedi finalitzada.\n"</div><div class='add'>+#~ "després que aquesta versió de Mandrivalinux quedi finalitzada.\n"</div><div class='ctx'> #~ "Si no sabeu què se suposa que fa un servei en particular, o per què "</div><div class='ctx'> #~ "s'està\n"</div><div class='ctx'> #~ "instal·lant, feu clic a \"%s\". Per defecte, si feu clic a \"%s\" els "</div><div class='hunk'>@@ -27876,7 +27876,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "You will now set up your Internet/network connection. If you wish to\n"</div><div class='ctx'> #~ "connect your computer to the Internet or to a local network, click \"%s"</div><div class='ctx'> #~ "\".\n"</div><div class='del'>-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"</div><div class='add'>+#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"</div><div class='ctx'> #~ "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"</div><div class='ctx'> #~ "configure the network, or to do it later, in which case clicking the \"%s"</div><div class='ctx'> #~ "\"\n"</div><div class='hunk'>@@ -27897,7 +27897,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "modems\n"</div><div class='ctx'> #~ "that require additional software to work compared to Normal modems. Some "</div><div class='ctx'> #~ "of\n"</div><div class='del'>-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"</div><div class='add'>+#~ "those modems actually work under Mandrivalinux, some others do not. You\n"</div><div class='ctx'> #~ "can consult the list of supported modems at LinModems.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You can consult the ``Starter Guide'' chapter about Internet connections\n"</div><div class='hunk'>@@ -27907,7 +27907,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Ara configurareu la connexió a Internet/xarxa. Si voleu connectar\n"</div><div class='ctx'> #~ "el vostre ordinador a Internet o a una xarxa local, feu clic a \"%s\".\n"</div><div class='del'>-#~ "Mandrakelinux intentarà detectar automàticament els dispositius\n"</div><div class='add'>+#~ "Mandrivalinux intentarà detectar automàticament els dispositius\n"</div><div class='ctx'> #~ "de xarxa i els mòdems. Si aquesta detecció falla, desactiveu la\n"</div><div class='ctx'> #~ "casella \"%s\". També podeu decidir no configurar la xarxa, o\n"</div><div class='ctx'> #~ "fer-ho més endavant; en aquest cas feu clic al botó \"%s\" per\n"</div><div class='hunk'>@@ -27927,7 +27927,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "especials\n"</div><div class='ctx'> #~ "integrats de gama baixa que necessiten programari addicional per "</div><div class='ctx'> #~ "funcionar.\n"</div><div class='del'>-#~ "Alguns d'aquests mòdems funcionen a Mandrakelinux, i d'altres no. Podeu\n"</div><div class='add'>+#~ "Alguns d'aquests mòdems funcionen a Mandrivalinux, i d'altres no. Podeu\n"</div><div class='ctx'> #~ "consultar una llista de mòdems suportats a LinModems.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Podeu consultar el capítol sobre connexions a Internet de la ``Guia\n"</div><div class='hunk'>@@ -28062,7 +28062,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "X (for X Window System) is the heart of the GNU/Linux graphical "</div><div class='ctx'> #~ "interface\n"</div><div class='ctx'> #~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-#~ "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You will be presented with a list of different parameters to change to "</div><div class='ctx'> #~ "get\n"</div><div class='hunk'>@@ -28127,7 +28127,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "Linux\n"</div><div class='ctx'> #~ "de què depenen tots els entorns gràfics (KDE, GNOME, AfterStep, "</div><div class='ctx'> #~ "WindowMaker,\n"</div><div class='del'>-#~ "etc.) que venen amb Mandrakelinux.\n"</div><div class='add'>+#~ "etc.) que venen amb Mandrivalinux.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Veureu una relació de diferents paràmetres que podeu canviar per "</div><div class='ctx'> #~ "aconseguir\n"</div><div class='hunk'>@@ -28256,7 +28256,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "have to partition the drive. Basically, partitioning a hard drive "</div><div class='ctx'> #~ "consists\n"</div><div class='ctx'> #~ "of logically dividing it to create the space needed to install your new\n"</div><div class='del'>-#~ "Mandrakelinux system.\n"</div><div class='add'>+#~ "Mandrivalinux system.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> #~ "and can lead to lost data if there is an existing operating system "</div><div class='hunk'>@@ -28295,7 +28295,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> #~ "data, provided you have previously defragmented the Windows partition.\n"</div><div class='ctx'> #~ "Backing up your data is strongly recommended.. Using this option is\n"</div><div class='del'>-#~ "recommended if you want to use both Mandrakelinux and Microsoft Windows "</div><div class='add'>+#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "</div><div class='ctx'> #~ "on\n"</div><div class='ctx'> #~ "the same computer.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28305,7 +28305,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "Windows to store your data or to install new software.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": if you want to delete all data and all partitions present on\n"</div><div class='del'>-#~ "your hard drive and replace them with your new Mandrakelinux system,\n"</div><div class='add'>+#~ "your hard drive and replace them with your new Mandrivalinux system,\n"</div><div class='ctx'> #~ "choose this option. Be careful, because you will not be able to undo "</div><div class='ctx'> #~ "your\n"</div><div class='ctx'> #~ "choice after you confirm.\n"</div><div class='hunk'>@@ -28332,12 +28332,12 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Ara és quan heu de decidir en quin lloc del vostre disc dur voleu "</div><div class='ctx'> #~ "instal·lar\n"</div><div class='del'>-#~ "el sistema operatiu Mandrakelinux. Si el disc és buit, o si un sistema\n"</div><div class='add'>+#~ "el sistema operatiu Mandrivalinux. Si el disc és buit, o si un sistema\n"</div><div class='ctx'> #~ "operatiu existent n'utilitza tot l'espai disponible, us caldrà \n"</div><div class='ctx'> #~ "particionar-lo. Bàsicament, particionar un disc dur consisteix a dividir-"</div><div class='ctx'> #~ "lo de\n"</div><div class='ctx'> #~ "manera lògica per crear espai on instal·lar el nou sistema "</div><div class='del'>-#~ "Mandrakelinux.\n"</div><div class='add'>+#~ "Mandrivalinux.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Atès que els efectes d'aquest procés solen ser irreversibles i poden\n"</div><div class='ctx'> #~ "implicar pèrdua de dades si ja teniu un sistema operatiu instal·lat, el\n"</div><div class='hunk'>@@ -28376,7 +28376,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "prèviament. És molt recomenable, fer una còpia de seguretat de les "</div><div class='ctx'> #~ "dades.\n"</div><div class='ctx'> #~ "Aquesta opció és la més recomanable si voleu utilitzar tant "</div><div class='del'>-#~ "Mandrakelinux\n"</div><div class='add'>+#~ "Mandrivalinux\n"</div><div class='ctx'> #~ "com Microsoft Windows al mateix ordinador.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "  Abans de decidir-vos per aquesta opció, penseu que en acabar la "</div><div class='hunk'>@@ -28388,7 +28388,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " *\"%s\": si voleu suprimir totes les dades i particions que teniu al "</div><div class='ctx'> #~ "disc\n"</div><div class='del'>-#~ "dur i substituir-les pel sistema Mandrakelinux, podeu escollir aquesta\n"</div><div class='add'>+#~ "dur i substituir-les pel sistema Mandrivalinux, podeu escollir aquesta\n"</div><div class='ctx'> #~ "opció. Aneu amb compte, però, perquè, un cop la confirmeu, no podreu fer-"</div><div class='ctx'> #~ "vos enrere.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28509,7 +28509,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "Click on \"%s\" when you are ready to format the partitions.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-#~ "Mandrakelinux operating system installation.\n"</div><div class='add'>+#~ "Mandrivalinux operating system installation.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click on \"%s\" if you wish to select partitions that will be checked "</div><div class='ctx'> #~ "for\n"</div><div class='hunk'>@@ -28537,13 +28537,13 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "Feu clic a \"%s\" quan estigueu a punt per formatar les particions.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Feu clic a \"%s\" si voleu seleccionar una altra partició per instal·lar\n"</div><div class='del'>-#~ "el nou sistema Mandrakelinux.\n"</div><div class='add'>+#~ "el nou sistema Mandrivalinux.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Feu clic a \"%s\" si voleu seleccionar particions on cercar-hi blocs "</div><div class='ctx'> #~ "defectuosos."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "At the time you are installing Mandrakelinux, it is likely that some\n"</div><div class='add'>+#~ "At the time you are installing Mandrivalinux, it is likely that some\n"</div><div class='ctx'> #~ "packages will have been updated since the initial release. Bugs may have\n"</div><div class='ctx'> #~ "been fixed, security issues resolved. To allow you to benefit from these\n"</div><div class='ctx'> #~ "updates, you are now able to download them from the Internet. Check \"%s"</div><div class='hunk'>@@ -28558,7 +28558,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "selected package(s), or \"%s\" to abort."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Ara esteu instal·lant Mandrakelinux, és probable que alguns paquets\n"</div><div class='add'>+#~ "Ara esteu instal·lant Mandrivalinux, és probable que alguns paquets\n"</div><div class='ctx'> #~ "hagin estat actualitzats desde la data de llançament. Alguns errors "</div><div class='ctx'> #~ "poden\n"</div><div class='ctx'> #~ "haver estat resolts, i altres problemes de seguretat poden estar ja "</div><div class='hunk'>@@ -28604,7 +28604,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Si no sabeu quin escollir, deixeu l'opció per defecte.. Podreu canviar\n"</div><div class='ctx'> #~ "el nivell de seguretat més tard amb l'eina draksec del\n"</div><div class='del'>-#~ "Centre de Control Mandrakelinux.\n"</div><div class='add'>+#~ "Centre de Control Mandrivalinux.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "El camp \"%s\" pot informar l'usuari del sistema qui serà el responsable\n"</div><div class='ctx'> #~ "de la seguretat. Els missatges de seguretat s'enviaran a aquesta adreça."</div><div class='hunk'>@@ -28628,7 +28628,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "DrakX now needs to know if you want to perform a new install or an "</div><div class='ctx'> #~ "upgrade\n"</div><div class='del'>-#~ "of an existing Mandrakelinux system:\n"</div><div class='add'>+#~ "of an existing Mandrivalinux system:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": For the most part, this completely wipes out the old system. "</div><div class='ctx'> #~ "If\n"</div><div class='hunk'>@@ -28640,21 +28640,21 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "written.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": this installation class allows you to update the packages\n"</div><div class='del'>-#~ "currently installed on your Mandrakelinux system. Your current\n"</div><div class='add'>+#~ "currently installed on your Mandrivalinux system. Your current\n"</div><div class='ctx'> #~ "partitioning scheme and user data is not altered. Most of other\n"</div><div class='ctx'> #~ "configuration steps remain available, similar to a standard "</div><div class='ctx'> #~ "installation.\n"</div><div class='ctx'> #~ "\n"</div><div class='del'>-#~ "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> #~ "running version \"8.1\" or later. Performing an Upgrade on versions "</div><div class='ctx'> #~ "prior\n"</div><div class='del'>-#~ "to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+#~ "to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Aquest pas només s'activa si s'ha trobat una partició GNU/Linux antiga\n"</div><div class='ctx'> #~ "al vostre ordinador.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "DrakX necessita saber si voleu realitzar una instal·lació nova o\n"</div><div class='del'>-#~ "una actualització d'un sistema Mandrakelinux existent:\n"</div><div class='add'>+#~ "una actualització d'un sistema Mandrivalinux existent:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": aquesta opció destrueix gairebé del tot el sistema antic. Si\n"</div><div class='ctx'> #~ "voleu canviar les particions dels discs durs, o el sistema de fitxers,\n"</div><div class='hunk'>@@ -28666,7 +28666,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": aquest tipus d'instal·lació us permet actualitzar els paquets "</div><div class='ctx'> #~ "que\n"</div><div class='del'>-#~ "ja estan instal·lats al sistema Mandrakelinux. L'esquema de "</div><div class='add'>+#~ "ja estan instal·lats al sistema Mandrivalinux. L'esquema de "</div><div class='ctx'> #~ "particionament\n"</div><div class='ctx'> #~ "actual i les dades d'usuari no queden afectades. La majoria de les "</div><div class='ctx'> #~ "altres\n"</div><div class='hunk'>@@ -28674,9 +28674,9 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "instal·lació estàndard.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "L'opció “Actualitza” ha de funcionar correctament en sistemes "</div><div class='del'>-#~ "Mandrakelinux\n"</div><div class='add'>+#~ "Mandrivalinux\n"</div><div class='ctx'> #~ "amb la versió \"8.1\" o posteriors. No es recomana realitzar una\n"</div><div class='del'>-#~ "actualització en versions de Mandrakelinux anteriors a la \"8.1\"."</div><div class='add'>+#~ "actualització en versions de Mandrivalinux anteriors a la \"8.1\"."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Depending on the language you chose in section , DrakX will "</div><div class='hunk'>@@ -28743,7 +28743,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "About UTF-8 (unicode) support: Unicode is a new character encoding meant "</div><div class='ctx'> #~ "to\n"</div><div class='ctx'> #~ "cover all existing languages. Though full support for it in GNU/Linux is\n"</div><div class='del'>-#~ "still under development. For that reason, Mandrakelinux will be using it\n"</div><div class='add'>+#~ "still under development. For that reason, Mandrivalinux will be using it\n"</div><div class='ctx'> #~ "or not depending on the user choices:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * If you choose a languages with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -28790,7 +28790,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "En quant al suport UTF-8 (unicode): Unicode és una nova codificació de\n"</div><div class='ctx'> #~ "caràcters que cobreix tots els idiomes existents. El suport complet a\n"</div><div class='ctx'> #~ "GNU/Linux encara està sota desenvolupament. Per aquesta raó, "</div><div class='del'>-#~ "Mandrakelinux\n"</div><div class='add'>+#~ "Mandrivalinux\n"</div><div class='ctx'> #~ "l'usarà o no depenent de les opcions que esculli l'usuari:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * Si escolliu un idioma amb una codificació existent forta(idiomes\n"</div><div class='hunk'>@@ -29027,7 +29027,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "checking this box.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"</div><div class='del'>-#~ "\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"</div><div class='add'>+#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"</div><div class='ctx'> #~ "system! Be sure you know what you are doing before changing any of the\n"</div><div class='ctx'> #~ "options. !!\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -29067,7 +29067,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "!! Tingueu en compte que si escolliu no instal·lar un carregador\n"</div><div class='ctx'> #~ "d'arrencada (seleccionant \"%s\"), heu d'estar segurs que teniu alguna\n"</div><div class='del'>-#~ "manera d'arrencar el vostre sistema Mandrakelinux! Assegureu-vos de\n"</div><div class='add'>+#~ "manera d'arrencar el vostre sistema Mandrivalinux! Assegureu-vos de\n"</div><div class='ctx'> #~ "saber què feu abans de canviar alguna de les opcions!!\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Si feu clic al botó \"%s\" d'aquest diàleg accedireu a algunes opcions\n"</div><div class='hunk'>@@ -29172,7 +29172,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Now, it's time to select a printing system for your computer. Other OSs "</div><div class='ctx'> #~ "may\n"</div><div class='del'>-#~ "offer you one, but Mandrakelinux offers two. Each of the printing "</div><div class='add'>+#~ "offer you one, but Mandrivalinux offers two. Each of the printing "</div><div class='ctx'> #~ "systems\n"</div><div class='ctx'> #~ "is best suited to particular types of configuration.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -29208,7 +29208,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "Center and clicking the expert button."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Ara cal seleccionar el sistema d'impressió del vostre ordinador. Altres\n"</div><div class='del'>-#~ "sistemes operatius us poden oferir un, però el Mandrakelinux n'ofereix\n"</div><div class='add'>+#~ "sistemes operatius us poden oferir un, però el Mandrivalinux n'ofereix\n"</div><div class='ctx'> #~ "dos. Cada sistema d'impressió és el més convenient per a un tipus de\n"</div><div class='ctx'> #~ "configuració determinat.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -29239,7 +29239,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "Si ara feu una tria, i després veieu que el sistema d'impressió no us\n"</div><div class='ctx'> #~ "agrada, podeu canviar-lo executant el PrinterDrake des del Centre de "</div><div class='ctx'> #~ "control\n"</div><div class='del'>-#~ "de Mandrakelinux i fent clic al botó Expert."</div><div class='add'>+#~ "de Mandrivalinux i fent clic al botó Expert."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "You can add additional entries in yaboot for other operating systems,\n"</div><div class='hunk'>@@ -29630,7 +29630,7 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ msgstr "L'mkraid ha fallat"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Mandrake Control Center&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Centre de Control Mandrakelinux&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Centre de Control Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "The Mandrake Control Center is an essential collection of Mandrake-"</div><div class='hunk'>@@ -29641,10 +29641,10 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "ordinador."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='add'>+#~ "Find all Mandriva products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='ctx'> #~ "our full service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Conegui tots els productes i serveis de Mandrakesoft a &lt;b&gt;MandrakeStore&lt;/"</div><div class='add'>+#~ "Conegui tots els productes i serveis de Mandriva a &lt;b&gt;MandrakeStore&lt;/"</div><div class='ctx'> #~ "b&gt; -- la nostra plataforma de serveis de comerç electrònic."</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -29658,15 +29658,15 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ msgid "\t* Special discounts for products and services at MandrakeStore"</div><div class='ctx'> #~ msgstr "\t* Descomptes especials en productes i serveis de MandrakeStore"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with &lt;b&gt;MandrakeMove&lt;/b&gt;"</div><div class='add'>+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with &lt;b&gt;Mandriva Move&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Conegui Mandrakelinux en un CD autoarrancable amb &lt;b&gt;MandrakeMove&lt;/b&gt;"</div><div class='add'>+#~ "\t* Conegui Mandrivalinux en un CD autoarrancable amb &lt;b&gt;Mandriva Move&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products at &lt;b&gt;MandrakeStore&lt;/b&gt; -- our full "</div><div class='add'>+#~ "Find all Mandriva products at &lt;b&gt;MandrakeStore&lt;/b&gt; -- our full "</div><div class='ctx'> #~ "service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Conegui tots els productes de Mandrakesoft a &lt;b&gt;MandrakeStore&lt;/b&gt; -- la "</div><div class='add'>+#~ "Conegui tots els productes de Mandriva a &lt;b&gt;MandrakeStore&lt;/b&gt; -- la "</div><div class='ctx'> #~ "nostra plataforma de serveis de comerç electrònic."</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -29694,8 +29694,8 @@ msgstr "La instal·lació ha fallat"</div><div class='ctx'> #~ "  --report          - el programa ha de ser una de les eines de Mandrake\n"</div><div class='ctx'> #~ "  --incident        - el programa ha de ser una de les eines de Mandrake"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "This interface has not been configured yet.\n"</div><div class='head'>diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po<br/>index ead0be430..4fbf9b567 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/cs.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/cs.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/cs.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/cs.po</a></div><div class='hunk'>@@ -69,7 +69,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tento USB disk má zřejmě zapnutu ochranu proti zápisu, nelze jej ale\n"</div><div class='ctx'> "nyní bezpečně odpojit.\n"</div><div class='hunk'>@@ -77,7 +77,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Stiskněte tlačítko pro restart počítače, disk vyjměte, odstraňte ochranu "</div><div class='ctx'> "proti\n"</div><div class='del'>-"zápisu, zasuňte disk zpět a spusťte znovu systém Mandrake Move."</div><div class='add'>+"zápisu, zasuňte disk zpět a spusťte znovu systém Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Váš USB disk neobsahuje platný oddíl s FAT.\n"</div><div class='hunk'>@@ -107,14 +107,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Můžete také pokračovat bez USB disku - stále pak můžete používat\n"</div><div class='del'>-"vaši distribuci MandrakeMove jako běžný produkční operační\n"</div><div class='add'>+"vaši distribuci Mandriva Move jako běžný produkční operační\n"</div><div class='ctx'> "systém."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -122,11 +122,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Na vašem systému nebyl nalezen žádný USB disk. Pokud nyní\n"</div><div class='del'>-"zasunete USB disk, Mandrake Move bude mít možnost transparentně\n"</div><div class='add'>+"zasunete USB disk, Mandriva Move bude mít možnost transparentně\n"</div><div class='ctx'> "ukládat data ve vašem domovském adresáři a systémová nastavení,\n"</div><div class='ctx'> "která pak budou dostupná při dalším startu tohoto nebo jiného\n"</div><div class='ctx'> "počítače. Poznámka: pokud disk zasunete teď, počkejte před dalším\n"</div><div class='hunk'>@@ -134,7 +134,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Můžete také pokračovat bez USB disku - stále pak můžete používat\n"</div><div class='del'>-"vaši distribuci Mandrake Move jako běžný produkční operační\n"</div><div class='add'>+"vaši distribuci Mandriva Move jako běžný produkční operační\n"</div><div class='ctx'> "systém."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -260,7 +260,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -277,7 +277,7 @@ msgstr ""</div><div class='ctx'> "Tato chyba může pocházet z narušených systémových\n"</div><div class='ctx'> "souborů s nastavením na USB disku; v tomto případě by problém\n"</div><div class='ctx'> "vyřešilo odstranění těchto souborů a znovuzavedení systému\n"</div><div class='del'>-"Mandrake Move. Chcete-li tak učinit, stiskněte odpovídající tlačítko.\n"</div><div class='add'>+"Mandriva Move. Chcete-li tak učinit, stiskněte odpovídající tlačítko.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Můžete také systém restartovat a vyjmout USB disk, nebo si\n"</div><div class='hunk'>@@ -1312,11 +1312,11 @@ msgstr "Výběr jazyka"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux podporuje více jazyků. Můžete si zvolit další jazyky,\n"</div><div class='add'>+"Mandrivalinux podporuje více jazyků. Můžete si zvolit další jazyky,\n"</div><div class='ctx'> "které budou dostupné po instalaci a následném restartu systému."</div><div class='ctx'> </div><div class='ctx'> #: any.pm:752 any.pm:773 help.pm:647</div><div class='hunk'>@@ -3735,12 +3735,12 @@ msgstr "Zapnout podporu rádia"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Předtím, než budete pokračovat, přečtěte si pozorně licenční podmínky. Ty\n"</div><div class='del'>-"se vztahují k celé distribuci Mandrakelinux a pokud s nimi souhlasíte,\n"</div><div class='add'>+"se vztahují k celé distribuci Mandrivalinux a pokud s nimi souhlasíte,\n"</div><div class='ctx'> "klepněte na tlačítko \"%s\". Pokud ne, klepněte na tlačítko \"%s \" a "</div><div class='ctx'> "počítač bude restartován."</div><div class='ctx'> </div><div class='hunk'>@@ -3917,13 +3917,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Distribuce Mandrakelinux je složena z několika CD. Instalační program ví,\n"</div><div class='add'>+"Distribuce Mandrivalinux je složena z několika CD. Instalační program ví,\n"</div><div class='ctx'> "na kterém disku je umístěn jaký balíček a v případě potřeby vysune CD a "</div><div class='ctx'> "vyžádá\n"</div><div class='ctx'> "si výměnu CD za požadované. Pokud nemáte požadované CD po ruce, klikněte\n"</div><div class='hunk'>@@ -3933,11 +3933,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3990,7 +3990,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "V této chvíli je možné vybrat, které programy chcete nainstalovat na váš "</div><div class='ctx'> "systém.\n"</div><div class='del'>-"Mandrakelinux obsahuje tisíce balíčků s programy a pro snadnější orientaci\n"</div><div class='add'>+"Mandrivalinux obsahuje tisíce balíčků s programy a pro snadnější orientaci\n"</div><div class='ctx'> "byly rozděleny do skupin, které sdružují podobné aplikace.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Balíčky jsou rozděleny do skupin, které odpovídají tomu, jak je nejčastěji\n"</div><div class='hunk'>@@ -4101,10 +4101,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4136,7 +4136,7 @@ msgstr ""</div><div class='ctx'> "!! Pokud se nachází mezi vybranými balíčky serverové programy, ať už "</div><div class='ctx'> "vybrané\n"</div><div class='ctx'> "záměrně nebo jako součást skupiny, zobrazí se dotaz na to,\n"</div><div class='del'>-"zda opravdu chcete tyto servery nainstalovat. V distribuci Mandrakelinux\n"</div><div class='add'>+"zda opravdu chcete tyto servery nainstalovat. V distribuci Mandrivalinux\n"</div><div class='ctx'> "jsou tyto servery spuštěny při startu systému. I když v době vydání "</div><div class='ctx'> "distribuce\n"</div><div class='ctx'> "nejsou známy žádné bezpečnostní problémy, mohou se vyskytnout později.\n"</div><div class='hunk'>@@ -4287,7 +4287,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4343,7 +4343,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (X Window System) je srdcem grafického rozhraní pro GNU/Linux, které\n"</div><div class='ctx'> "využívají dodávané grafické prostředí (KDE, GNOME, AfterStep, WindowMaker) "</div><div class='del'>-"se systémem Mandrakelinux.\n"</div><div class='add'>+"se systémem Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Nyní bude zobrazen seznam různých parametrů, které je možné změnit pro\n"</div><div class='ctx'> "dosažení optimálního grafického zobrazení\n"</div><div class='hunk'>@@ -4461,12 +4461,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4493,7 +4493,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4502,7 +4502,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4523,10 +4523,10 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "V tomto bodě si musíte rozhodnout, na které diskové oddíly budete\n"</div><div class='del'>-"instalovat nový operační systém Mandrakelinux. Pokud je disk prázdný\n"</div><div class='add'>+"instalovat nový operační systém Mandrivalinux. Pokud je disk prázdný\n"</div><div class='ctx'> "nebo existující operační systém používá celý disk, je nutné ho rozdělit.\n"</div><div class='ctx'> "Rozdělení disku spočívá ve vytvoření volného prostoru pro instalaci\n"</div><div class='del'>-"systému Mandrakelinux.\n"</div><div class='add'>+"systému Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Protože rozdělení disku je nenávratná operace, je to velmi nebezpečná\n"</div><div class='ctx'> "akce pro ty uživatele, kteří nemají žádné zkušenosti.\n"</div><div class='hunk'>@@ -4555,7 +4555,7 @@ msgstr ""</div><div class='ctx'> "oddíl ve\n"</div><div class='ctx'> "Windows defragmentovali. Je doporučeno zazálohovat vaše data. Tento postup\n"</div><div class='ctx'> "je doporučený, pokud chcete na disku provozovat současně systém\n"</div><div class='del'>-"Mandrakelinux i Microsoft Windows.\n"</div><div class='add'>+"Mandrivalinux i Microsoft Windows.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Před výběrem této volby si prosím uvědomte, že velikost oddílu s "</div><div class='ctx'> "Microsoft\n"</div><div class='hunk'>@@ -4563,7 +4563,7 @@ msgstr ""</div><div class='ctx'> "uložení dat nebo instalaci programů do Microsoft Windows.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": pokud chcete smazat veškerá data a všechny oddíly na disku\n"</div><div class='del'>-"a použít je pro instalaci systému Mandrakelinux, vyberte toto řešení.\n"</div><div class='add'>+"a použít je pro instalaci systému Mandrivalinux, vyberte toto řešení.\n"</div><div class='ctx'> "Zde postupujte opatrně, po výběru již není možné vzít tuto volbu zpět.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! Pokud zvolíte tuto možnost, všechna data na disku budou ztracena.!!\n"</div><div class='hunk'>@@ -4725,7 +4725,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4749,7 +4749,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Pokud je vše připraveno pro formátování, klepněte na \"%s\".\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Pokud chcete vybrat jiné oddíly pro instalaci systému Mandrakelinux,\n"</div><div class='add'>+"Pokud chcete vybrat jiné oddíly pro instalaci systému Mandrivalinux,\n"</div><div class='ctx'> "klepněte na \"%s\" \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klepnutím na \"%s\" můžete vybrat, které oddíly budou otestovány\n"</div><div class='hunk'>@@ -4767,7 +4767,7 @@ msgstr "Zpět"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4779,7 +4779,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pokaždé, když instalujete distribuci Mandrakelinux, je možné, že některé\n"</div><div class='add'>+"Pokaždé, když instalujete distribuci Mandrivalinux, je možné, že některé\n"</div><div class='ctx'> "balíčky byly od vydání distribuce aktualizovány. Mohly to být opravy chyb\n"</div><div class='ctx'> "či řešení možných bezpečnostních problémů. Pokud chcete využít právě\n"</div><div class='ctx'> "této nabídky, je možné tyto balíčky nyní stáhnout z Internetu. Zvolte \"%s"</div><div class='hunk'>@@ -4810,7 +4810,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4838,7 +4838,7 @@ msgstr "Správce zabezpečení"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4910,7 +4910,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "V této chvíli je potřeba určit, který(é) oddíl(y) budou použity pro "</div><div class='ctx'> "instalaci\n"</div><div class='del'>-"systému Mandrakelinux. Pokud byly oddíly již jednou definovány, buď\n"</div><div class='add'>+"systému Mandrivalinux. Pokud byly oddíly již jednou definovány, buď\n"</div><div class='ctx'> "z předchozí instalace GNU/Linux nebo jiným programem na rozdělení disku,\n"</div><div class='ctx'> "je možné použít právě tyto oddíly. Jinak musí být oddíly nově definovány.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4998,7 +4998,7 @@ msgstr "Přepne mezi normální/expertním režimem"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5029,7 +5029,7 @@ msgstr ""</div><div class='ctx'> "Instalační program nalezl na disku více než jeden oddíl s Microsoft "</div><div class='ctx'> "Windows.\n"</div><div class='ctx'> "Prosím vyberte si jeden z nich, který je potřeba pro novu instalaci systému\n"</div><div class='del'>-"Mandrakelinux zmenšit.\n"</div><div class='add'>+"Mandrivalinux zmenšit.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Každý oddíl je zobrazen následovně: \"Pojmenování v Linuxu\",\n"</div><div class='ctx'> "\"Název ve Windows\", \"Velikost\".\n"</div><div class='hunk'>@@ -5078,7 +5078,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5087,19 +5087,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tento krok se objeví pouze tehdy, pokud je na vašem počítači nalezen starší\n"</div><div class='ctx'> "oddíl GNU/Linuxu.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Instalační program potřebuje vědět, zda má provést instalaci nebo pouze\n"</div><div class='del'>-"aktualizaci existujícího systému Mandrakelinux.\n"</div><div class='add'>+"aktualizaci existujícího systému Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Nejběžnější volba, provede kompletní výmaz starého systému.\n"</div><div class='ctx'> "V závislosti na rozvržení oddílů vašeho starého systému je však možné\n"</div><div class='hunk'>@@ -5108,7 +5108,7 @@ msgstr ""</div><div class='ctx'> "souborový systém, použijte tuto volbu.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": tato volba provede aktualizaci balíčků instalovaných na vašem\n"</div><div class='del'>-"systému Mandrakelinux. Aktuální rozmístění diskových oddílů a uživatelská\n"</div><div class='add'>+"systému Mandrivalinux. Aktuální rozmístění diskových oddílů a uživatelská\n"</div><div class='ctx'> "data zůstanou zachována. Bude ale provedena většina konfiguračních kroků,\n"</div><div class='ctx'> "stejně jako při instalaci.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5176,7 +5176,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5472,7 +5472,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5493,12 +5493,12 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Zde si můžete vybrat tiskový systém, který budete používat. Jiné OS "</div><div class='ctx'> "nabízejí\n"</div><div class='del'>-"jeden, Mandrakelinux nabízí dva. Každý z nich je vhodnější pro různé typy\n"</div><div class='add'>+"jeden, Mandrivalinux nabízí dva. Každý z nich je vhodnější pro různé typy\n"</div><div class='ctx'> "konfigurací.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" - což znamená 'print, do not queue' a je vhodný tehdy, pokud máte\n"</div><div class='hunk'>@@ -5640,7 +5640,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5657,7 +5657,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5707,7 +5707,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": pokud chcete nyní nastavit připojení k Internetu nebo k lokální\n"</div><div class='ctx'> "síti, klepnutím na tlačítko se spustí průvodce. Plnou dokumentaci naleznete\n"</div><div class='ctx'> "v tištěné příručce, případně můžete po instalaci využít ovládací centrum\n"</div><div class='del'>-"Mandrakelinux, kde rovněž naleznete kompletní nápovědu.\n"</div><div class='add'>+"Mandrivalinux, kde rovněž naleznete kompletní nápovědu.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": umožňuje nastavit adresu HTTP a FTP proxy, což je užitečné,\n"</div><div class='ctx'> "pokud se počítač nachází za firewallem.\n"</div><div class='hunk'>@@ -5724,7 +5724,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": pokud chcete změnit nastavení zavaděče, můžete to provést\n"</div><div class='ctx'> "klepnutím na toto tlačítko. Změny by měly provádět pouze zkušení uživatelé.\n"</div><div class='ctx'> "Více informací lze nalézt v tištěné dokumentaci nebo online nápověde\n"</div><div class='del'>-"v ovládacím centru Mandrakelinux.\n"</div><div class='add'>+"v ovládacím centru Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": zde si můžete konkrétně určit, které služby budou na vašem "</div><div class='ctx'> "počítači\n"</div><div class='hunk'>@@ -5786,10 +5786,10 @@ msgstr "Služby"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Vyberte disk, který chcete smazat pro instalaci oddílu Mandrakelinux.\n"</div><div class='add'>+"Vyberte disk, který chcete smazat pro instalaci oddílu Mandrivalinux.\n"</div><div class='ctx'> "Pamatujte na to, že všechna data budou ztracena a nelze je již obnovit!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6140,7 +6140,7 @@ msgstr "Počítám volné místo na Windows oddílu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Váš diskový oddíl s Windows je příliš fragmentován. Restartujte počítač do "</div><div class='hunk'>@@ -6261,19 +6261,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6295,7 +6295,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6303,14 +6303,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6320,7 +6320,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6340,10 +6340,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6354,11 +6354,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6374,22 +6374,22 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Úvod\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Operační systém a různé části dostupné v distribuci Mandrakelinux jsou "</div><div class='add'>+"Operační systém a různé části dostupné v distribuci Mandrivalinux jsou "</div><div class='ctx'> "nazývány \"Softwarové produkty\" (\"Software Products\"). Softwarové "</div><div class='ctx'> "produkty zahrnují, ale nejsou omezeny, na programy, metody, pravidla a "</div><div class='ctx'> "dokumentaci, vztahující se k operačnímu systému a dalším komponentám "</div><div class='del'>-"distribuce Mandrakelinux.\n"</div><div class='add'>+"distribuce Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6411,7 +6411,7 @@ msgstr ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6419,14 +6419,14 @@ msgstr ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6436,7 +6436,7 @@ msgstr ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6456,10 +6456,10 @@ msgstr ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6470,11 +6470,11 @@ msgstr ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6490,7 +6490,7 @@ msgstr ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6577,7 +6577,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6585,13 +6585,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gratulujeme vám, instalace je dokončena.\n"</div><div class='ctx'> "Vyjměte zaváděcí média a stiskněte Return pro restart.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Informace o opravách pro tuto verzi systému Mandrakelinux lze\n"</div><div class='add'>+"Informace o opravách pro tuto verzi systému Mandrivalinux lze\n"</div><div class='ctx'> "nalézt na stránce Errata dostupné na:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6599,7 +6599,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informace o nastavení systému po instalaci jsou dostupné\n"</div><div class='del'>-"v příslušné kapitole oficiální uživatelské příručky pro Mandrakelinux."</div><div class='add'>+"v příslušné kapitole oficiální uživatelské příručky pro Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6633,11 +6633,11 @@ msgstr "Začínám '%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Váš systém má málo systémových prostředků. Při instalaci Mandrakelinuxu se\n"</div><div class='add'>+"Váš systém má málo systémových prostředků. Při instalaci Mandrivalinuxu se\n"</div><div class='ctx'> "můžete setkat s různými problémy. Pokud se tak stane, zkuste textovou\n"</div><div class='ctx'> "verzi instalačního programu. Ta se spouští tak, že při startu\n"</div><div class='ctx'> "z CD mechaniky stisknete 'F1' a poté napíšete 'text'."</div><div class='hunk'>@@ -7174,8 +7174,8 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='del'>-msgstr "Kontaktuji web Mandrakelinux pro získání seznamu dostupných zrcadel..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='add'>+msgstr "Kontaktuji web Mandrivalinux pro získání seznamu dostupných zrcadel..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7399,8 +7399,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux Instalace %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux Instalace %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9989,13 +9989,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nastavení aplikace drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Zde je možné nastavit osobní firewall pro tento systém Mandrakelinux.\n"</div><div class='add'>+"Zde je možné nastavit osobní firewall pro tento systém Mandrivalinux.\n"</div><div class='ctx'> "Pro výkonné řešení vyhrazeného firewallu použijte specializovanou\n"</div><div class='ctx'> "distribuci MandrakeSecurity Firewall."</div><div class='ctx'> </div><div class='hunk'>@@ -14033,7 +14033,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15955,23 +15955,23 @@ msgstr "Stop"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Co je to Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Co je to Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Vítá vás &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Vítá vás &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux ke &lt;b&gt;distribuce Linuxu&lt;/b&gt;, která se skládá z jádra systému, "</div><div class='add'>+"Mandrivalinux ke &lt;b&gt;distribuce Linuxu&lt;/b&gt;, která se skládá z jádra systému, "</div><div class='ctx'> "tzv. &lt;b&gt;operačního systému&lt;/b&gt; (založeného na jádře zvaném Linux), a "</div><div class='ctx'> "&lt;b&gt;spousty aplikací&lt;/b&gt;, které uspokojí každou potřebu, na kterou si jenom "</div><div class='ctx'> "vzpomenete."</div><div class='hunk'>@@ -15979,10 +15979,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux je &lt;b&gt;uživatelsky nejpřívětivější&lt;/b&gt; distribuce Linuxu "</div><div class='add'>+"Mandrivalinux je &lt;b&gt;uživatelsky nejpřívětivější&lt;/b&gt; distribuce Linuxu "</div><div class='ctx'> "dostupná na trhu. Je také jednou z &lt;b&gt;nejpoužívanějších&lt;/b&gt; distribucí "</div><div class='ctx'> "Linuxu na světě!"</div><div class='ctx'> </div><div class='hunk'>@@ -15999,15 +15999,15 @@ msgstr "Vítejte do &lt;b&gt;světa Open Source&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux využívá a je plně oddán modelu Open Source. To znamená, že "</div><div class='add'>+"Mandrivalinux využívá a je plně oddán modelu Open Source. To znamená, že "</div><div class='ctx'> "toto nové vydání je výsledkem &lt;b&gt;spolupráce&lt;/b&gt; mezi týmem &lt;b&gt;vývojářů "</div><div class='del'>-"společnosti Mandrakesoft&lt;/b&gt; a &lt;b&gt;celosvětovou komunitou&lt;/b&gt; přispěvatelů do "</div><div class='del'>-"distribuce Mandrakelinux."</div><div class='add'>+"společnosti Mandriva&lt;/b&gt; a &lt;b&gt;celosvětovou komunitou&lt;/b&gt; přispěvatelů do "</div><div class='add'>+"distribuce Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16027,10 +16027,10 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Většina ze software v této distribuci a všechny nástroje distribuce "</div><div class='del'>-"Mandrakelinux jsou dostupné pod Obecnou veřejnou licencí (&lt;b&gt;General Public "</div><div class='add'>+"Mandrivalinux jsou dostupné pod Obecnou veřejnou licencí (&lt;b&gt;General Public "</div><div class='ctx'> "License&lt;/b&gt;)."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16061,15 +16061,15 @@ msgstr "&lt;b&gt;Připojte se ke komunitě&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Distribuce Mandrakelinux má jednu z &lt;b&gt;největších komunit&lt;/b&gt; uživatelů a "</div><div class='add'>+"Distribuce Mandrivalinux má jednu z &lt;b&gt;největších komunit&lt;/b&gt; uživatelů a "</div><div class='ctx'> "vývojářů. Role takové komunity jsou velmi rozmanité, od hlášení chyb po "</div><div class='ctx'> "vývoj nových aplikací. Komunita hraje &lt;b&gt;klíčovou roli&lt;/b&gt; ve světě "</div><div class='del'>-"distribuce Mandrakelinux."</div><div class='add'>+"distribuce Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16091,11 +16091,11 @@ msgstr "&lt;b&gt;Download verze&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Právě instalujete &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Jedná se o volnou verzi, "</div><div class='del'>-"kterou chce společnost Mandrakesoft &lt;b&gt;poskytnout každému&lt;/b&gt;."</div><div class='add'>+"Právě instalujete &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Jedná se o volnou verzi, "</div><div class='add'>+"kterou chce společnost Mandriva &lt;b&gt;poskytnout každému&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16127,10 +16127,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nebudete mít také přístup ke &lt;b&gt;službám dostupným&lt;/b&gt; v jiných produktech "</div><div class='del'>-"společnosti Mandrakesoft."</div><div class='add'>+"společnosti Mandriva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16139,8 +16139,8 @@ msgstr "&lt;b&gt;Discovery, váš první Linuxový desktop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Právě instalujete produkt &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Právě instalujete produkt &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16162,18 +16162,18 @@ msgstr "&lt;b&gt;PowerPack, nejpokročilejší Linuxový desktop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Právě instalujete produkt &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Právě instalujete produkt &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PowerPack je nejlepší &lt;b&gt;Linuxový produkt pro desktop&lt;/b&gt; společnosti "</div><div class='del'>-"Mandrakesoft. Zahrnuje v době &lt;b&gt;tisíce aplikací&lt;/b&gt; - všechny od těch "</div><div class='add'>+"Mandriva. Zahrnuje v době &lt;b&gt;tisíce aplikací&lt;/b&gt; - všechny od těch "</div><div class='ctx'> "nejpopulárnějších po ty nejvíce technicky zaměřené."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:13</div><div class='hunk'>@@ -16183,8 +16183,8 @@ msgstr "&lt;b&gt;PowerPack+, Linuxové řešení pro desktopy a servery&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Právě instalujete produkt &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Právě instalujete produkt &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16201,22 +16201,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produkty společnosti Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produkty společnosti Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Společnost &lt;b&gt;Mandrakesoft&lt;/b&gt; vyvinula širokou řadu produktů "</div><div class='del'>-"&lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"Společnost &lt;b&gt;Mandriva&lt;/b&gt; vyvinula širokou řadu produktů "</div><div class='add'>+"&lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Produkty Mandrakelinux jsou:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Produkty Mandrivalinux jsou:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16236,73 +16236,73 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, Linuxové řešení pro desktop i servery."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux pro x86-64&lt;/b&gt;, řešení Mandrakelinux pro co nejlepší "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux pro x86-64&lt;/b&gt;, řešení Mandrivalinux pro co nejlepší "</div><div class='ctx'> "využití vašeho 64bitového procesoru."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produkty společnosti Mandrakesoft (produkty Nomad)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produkty společnosti Mandriva (produkty Nomad)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Společnost Mandrakesoft vyvinula dva produkty, které vám umožní používat "</div><div class='del'>-"distribuci Mandrakelinux &lt;b&gt;na každém počítači&lt;/b&gt; a bez potřeby tuto "</div><div class='add'>+"Společnost Mandriva vyvinula dva produkty, které vám umožní používat "</div><div class='add'>+"distribuci Mandrivalinux &lt;b&gt;na každém počítači&lt;/b&gt; a bez potřeby tuto "</div><div class='ctx'> "distribuci na nich instalovat:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, distribuce Mandrakelinux, která se výhradně spouští ze "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, distribuce Mandrivalinux, která se výhradně spouští ze "</div><div class='ctx'> "spustitelného CD-ROM disku."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, distribuce Mandrakelinux předinstalovaná na ultra "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, distribuce Mandrivalinux předinstalovaná na ultra "</div><div class='ctx'> "kompaktních mobilních discích “LaCie Mobile Hard Drive”."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produkty společnosti Mandrakesoft (profesionální řešení)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produkty společnosti Mandriva (profesionální řešení)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Níže uvedené jsou produkty společnosti Mandrakesoft určené pro "</div><div class='add'>+"Níže uvedené jsou produkty společnosti Mandriva určené pro "</div><div class='ctx'> "&lt;b&gt;profesionální potřeby&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, desktop Mandrakelinux pro společnosti."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, desktop Mandrivalinux pro společnosti."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, serverové řešení Mandrakelinux."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, serverové řešení Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, bezpečnostní řešení Mandrakelinux."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, bezpečnostní řešení Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16345,10 +16345,10 @@ msgstr "&lt;b&gt;Vyberte si své oblíbené grafické prostředí&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "S produktem PowerPack si můžete vybrat &lt;b&gt;grafické uživatelské prostředí&lt;/"</div><div class='del'>-"b&gt;. Společnost Mandrakesoft vybrala jako výchozí prostředí &lt;b&gt;KDE&lt;/b&gt;."</div><div class='add'>+"b&gt;. Společnost Mandriva vybrala jako výchozí prostředí &lt;b&gt;KDE&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16372,10 +16372,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "S produktem PowerPack+ si můžete vybrat &lt;b&gt;grafické uživatelské prostředí&lt;/"</div><div class='del'>-"b&gt;. Společnost Mandrakesoft vybrala jako výchozí prostředí &lt;b&gt;KDE&lt;/b&gt;."</div><div class='add'>+"b&gt;. Společnost Mandriva vybrala jako výchozí prostředí &lt;b&gt;KDE&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16505,10 +16505,10 @@ msgstr "&lt;b&gt;Užívejte širokou řadu aplikací&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"V menu Mandrakelinux najdete &lt;b&gt;jednoduše použitelné&lt;/b&gt; aplikace pro "</div><div class='add'>+"V menu Mandrivalinux najdete &lt;b&gt;jednoduše použitelné&lt;/b&gt; aplikace pro "</div><div class='ctx'> "&lt;b&gt;všechny typy úloh&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16775,18 +16775,18 @@ msgstr "\t* &lt;b&gt;Postfix&lt;/b&gt; a &lt;b&gt;Sendmail&lt;/b&gt;: Známé a mocné poštovní server</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Ovládací centrum Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Ovládací centrum Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Ovládací centrum Mandrakelinux&lt;/b&gt; je nepostradatelná sbírka nástrojů "</div><div class='del'>-"specifických pro distribuci Mandrakelinux, které zjednoduší nastavení vašeho "</div><div class='add'>+"&lt;b&gt;Ovládací centrum Mandrivalinux&lt;/b&gt; je nepostradatelná sbírka nástrojů "</div><div class='add'>+"specifických pro distribuci Mandrivalinux, které zjednoduší nastavení vašeho "</div><div class='ctx'> "počítače."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16810,16 +16810,16 @@ msgstr "&lt;b&gt;Model Open source&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Jako každé jiné počítačové programování, vývoj open source software &lt;b&gt;si "</div><div class='ctx'> "žádá čas a lidi&lt;/b&gt;. Aby respektovala filozofii open source, prodává "</div><div class='del'>-"společnost Mandrakesoft produkty s přidanou hodnotou a služby, díky kterým "</div><div class='del'>-"&lt;b&gt;vylepšuje distribuci Mandrakelinux&lt;/b&gt;. Chcete-li &lt;b&gt;podporovat filozofii "</div><div class='del'>-"open source&lt;/b&gt; a vývoj distribuce Mandrakelinux, &lt;b&gt;zvažte prosím&lt;/b&gt; koupi "</div><div class='add'>+"společnost Mandriva produkty s přidanou hodnotou a služby, díky kterým "</div><div class='add'>+"&lt;b&gt;vylepšuje distribuci Mandrivalinux&lt;/b&gt;. Chcete-li &lt;b&gt;podporovat filozofii "</div><div class='add'>+"open source&lt;/b&gt; a vývoj distribuce Mandrivalinux, &lt;b&gt;zvažte prosím&lt;/b&gt; koupi "</div><div class='ctx'> "některého z našich produktů a služeb!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16830,10 +16830,10 @@ msgstr "&lt;b&gt;Online obchod&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Všechny produkty a služby společnosti Mandrakesoft najdete na naší "</div><div class='add'>+"Všechny produkty a služby společnosti Mandriva najdete na naší "</div><div class='ctx'> "&lt;b&gt;platformě pro e-komerci&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16858,25 +16858,25 @@ msgstr "Navštivte ještě dnes &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; je &lt;b&gt;perfektní doplněk&lt;/b&gt; k vašemu produktu "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; je &lt;b&gt;perfektní doplněk&lt;/b&gt; k vašemu produktu "</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Využijte &lt;b&gt;cenných výhod&lt;/b&gt;, které jsou spojeny s členstvím v klubu "</div><div class='del'>-"Mandrakeclub, jako například:"</div><div class='add'>+"Mandriva Club, jako například:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16898,40 +16898,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Účast v &lt;b&gt;uživatelských fórech&lt;/b&gt; distribuce Mandrakelinux."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Účast v &lt;b&gt;uživatelských fórech&lt;/b&gt; distribuce Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Dřívější a privilegovaný přístup&lt;/b&gt;, před veřejným vydáním, k &lt;b&gt;ISO "</div><div class='del'>-"obrazům&lt;/b&gt; Mandrakelinux."</div><div class='add'>+"obrazům&lt;/b&gt; Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; je nová prvotřídní služba, kterou společnost "</div><div class='del'>-"Mandrakesoft hrdě nabízí svým zákazníkům!"</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; je nová prvotřídní služba, kterou společnost "</div><div class='add'>+"Mandriva hrdě nabízí svým zákazníkům!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline poskytuje širokou řadu cenných služeb pro &lt;b&gt;snadnou "</div><div class='del'>-"aktualizaci&lt;/b&gt; vašich systémů s distribucí Mandrakelinux:"</div><div class='add'>+"Mandriva Online poskytuje širokou řadu cenných služeb pro &lt;b&gt;snadnou "</div><div class='add'>+"aktualizaci&lt;/b&gt; vašich systémů s distribucí Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16957,41 +16957,41 @@ msgstr "\t* Flexibilní &lt;b&gt;plánované&lt;/b&gt; aktualizace."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Správa &lt;b&gt;všech vašich Mandrakelinux systémů&lt;/b&gt; pomocí jednoho účtu."</div><div class='add'>+"\t* Správa &lt;b&gt;všech vašich Mandrivalinux systémů&lt;/b&gt; pomocí jednoho účtu."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Potřebujete &lt;b&gt;asistenci&lt;/b&gt;? Setkejte se s technickými experty společnosti "</div><div class='del'>-"Mandrakesoft na naší &lt;b&gt;platformě technické podpory&lt;/b&gt; na stránkách www."</div><div class='add'>+"Mandriva na naší &lt;b&gt;platformě technické podpory&lt;/b&gt; na stránkách www."</div><div class='ctx'> "mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Díky pomoci &lt;b&gt;kvalifikovaných expertů společnosti Mandrakesoft&lt;/b&gt; ušetříte "</div><div class='add'>+"Díky pomoci &lt;b&gt;kvalifikovaných expertů společnosti Mandriva&lt;/b&gt; ušetříte "</div><div class='ctx'> "spoustu času."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pro zodpovězení otázek spojených s distribucí Mandrakelinux máte možnost "</div><div class='add'>+"Pro zodpovězení otázek spojených s distribucí Mandrivalinux máte možnost "</div><div class='ctx'> "zakoupit si incidenty technické podpory na &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17291,8 +17291,8 @@ msgstr "Nástroje pro sledování, evidenci procesů, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Průvodci Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Průvodci Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17440,7 +17440,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17454,7 +17454,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[VOLBY]\n"</div><div class='del'>-"Nastavení pro Mandrakelinux Terminal Server (MTS)\n"</div><div class='add'>+"Nastavení pro Mandrivalinux Terminal Server (MTS)\n"</div><div class='ctx'> "--enable         : povolí MTS\n"</div><div class='ctx'> "--disable        : zakáže MTS\n"</div><div class='ctx'> "--start          : spustí MTS\n"</div><div class='hunk'>@@ -17511,14 +17511,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[VOLBY]...\n"</div><div class='del'>-"  -no-confirmation      nepotvrzuje první otázku v režimu MandrakeUpdate\n"</div><div class='add'>+"  -no-confirmation      nepotvrzuje první otázku v režimu Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm       neprovádí ověření podpisu u balíčků\n"</div><div class='ctx'> "  --changelog-first      v okně s popisem nejdříve zobrazí changelog před "</div><div class='ctx'> "seznamem souborů\n"</div><div class='hunk'>@@ -20279,13 +20279,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Nástroj distribuce Mandrakelinux pro hlášení chyb"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Nástroj distribuce Mandrivalinux pro hlášení chyb"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Ovládací centrum Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Ovládací centrum Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20305,8 +20305,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20350,8 +20350,8 @@ msgstr "Průvodci nastavením"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Vyberte nástroj Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Vyberte nástroj Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20775,19 +20775,19 @@ msgstr "Spustit při startu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Toto rozhraní ještě nebylo nastaveno.\n"</div><div class='del'>-"Spusťte průvodce \"Přidat rozhraní\" z Ovládacího centra Mandrakelinux"</div><div class='add'>+"Spusťte průvodce \"Přidat rozhraní\" z Ovládacího centra Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nemáte nastaveno žádné připojení k Internetu.\n"</div><div class='del'>-"Spusťte průvodce \"%s\" z Ovládacího centra Mandrakelinux"</div><div class='add'>+"Spusťte průvodce \"%s\" z Ovládacího centra Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20837,8 +20837,8 @@ msgstr "KDM (Správce obrazovky KDE)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Správce obrazovky Mandrakelinux)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Správce obrazovky Mandrivalinux)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21137,7 +21137,7 @@ msgstr "Import"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21146,7 +21146,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright ©2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright ©2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (původní verze)\n"</div><div class='hunk'>@@ -21686,14 +21686,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright ©2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright ©2003-2004 Mandriva.\n"</div><div class='ctx'> "Toto je svobodný software a je šířen pod licencí GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Použití: \n"</div><div class='hunk'>@@ -21722,8 +21722,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Centrum nápovědy Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Centrum nápovědy Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25237,8 +25237,8 @@ msgstr "Změny jsou provedeny, ale pro aktivaci je nutné provést odhlášení"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Záznamy nástrojů Mandrakelinuxu"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Záznamy nástrojů Mandrivalinuxu"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25751,10 +25751,10 @@ msgstr "Připojení ukončeno."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Připojení selhalo.\n"</div><div class='del'>-"Ověřte nastavení v ovládacím centru Mandrakelinux."</div><div class='add'>+"Ověřte nastavení v ovládacím centru Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po<br/>index c976ea79c..213517d95 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/cy.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/cy.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/cy.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/cy.po</a></div><div class='hunk'>@@ -68,14 +68,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mae'r allwedd USB i weld a'i ddiogelu rhag ysgrifennu ymlaen, ond nid oes.\n"</div><div class='ctx'> "modd ei dynnu'n ddiogel.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cliciwch y botwm i ailgychwyn y peiriant, tynnwch yr allwedd, diffodd y\n"</div><div class='del'>-"diogelu, ailosod y plwg a chychwyn Mandrake Move eto."</div><div class='add'>+"diogelu, ailosod y plwg a chychwyn Mandriva Move eto."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -93,7 +93,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Does gan eich allwedd USB raniadau Windows (FAT) dilys\n"</div><div class='hunk'>@@ -104,14 +104,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Mae modd mynd yn eich blaen heb allwedd USB - bydd dal\n"</div><div class='del'>-"modd i chi ddefnyddio Mandrake Move fel System Weithredu\n"</div><div class='add'>+"modd i chi ddefnyddio Mandriva Move fel System Weithredu\n"</div><div class='ctx'> "Mandrake hyfyw."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -119,11 +119,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nid ydym wedi canfod allwedd USB ar eich system Os wnewch\n"</div><div class='del'>-"rhoi'r allwedd USB yn ei le, mae gan Mandrake Move y gallu i\n"</div><div class='add'>+"rhoi'r allwedd USB yn ei le, mae gan Mandriva Move y gallu i\n"</div><div class='ctx'> "gadw eich data yn eich cyfeiriadur cartref a ffurfweddiad system\n"</div><div class='ctx'> "gyfan, ar gyfer ail gychwyn y cyfrifiadur hwn neu un arall\n"</div><div class='ctx'> "Sylwch: os wnewch chi roi'r allwedd yn ei le nawr, arhoswch\n"</div><div class='hunk'>@@ -131,7 +131,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Mae modd mynd yn eich blaen heb allwedd USB - bydd dal\n"</div><div class='del'>-"modd i chi ddefnyddio Mandrake Move fel system weithredu\n"</div><div class='add'>+"modd i chi ddefnyddio Mandriva Move fel system weithredu\n"</div><div class='ctx'> "Mandrake hyfyw."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -258,7 +258,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -274,7 +274,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Gall hyn fod wedi dod o ffeiliau ffurfweddu'r system\n"</div><div class='ctx'> "ar yr allwedd USB, yn yr achos yma bydd eu tynnu ac\n"</div><div class='del'>-"ailgychwyn Mandrake Move yn datrys y broblem. I wneud\n"</div><div class='add'>+"ailgychwyn Mandriva Move yn datrys y broblem. I wneud\n"</div><div class='ctx'> "hynny, cliciwch y botwm perthnasol.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1306,7 +1306,7 @@ msgstr "Dewis iaith"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3729,12 +3729,12 @@ msgstr "galluogi cynnal radio"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Cyn parhau dylech ddarllen amodau'r drwydded yn ofalus. Mae'n ymwneud\n"</div><div class='del'>-"â holl ddosbarthiad Mandrakelinux. Os ydych yn cytuno â'r holl amodau,\n"</div><div class='add'>+"â holl ddosbarthiad Mandrivalinux. Os ydych yn cytuno â'r holl amodau,\n"</div><div class='ctx'> "cliciwch flwch \"%s\". Os nad, bydd clicio ar y botwm \"%s\" yn\n"</div><div class='ctx'> "ail gychwyn eich cyfrifiadur."</div><div class='ctx'> </div><div class='hunk'>@@ -3894,13 +3894,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mae gosodiad Mandrakelinux i'w gael ar nifer o CD-ROMau. Mae DrakX\n"</div><div class='add'>+"Mae gosodiad Mandrivalinux i'w gael ar nifer o CD-ROMau. Mae DrakX\n"</div><div class='ctx'> "yn gwybod os yw pecyn penodol wedi ei leoli ar CD-ROM arall a bydd yn bwrw\n"</div><div class='ctx'> "allan y CD cyfredol a gofyn am y llall. Os nad yw'r CD angenrheidiol "</div><div class='ctx'> "gennych\n"</div><div class='hunk'>@@ -3910,11 +3910,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3966,11 +3966,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mae'n amser penderfynu pa raglenni rydych am eu gosod ar eich\n"</div><div class='del'>-"system. Mae yna filoedd o becynnau ar gael ar gyfer Mandrakelinux, ond\n"</div><div class='add'>+"system. Mae yna filoedd o becynnau ar gael ar gyfer Mandrivalinux, ond\n"</div><div class='ctx'> "i'w gwneud hi'n haws eu rheoli maent wedi cael eu gosod mewn grwpiau\n"</div><div class='ctx'> "o raglenni tebyg.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mae Mandrakelinux wedi trefnu'r grwpiau pecynnau i bedwar categori. Mae\n"</div><div class='add'>+"Mae Mandrivalinux wedi trefnu'r grwpiau pecynnau i bedwar categori. Mae\n"</div><div class='ctx'> "modd dewis a dethol rhaglenni o'r categorïau gwahanol, fel bo \"Man Gwaith"</div><div class='ctx'> "\"\n"</div><div class='ctx'> "yn medru cael rhaglenni o'r categori \"Gweinydd\".\n"</div><div class='hunk'>@@ -4073,10 +4073,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4106,11 +4106,11 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Os oes pecyn gweinydd wedi ei ddewis, yn fwriadol neu am ei fod yn rhan\n"</div><div class='ctx'> "o grwp cyfan, bydd angen i chi gadarnhau eich bod eisiau i'r gweinyddion\n"</div><div class='del'>-"gael eu gosod. Ym Mandrakelinux mae unrhyw weinydd sydd wedi ei\n"</div><div class='add'>+"gael eu gosod. Ym Mandrivalinux mae unrhyw weinydd sydd wedi ei\n"</div><div class='ctx'> "osod yn cael ei gychwyn fel rhagosodiad wrth gychwyn. Hyd yn oed os ydynt\n"</div><div class='ctx'> "yn ddiogel a doedd dim materion pryder pan gafodd y dosbarthiad ei ryddhau,\n"</div><div class='ctx'> "mae'n bosibl i fylchau diogelwch gael eu darganfod wedi i'r fersiwn hwn o\n"</div><div class='del'>-"Mandrakelinux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"</div><div class='add'>+"Mandrivalinux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"</div><div class='ctx'> "gwasanaeth arbennig i fod i'w wneud na pham mae wedi ei osod, yna\n"</div><div class='ctx'> "cliciwch\"%s\". Bydd clicio \"%s\" yn gosod y gwasanaethau hynny a\n"</div><div class='ctx'> "byddant yncael eu cychwyn yn awtomatig drwy ragosodiad!!\n"</div><div class='hunk'>@@ -4257,7 +4257,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4313,7 +4313,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (sef X Window System) yw calon rhyngwyneb graffigol GNU/Linux a'r\n"</div><div class='ctx'> "hyn mae'r holl amgylcheddau graffigol (KDE, Gnome, AterStep,\n"</div><div class='del'>-"WindowMaker, etc) sy'n dod gyda Mandrakelinux yn dibynnu arno.\n"</div><div class='add'>+"WindowMaker, etc) sy'n dod gyda Mandrivalinux yn dibynnu arno.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Byddwch yn derbyn rhestr o baramedrau gwahanol i'w newid i gael\n"</div><div class='ctx'> "y dangosiad graffigol gorau:\n"</div><div class='hunk'>@@ -4428,12 +4428,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4460,7 +4460,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4469,7 +4469,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4490,7 +4490,7 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mae angen i chi nawr ddewis lle ar eich disg caled i osod eich system\n"</div><div class='del'>-"weithredu Mandrakelinux. Os yw eich disg caled yn wag neu os oes\n"</div><div class='add'>+"weithredu Mandrivalinux. Os yw eich disg caled yn wag neu os oes\n"</div><div class='ctx'> "yna system weithredol eisoes yn cymryd yr holl le sydd ar gael, bydd\n"</div><div class='ctx'> "angen i chi greu rhaniadau arno. Yn y bôn, mae rhannu disg caled yn\n"</div><div class='ctx'> "golygu ei rhannu'n rhesymegol i greu lle i osod eich system Mandrake\n"</div><div class='hunk'>@@ -4522,14 +4522,14 @@ msgstr ""</div><div class='ctx'> "Mae modd ail lunio maint y rhaniad heb golli data cyn belled eich bod wedi\n"</div><div class='ctx'> "dad-ddarnio rhaniad Windows ac mae'n defnyddio fformat Windows.\n"</div><div class='ctx'> "Argymhellir cadw data wrth gefn hefyd. Argymhellir gwneud hyn os ydych\n"</div><div class='del'>-"am ddefnyddio Mandrakelinux a Microsoft Windows ar yr un cyfrifiadur.\n"</div><div class='add'>+"am ddefnyddio Mandrivalinux a Microsoft Windows ar yr un cyfrifiadur.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "  Cyn gwneud y dewis hwn, cofiwch y bydd maint eich rhaniad Microsoft\n"</div><div class='ctx'> "Windows yn llai nag yw ar hyn o bryd ar ol dilyn y drefn yma. Bydd gennych\n"</div><div class='ctx'> "llai o le yn Microsoft Windows i gadw data neu i osod meddalwedd newydd\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" os ydych am ddileu'r holl ddata a rhaniadau presennol ar\n"</div><div class='del'>-"eich disg caled a'u cyfnewid am system Mandrakelinux, yna dewiswch\n"</div><div class='add'>+"eich disg caled a'u cyfnewid am system Mandrivalinux, yna dewiswch\n"</div><div class='ctx'> "hwn. Byddwch yn ofalus wrth wneud hyn gan na fydd modd troi nôl\n"</div><div class='ctx'> "ar ôl cadarnhau.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4687,7 +4687,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4709,7 +4709,7 @@ msgstr ""</div><div class='ctx'> "Cliciwch \"%s\" pan ydych yn barod i fformatio rhaniadau.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cliciwch \"%s\" os ydych am ddewis rhaniad arall ar gyfer eich gosodiad\n"</div><div class='del'>-"Mandrakelinux newydd\n"</div><div class='add'>+"Mandrivalinux newydd\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cliciwch \"%s\" os ydych am ddewis rhaniadau i'w gwirio am flociau\n"</div><div class='ctx'> "gwallus ar y ddisg."</div><div class='hunk'>@@ -4726,7 +4726,7 @@ msgstr "Blaenorol"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4738,7 +4738,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Erbyn i chi osod Mandrakelinux, mae'n debygol y bydd rhai \n"</div><div class='add'>+"Erbyn i chi osod Mandrivalinux, mae'n debygol y bydd rhai \n"</div><div class='ctx'> "pecynnau wedi eu diweddaru ers y rhyddhad cychwynnol. Bydd rhai \n"</div><div class='ctx'> "gwallau wedi eu cywiro a materion diogelwch wedi eu datrys. I ganiatáu\n"</div><div class='ctx'> "i chi fanteisio ar hyn mae cynnig i chi eu llwytho i lawr o'r rhyngrwyd.\n"</div><div class='hunk'>@@ -4766,7 +4766,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4795,7 +4795,7 @@ msgstr "Cyfrinair Gweinyddwr"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4866,7 +4866,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Yn awr mae angen i chi ddewis pa raniadau i'w defnyddio ar gyfer gosodiad\n"</div><div class='del'>-"eich system Mandrakelinux. Os oes rhaniadau wedi eu diffinio eisoes, un\n"</div><div class='add'>+"eich system Mandrivalinux. Os oes rhaniadau wedi eu diffinio eisoes, un\n"</div><div class='ctx'> "ai drwy osodiad blaenorol o GNU/Linux neu gan offeryn rhannu arall, mae\n"</div><div class='ctx'> "modd i chi ddefnyddio'r rhaniadau presennol. Os nad, rhaid i' rhaniadau'r\n"</div><div class='ctx'> "ddisg caled gael eu diffinio.\n"</div><div class='hunk'>@@ -4951,7 +4951,7 @@ msgstr "Amnewid rhwng modd arferol/arbenigol"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4981,7 +4981,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mae mwy nag un rhaniad Microsoft wedi ei ganfod ar eich disg caled.\n"</div><div class='ctx'> "Dewiswch ba un rydych am newid ei faint er mwyn gosod eich\n"</div><div class='del'>-"system weithredu Mandrakelinux newydd\n"</div><div class='add'>+"system weithredu Mandrivalinux newydd\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Mae pob rhaniad wedi ei restri fel hyn: \"Enw Linux\", \"Enw Windows\",\n"</div><div class='ctx'> "\"Maint\".\n"</div><div class='hunk'>@@ -5028,7 +5028,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5037,19 +5037,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mae'r cam hwn yn cael ei weithredu os oes hen raniad GNU/Linux wedi\n"</div><div class='ctx'> "ei ganfod ar y cyfrifiadur.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Bydd DrakX angen gwybod a ydych am osod o'r newydd neu uwchraddio\n"</div><div class='del'>-"system Mandrakelinux presennol.\n"</div><div class='add'>+"system Mandrivalinux presennol.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " *\"%s\" Ar y cyfan, mae hwn yn tynnu'r hen system gyfan oddi ar eich\n"</div><div class='ctx'> "cyfrifiadur. Er hynny, yn ddibynnol ar eich trefn rhannu, mae modd atal\n"</div><div class='hunk'>@@ -5059,13 +5059,13 @@ msgstr ""</div><div class='ctx'> "system ffeil, dylech ddewis hwn.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " *\"%s\": Mae'r dosbarth gosod hwn yn caniatáu i chi ddiweddaru'r\n"</div><div class='del'>-"pecynnau sydd wedi eu gosod ar eich system Mandrakelinux. Bydd eich\n"</div><div class='add'>+"pecynnau sydd wedi eu gosod ar eich system Mandrivalinux. Bydd eich\n"</div><div class='ctx'> "rhaniadau presenol a'ch data personol yn cael eu cadw. Bydd y rhan fwyaf\n"</div><div class='ctx'> "o'r camau ffurfweddu ar gael fel gyda'r gosod arferol.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Dylai defnyddio \"Diweddaru\" weithio'n iawn ar systemau Mandrakelinux\n"</div><div class='add'>+"Dylai defnyddio \"Diweddaru\" weithio'n iawn ar systemau Mandrivalinux\n"</div><div class='ctx'> "sy'n rhedeg systemau \"8.1\" neu'n ddiweddarach. Nid yw uwchraddio\n"</div><div class='del'>-"fersiynau cyn Mandrakelinux \"8.1\" yn cael ei gymeradwyo."</div><div class='add'>+"fersiynau cyn Mandrivalinux \"8.1\" yn cael ei gymeradwyo."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5128,7 +5128,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5169,7 +5169,7 @@ msgstr ""</div><div class='ctx'> "Ynghylch cefnogaeth UTF-8 (unicode): Amgodiad nod newydd yw Unicode\n"</div><div class='ctx'> "sydd i gynnwys pob iaith. Er hynny, mae cefnogaeth i bob iaith o fewn\n"</div><div class='ctx'> "GNU/Linux yn dal yn cael ei ddatblygu Oherwydd hynn mae defnydd\n"</div><div class='del'>-"Mandrakelinux o UTF-8 yn ddibynnol ar ddewis y defnyddiwr:\n"</div><div class='add'>+"Mandrivalinux o UTF-8 yn ddibynnol ar ddewis y defnyddiwr:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Os ydych yn dewis iaith gyda hen amgodiad cryf (ieithoedd lladin1\n"</div><div class='ctx'> "Rwsieg, Siapanëeg, Tsieinëeg, Corëeg, Thai, Groeg, Twrceg, y rhan\n"</div><div class='hunk'>@@ -5420,7 +5420,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5441,7 +5441,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Yma byddwn yn dewis system argraffu i'ch cyfrifiadur ei ddefnyddio. Efallai\n"</div><div class='hunk'>@@ -5590,7 +5590,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5607,7 +5607,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5656,7 +5656,7 @@ msgstr ""</div><div class='ctx'> " \n"</div><div class='ctx'> " * \"%s\": os ydych am ffurfweddu eich mynediad i'r Rhyngrwyd neu\n"</div><div class='ctx'> "eich rhwydwaith lleol, mae modd gwneud hynny. Darllenwch y deunydd\n"</div><div class='del'>-"ysgrifenedig neu ddefnyddio Canolfan Reoli Mandrakelinux wedi i'r gosod\n"</div><div class='add'>+"ysgrifenedig neu ddefnyddio Canolfan Reoli Mandrivalinux wedi i'r gosod\n"</div><div class='ctx'> "orffen i fanteisio ar gymorth ar-lein llawn.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": os ydych am ffurfweddu cyfeiriadau dirprwyol HTTP ac FTP os\n"</div><div class='hunk'>@@ -5673,7 +5673,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": os hoffech newid ffurfweddiad eich cychwynnwr\n"</div><div class='ctx'> "cliciwch y botwm yma. Ar gyfer defnyddwyr profiadol. Darllenwch y\n"</div><div class='ctx'> "deunydd ysgrifenedig  neu'r cymorth ar-lein am ffurfweddiad\n"</div><div class='del'>-"cychwynwyr yng Nghanolfan Rheoli Mandrakelinux.\n"</div><div class='add'>+"cychwynwyr yng Nghanolfan Rheoli Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " *\"%s\": yma bydd modd i chi wneud man newidiadau i'r\n"</div><div class='ctx'> "gwasanaethau sy'n cael eu rhedeg ar eich cyfrifiadur. Os ydych yn\n"</div><div class='hunk'>@@ -5735,11 +5735,11 @@ msgstr "Gwasanaethau"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dewiswch y ddisg galed rydych am ei ddileu er mwy n gosod eich rhaniad\n"</div><div class='del'>-"Mandrakelinux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"</div><div class='add'>+"Mandrivalinux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"</div><div class='ctx'> "cael ei ddileu ac ni fydd modd ei adfer!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6091,11 +6091,11 @@ msgstr "Cyfrifo maint rhaniad Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mae eich rhaniad Windows yn rhy ysgyriog, rhedwch \"defrag\" yn gyntaf o dan "</div><div class='del'>-"Windows ac yna ailgychwyn gosodi Mandrakelinux."</div><div class='add'>+"Windows ac yna ailgychwyn gosodi Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6209,19 +6209,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6243,7 +6243,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6251,14 +6251,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6268,7 +6268,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6288,10 +6288,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6302,11 +6302,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6322,25 +6322,25 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Cyflwyniad\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Bydd y system weithredu a'r cydrannau gwahanol sydd o fewn dosbarthiad "</div><div class='del'>-"Mandrakelinux yn\n"</div><div class='add'>+"Mandrivalinux yn\n"</div><div class='ctx'> "cael eu galw yn \"Gynnyrch Meddalwedd\" o hyn ymlaen. Mae'r Cynnyrch "</div><div class='ctx'> "Meddalwedd yn\n"</div><div class='ctx'> "cynnwys, ond heb eu cyfyngu, i'r  casgliad o raglenni , dulliau, rheolau a "</div><div class='ctx'> "dogfennau mewn\n"</div><div class='ctx'> "perthynas â'r system weithredu a chydrannau gwahanol ddosbarthiad "</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Cytundeb Trwyddedu\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Darllenwch y ddogfen hon yn ofalus. Mae'r ddogfen hon yn gytundeb trwyddedu "</div><div class='ctx'> "rhyngoch\n"</div><div class='del'>-"chi â Mandrakesoft S.A,. sy'n berthnasol i'r Cynnyrch Meddalwedd.\n"</div><div class='add'>+"chi â Mandriva S.A,. sy'n berthnasol i'r Cynnyrch Meddalwedd.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Wrth osod, dyblygu neu ddefnyddio'r Cynnyrch Meddalwedd mewn unrhyw fodd, "</div><div class='ctx'> "rydych yn\n"</div><div class='hunk'>@@ -6365,7 +6365,7 @@ msgstr ""</div><div class='ctx'> "\"fel ag y maent\",\n"</div><div class='ctx'> "heb ddim gwarant,\n"</div><div class='ctx'> "hyd y mae'r gyfraith yn caniatáu.\n"</div><div class='del'>-"Ni fydd Mandrakesoft S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd ag "</div><div class='add'>+"Ni fydd Mandriva S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd ag "</div><div class='ctx'> "y bydd y gyfraith yn\n"</div><div class='ctx'> "caniatáu,  am unrhyw iawn o gwbl,\n"</div><div class='ctx'> "arbennig, damweiniol, uniongyrchol neu anuniongyrchol (gan gynnwys heb "</div><div class='hunk'>@@ -6374,14 +6374,14 @@ msgstr ""</div><div class='ctx'> "chosb o ganlyniad i achos llys,\n"</div><div class='ctx'> "neu unrhyw golled o ganlyniad) yn codi o'r defnydd neu'r anallu i "</div><div class='ctx'> "ddefnyddio'r Cynnyrch Meddalwedd,\n"</div><div class='del'>-"hyd yn oed os yw Mandrakesoft wedi eu cynghori o'r posibilrwydd o'r fath "</div><div class='add'>+"hyd yn oed os yw Mandriva wedi eu cynghori o'r posibilrwydd o'r fath "</div><div class='ctx'> "iawn.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "CYFRIFOLDEB CYFYNGEDIG YN GYSYLLTIEDIG GYDA'R MEDDIANT NEU'R DEFNYDD O "</div><div class='ctx'> "FEDDALWEDD\n"</div><div class='ctx'> " GWAHARDDEDIG MEWN RHAI GWLEDYDD\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Ni fydd Mandrakesoft S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd y "</div><div class='add'>+"Ni fydd Mandriva S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd y "</div><div class='ctx'> "bydd y gyfraith yn caniatáu,\n"</div><div class='ctx'> "i fod yn atebol am unrhyw iawn o gwbl, arbennig, damweiniol, uniongyrchol "</div><div class='ctx'> "neu anuniongyrchol (gan gynnwys\n"</div><div class='hunk'>@@ -6389,7 +6389,7 @@ msgstr ""</div><div class='ctx'> "costau cyfreithiol, a chosb o ganlyniad\n"</div><div class='ctx'> "i achos llys, neu unrhyw golled o ganlyniad) yn codi o lwytho i lawr "</div><div class='ctx'> "cydrannau meddalwedd o un o safleoedd\n"</div><div class='del'>-" Mandrakelinux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan "</div><div class='add'>+" Mandrivalinux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan "</div><div class='ctx'> "gyfreithiau lleol. Mae'r\n"</div><div class='ctx'> "cyfrifoldeb cyfyngedig hwn yn perthyn i , ond heb ei gyfyngu i'r, cydrannau "</div><div class='ctx'> "cryptograffiaeth cryf sy'n cael\n"</div><div class='hunk'>@@ -6409,10 +6409,10 @@ msgstr ""</div><div class='ctx'> " ailddosbarthu'r cydrannau maent yn eu cynnwys. Darllenwch delerau ac amodau "</div><div class='ctx'> "trwydded pob cydran cyn\n"</div><div class='ctx'> "eu defnyddio. Dylai pob cwestiwn am drwydded cydran gael ei ofyn i awdur y "</div><div class='del'>-"gydran ac nid i Mandrakesoft.\n"</div><div class='del'>-"Mae'r rhaglenni a ddatblygwyd gan Mandrakesoft yn cael eu llywodraethu o dan "</div><div class='add'>+"gydran ac nid i Mandriva.\n"</div><div class='add'>+"Mae'r rhaglenni a ddatblygwyd gan Mandriva yn cael eu llywodraethu o dan "</div><div class='ctx'> "Drwydded GLP. Mae'r dogfennau\n"</div><div class='del'>-" ysgrifennwyd gan Mandrakesoft S.A. yn cael eu llywodraethu gan drwydded "</div><div class='add'>+" ysgrifennwyd gan Mandriva S.A. yn cael eu llywodraethu gan drwydded "</div><div class='ctx'> "benodol. Darllenwch y dogfennau\n"</div><div class='ctx'> "am fwy o fanylion.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6422,12 +6422,12 @@ msgstr ""</div><div class='ctx'> "Mae pob hawl cydrannau'r Cynnyrch Meddalwedd yn perthyn i'w hawduron "</div><div class='ctx'> "perthnasol ac wedi eu hamddiffyn\n"</div><div class='ctx'> "gan gyfreithiau eiddo deallusol a hawlfraint sy'n berthnasol i raglenni "</div><div class='del'>-"meddalwedd. Mae Mandrakesoft yn cadw\n"</div><div class='add'>+"meddalwedd. Mae Mandriva yn cadw\n"</div><div class='ctx'> "ei hawl i newid neu addasu ei Gynnyrch Meddalwedd, yn rhannol neu yn gyfan, "</div><div class='ctx'> "drwy unrhyw ddull ac ar gyfer\n"</div><div class='ctx'> "unrhyw bwrpas.\n"</div><div class='del'>-"Mae \"Mandrake\", \"Mandrakelinux\"  a'r logos cysylltiedig yn nodau "</div><div class='del'>-"masnachol sy'n perthyn i Mandrakesoft S.A.\n"</div><div class='add'>+"Mae \"Mandriva\", \"Mandrivalinux\"  a'r logos cysylltiedig yn nodau "</div><div class='add'>+"masnachol sy'n perthyn i Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Cyfreithiau Llywodraethol\n"</div><div class='hunk'>@@ -6442,7 +6442,7 @@ msgstr ""</div><div class='ctx'> "bydd pob anghytundeb ar amodau'r drwydded yn cael eu datrys y tu allan i'r "</div><div class='ctx'> "llys. Fel cam olaf, bydd yr anghytundeb yn cael ei drosglwyddo i'r Llysoedd "</div><div class='ctx'> "Barn, Paris - Ffrainc. Am unrhyw gwestiwn ynghylch y ddogfen hon cysylltwch "</div><div class='del'>-"â Mandrakesoft S.A.  \n"</div><div class='add'>+"â Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6533,7 +6533,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6541,14 +6541,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Llongyfarchiadau, mae'r gosod wedi ei gwblhau.\n"</div><div class='ctx'> "Tynnwch y cyfrwng cychwyn a chlicio Ailgychwyn.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "cysylltwch â'r atodiad, sydd i'w gael yn:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6556,7 +6556,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Mae gwybodaeth ar ffurfweddu eich system ar gael ym mhenawdau ôl osod\n"</div><div class='del'>-"yr Official Mandrakelinux User's Guide."</div><div class='add'>+"yr Official Mandrivalinux User's Guide."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6591,12 +6591,12 @@ msgstr "Cychwyn cam '%s\"\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mae eich system yn brin o adnoddau. Efallai y cewch anawsterau wrth osod\n"</div><div class='del'>-"Mandrakelinux. Os bydd hynny'n digwydd, gallwch geisio gwneud gosodiad\n"</div><div class='add'>+"Mandrivalinux. Os bydd hynny'n digwydd, gallwch geisio gwneud gosodiad\n"</div><div class='ctx'> "testunol. I wneud hynny, gwasgwch F1 wrth gychwyn ar y CD-ROM ac yna rhoi "</div><div class='ctx'> "'text'."</div><div class='ctx'> </div><div class='hunk'>@@ -6820,7 +6820,7 @@ msgid ""</div><div class='ctx'> "available once the system is fully installed."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mae gennych y dewis i gopîo cynnwys y CD ar i'r disg caled cyn gosod "</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "Bydd yna'n parhau o'r disg caled a bydd y pecynnau ar gael unwaith i'r "</div><div class='ctx'> "system gael ei osod yn gyflawn."</div><div class='ctx'> </div><div class='hunk'>@@ -7136,8 +7136,8 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='del'>-msgstr "Cysylltu â safle Mandrakelinux i estyn rhestr o'r drychau sydd ar gael"</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='add'>+msgstr "Cysylltu â safle Mandrivalinux i estyn rhestr o'r drychau sydd ar gael"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7360,8 +7360,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Gosodiad %s Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Gosodiad %s Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9951,14 +9951,14 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ffurfweddiadur drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Mae hwn yn ffurfweddu mur gwarchod personol ar gyfer y peiriant \n"</div><div class='del'>-"Mandrakelinux hwn. Am fur gwarchod pwrpasol pwerus, \n"</div><div class='add'>+"Mandrivalinux hwn. Am fur gwarchod pwrpasol pwerus, \n"</div><div class='ctx'> "edrychwch ddosbarthiad arbenigol MandrakeSecurity Firewall."</div><div class='ctx'> </div><div class='ctx'> #: network/drakfirewall.pm:164</div><div class='hunk'>@@ -14029,11 +14029,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Rhedwch Scannerdrake (Caledwedd/Sganiwr yng Nghanolfan Rheoli Mandrakelinux) "</div><div class='add'>+"Rhedwch Scannerdrake (Caledwedd/Sganiwr yng Nghanolfan Rheoli Mandrivalinux) "</div><div class='ctx'> "i rannu eich sganiwr ar y rhwydwaith.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -15972,33 +15972,33 @@ msgstr "Aros"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Beth yw Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Beth yw Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Croeso i &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Croeso i &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mae Mandrakelinux yn &lt;b&gt;ddosbarthiad Linux&lt;/b&gt; sy'n cynnwys y system graidd, "</div><div class='add'>+"Mae Mandrivalinux yn &lt;b&gt;ddosbarthiad Linux&lt;/b&gt; sy'n cynnwys y system graidd, "</div><div class='ctx'> "sef, &lt;b&gt;system weithredu&lt;/b&gt; (yn seiliedig ar gnewyllyn Linux) ynghyd â &lt;b&gt; "</div><div class='ctx'> "llawer o raglenni&lt;/b&gt; sy'n darparu ar gyfer pob angen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux yw'r dosbarthiad Linux mwyaf &lt;b&gt;cyfeillgar&lt;/b&gt; heddiw. Mae'n "</div><div class='add'>+"Mandrivalinux yw'r dosbarthiad Linux mwyaf &lt;b&gt;cyfeillgar&lt;/b&gt; heddiw. Mae'n "</div><div class='ctx'> "un o'r dosbarthiadau mwyaf &lt;b&gt;poblogaidd&lt;/b&gt; o Linux ar draws y byd i gyd!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16014,15 +16014,15 @@ msgstr "Croeso i &lt;b&gt;fyd Cod Agored&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mae Mandrakelinux yn ymroddedig i fodel cod agored. Mae'n golygu fod y "</div><div class='add'>+"Mae Mandrivalinux yn ymroddedig i fodel cod agored. Mae'n golygu fod y "</div><div class='ctx'> "rhyddhad newydd yn ganlyniad &lt;b&gt;cydweithrediad&lt;/b&gt; rhwng &lt;b&gt;tîm o "</div><div class='del'>-"ddatblygwyr Mandrakesoft&lt;/b&gt; a &lt;b&gt;chyfranwyr cymuned byd eang&lt;/b&gt; cyfranwyr "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"ddatblygwyr Mandriva&lt;/b&gt; a &lt;b&gt;chyfranwyr cymuned byd eang&lt;/b&gt; cyfranwyr "</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16042,10 +16042,10 @@ msgstr "&lt;b&gt;Y drwydded GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mae'r rhan fwyaf o'r feddalwedd sydd wedi ei gynnwys ynghyd â holl offer "</div><div class='del'>-"Mandrakelinux wedi eu trwyddedu o dan y &lt;b&gt;Drwydded Gyhoeddus Cyffredinol "</div><div class='add'>+"Mandrivalinux wedi eu trwyddedu o dan y &lt;b&gt;Drwydded Gyhoeddus Cyffredinol "</div><div class='ctx'> "(GPL)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16076,15 +16076,15 @@ msgstr "&lt;b&gt;Ymunwch â chymuned&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mae gan Mandrakelinux un o'r &lt;b&gt;cymunedau mwyaf&lt;/b&gt; o ddefnyddwyr a "</div><div class='add'>+"Mae gan Mandrivalinux un o'r &lt;b&gt;cymunedau mwyaf&lt;/b&gt; o ddefnyddwyr a "</div><div class='ctx'> "datblygwyr. Mae rôl y gymuned yn eang iawn yn ymestyn o adrodd ar wallau i "</div><div class='ctx'> "ddatblygu rhaglenni newydd. Mae'r gymuned yn chwarae &lt;b&gt;rhan allweddol&lt;/b&gt; "</div><div class='del'>-"ym myd Mandrakelinux."</div><div class='add'>+"ym myd Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16105,11 +16105,11 @@ msgstr "&lt;b&gt;Fersiwn Llwytho&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Rydych yn gosod &lt;b&gt; Mandrakelinux Llwytho i Lawr&lt;/b&gt;. Hwn yw'r fersiwn rhydd "</div><div class='del'>-"mae Mandrakesoft am ei ddarparu &lt;b&gt;ar gael i bawb&lt;/b&gt;."</div><div class='add'>+"Rydych yn gosod &lt;b&gt; Mandrivalinux Llwytho i Lawr&lt;/b&gt;. Hwn yw'r fersiwn rhydd "</div><div class='add'>+"mae Mandriva am ei ddarparu &lt;b&gt;ar gael i bawb&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16139,10 +16139,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ni fydd gennych fynediad i'r &lt;b&gt;gwasanaethau ynglwm&lt;/b&gt; yn y cynnyrch "</div><div class='del'>-"Mandrakesoft eraill ychwaith."</div><div class='add'>+"Mandriva eraill ychwaith."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16151,7 +16151,7 @@ msgstr "&lt;b&gt;Discovery, Eich Bwrdd Gwaith Linux Cyntaf&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr "Rydych yn gosod &lt;b&gt;Mandrake Discovery&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -16174,17 +16174,17 @@ msgstr "&lt;b&gt;PowerPack, Y Bwrdd Gwaith Linux Gorau&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Rydych yn gosod &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;"</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Rydych yn gosod &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack yw &lt;b&gt;prif gynnyrch bwrdd gwaith Linux&lt;/b&gt; Mandrakesoft. Mae "</div><div class='add'>+"PowerPack yw &lt;b&gt;prif gynnyrch bwrdd gwaith Linux&lt;/b&gt; Mandriva. Mae "</div><div class='ctx'> "PowerPack yn cynnwys &lt;b&gt;miloedd o raglenni&lt;/b&gt; - popeth o'r mwyaf poblogaidd "</div><div class='ctx'> "i'r mwyaf technegol."</div><div class='ctx'> </div><div class='hunk'>@@ -16195,8 +16195,8 @@ msgstr "&lt;b&gt;PowerPack+, Ateb Linux ar gyfer Byrddau gwaith a Gweinyddion&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Rydych yn gosod &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Rydych yn gosod &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16212,22 +16212,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Cynnyrch Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Cynnyrch Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mae &lt;b&gt;Mandrakesoft&lt;/b&gt; wedi datblygu ystod eang o gynnyrch "</div><div class='del'>-"&lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"Mae &lt;b&gt;Mandriva&lt;/b&gt; wedi datblygu ystod eang o gynnyrch "</div><div class='add'>+"&lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Cynnyrch Mandrakelinux yw:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Cynnyrch Mandrivalinux yw:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16248,73 +16248,73 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux ar gyfer x86-64&lt;/b&gt;, Ateb Mandrakelinux i wneud y gorau "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux ar gyfer x86-64&lt;/b&gt;, Ateb Mandrivalinux i wneud y gorau "</div><div class='ctx'> "o'ch prosesydd 64-did."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Cynnyrch Mandrakesoft (Cynnyrch Nomad)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Cynnyrch Mandriva (Cynnyrch Nomad)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mae Mandrakelinux wedi datblygu dau gynnyrch sy'n caniatáu i chi ddefnyddio "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ar unrhyw gyfrifiadur&lt;/b&gt; heb fod angen ei osod:"</div><div class='add'>+"Mae Mandrivalinux wedi datblygu dau gynnyrch sy'n caniatáu i chi ddefnyddio "</div><div class='add'>+"Mandrivalinux &lt;b&gt;ar unrhyw gyfrifiadur&lt;/b&gt; heb fod angen ei osod:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, dosbarthiad Mandrakelinux sy'n rhedeg yn llwyr o CD-ROM byw."</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, dosbarthiad Mandrivalinux sy'n rhedeg yn llwyr o CD-ROM byw."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, dosbarthiad Mandrakelinux sydd wedi ei osod yn "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, dosbarthiad Mandrivalinux sydd wedi ei osod yn "</div><div class='ctx'> "barod ar “LaCie Mobile Hard Drive” bychan iawn"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Cynnyrch Mandrakesoft (Atebion Proffesiynol)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Cynnyrch Mandriva (Atebion Proffesiynol)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Isod mae cynnyrch Mandrakesoft sydd wedi eu cynllunio i ateb &lt;b&gt;anghenion "</div><div class='add'>+"Isod mae cynnyrch Mandriva sydd wedi eu cynllunio i ateb &lt;b&gt;anghenion "</div><div class='ctx'> "proffesiynol&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Y Bwrdd Gwaith Corfforaethol&lt;/b&gt;, Bwrdd Gwaith Mandrakelinux ar gyfer "</div><div class='add'>+"\t* &lt;b&gt;Y Bwrdd Gwaith Corfforaethol&lt;/b&gt;, Bwrdd Gwaith Mandrivalinux ar gyfer "</div><div class='ctx'> "Busnesau."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Y Gweinydd Corfforaethol&lt;/b&gt;, Ateb Gweinydd Mandrakelinux."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Y Gweinydd Corfforaethol&lt;/b&gt;, Ateb Gweinydd Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Mur Cadarn Aml-Rhwydwaith&lt;/b&gt;, Ateb Diogelwch Mandrakelinux."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Mur Cadarn Aml-Rhwydwaith&lt;/b&gt;, Ateb Diogelwch Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16358,10 +16358,10 @@ msgstr "&lt;b&gt;Dewiswch eich Hoff Amgylchedd Bwrdd Gwaith&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gyda PowerPack, bydd gennych y dewis o &lt;b&gt;amgylchedd bwrdd gwaith graffigol&lt;/"</div><div class='del'>-"b&gt;. Mae Mandrakesoft wedi dewis &lt;b&gt;KDE&lt;/b&gt; fel yr un rhagosodedig."</div><div class='add'>+"b&gt;. Mae Mandriva wedi dewis &lt;b&gt;KDE&lt;/b&gt; fel yr un rhagosodedig."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16385,10 +16385,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gyda PowerPack+, mae gennych y dewis o &lt;b&gt;amgylcheddau bwrdd gwaith "</div><div class='del'>-"graffigol&lt;/b&gt;. Mae Mandrakesoft wedi dewis &lt;b&gt;KDE&lt;/b&gt; fel y rhagosodedig."</div><div class='add'>+"graffigol&lt;/b&gt;. Mae Mandriva wedi dewis &lt;b&gt;KDE&lt;/b&gt; fel y rhagosodedig."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16513,10 +16513,10 @@ msgstr "&lt;b&gt;Mwynhau'r Ystod Eang o Raglenni&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Yn newislen Mandrakelinux byddwch yn canfod rhaglenni &lt;b&gt;hawdd eu defnyddio&lt;/"</div><div class='add'>+"Yn newislen Mandrivalinux byddwch yn canfod rhaglenni &lt;b&gt;hawdd eu defnyddio&lt;/"</div><div class='ctx'> "b&gt; ar gyfer &lt;b&gt;eich holl waith&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16781,18 +16781,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Canolfan Rheoli Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Canolfan Rheoli Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mae &lt;b&gt;Canolfan Reoli Mandrakelinux&lt;/b&gt; yn gasgliad hanfodol o wasanaethau "</div><div class='del'>-"ar gyfer Mandrakelinux swydd wedi eu cynllunio i symlhau ffurfweddiad eich "</div><div class='add'>+"Mae &lt;b&gt;Canolfan Reoli Mandrivalinux&lt;/b&gt; yn gasgliad hanfodol o wasanaethau "</div><div class='add'>+"ar gyfer Mandrivalinux swydd wedi eu cynllunio i symlhau ffurfweddiad eich "</div><div class='ctx'> "cyfrifiadur."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16817,16 +16817,16 @@ msgstr "&lt;b&gt;Y Model Cod Agored&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Fel pob rhaglenni cyfrifiadurol, mae meddalwedd cod agored &lt;b&gt;yn golygu "</div><div class='ctx'> "amser a phobl&lt;/b&gt; ar gyfer datblygiad. Er mwyn parchu athroniaeth cod "</div><div class='del'>-"agored, mae Mandrakesoft yn gwerthu cynnyrch gwerth ychwanegol a "</div><div class='del'>-"gwasanaethau i &lt;b&gt;barhau i wella Mandrakelinux&lt;/b&gt;. Os hoffech chi "</div><div class='del'>-"&lt;b&gt;gefnogi athroniaeth cod agored&lt;/b&gt; a datblygiad Mandrakelinux, &lt;b&gt;os "</div><div class='add'>+"agored, mae Mandriva yn gwerthu cynnyrch gwerth ychwanegol a "</div><div class='add'>+"gwasanaethau i &lt;b&gt;barhau i wella Mandrivalinux&lt;/b&gt;. Os hoffech chi "</div><div class='add'>+"&lt;b&gt;gefnogi athroniaeth cod agored&lt;/b&gt; a datblygiad Mandrivalinux, &lt;b&gt;os "</div><div class='ctx'> "gwelwch chi'n dda&lt;/b&gt; ystyriwch brynu ein cynnyrch neu ein gwasanaethau!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16837,10 +16837,10 @@ msgstr "&lt;b&gt;Siop Ar-lein&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"I ddysgu rhagor am gynnyrch a gwasanaethau Mandrakesoft, ewch i'n "</div><div class='add'>+"I ddysgu rhagor am gynnyrch a gwasanaethau Mandriva, ewch i'n "</div><div class='ctx'> "&lt;b&gt;platfform e-fasnachu&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16865,24 +16865,24 @@ msgstr "Ewch i &lt;b&gt; store.mandrakesoft.com&lt;/b&gt; heddiw."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; yw'r &lt;b&gt;cydymaith perffaith&lt;/b&gt; ar gyfer eich cynnyrch "</div><div class='del'>-"Mandrakelinux..."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; yw'r &lt;b&gt;cydymaith perffaith&lt;/b&gt; ar gyfer eich cynnyrch "</div><div class='add'>+"Mandrivalinux..."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Cewch fanteisio ar &lt;b&gt;freintiau gwerthfawr&lt;/b&gt; drwy ymuno â Mandrakeclub, e."</div><div class='add'>+"Cewch fanteisio ar &lt;b&gt;freintiau gwerthfawr&lt;/b&gt; drwy ymuno â Mandriva Club, e."</div><div class='ctx'> "e:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16904,40 +16904,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Cymryd rhan mewn &lt;b&gt;fforymau defnyddwyr&lt;/b&gt; Mandrakelinux."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Cymryd rhan mewn &lt;b&gt;fforymau defnyddwyr&lt;/b&gt; Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Mynediad cynnar a breintiol&lt;/b&gt;, cyn eu rhyddhau'n gyhoeddus, i "</div><div class='del'>-"&lt;b&gt;ddelweddau ISO&lt;/b&gt; Mandrakelinux."</div><div class='add'>+"&lt;b&gt;ddelweddau ISO&lt;/b&gt; Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; yw'r gwasanaeth newydd gwerthfawr mae Mandrakesoft yn "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; yw'r gwasanaeth newydd gwerthfawr mae Mandriva yn "</div><div class='ctx'> "ei gynnig i 'w gwsmeriaid!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mae Mandrakeonline yn darparu ystod eang o wasanaethau gwerthfawr ar gyfer "</div><div class='del'>-"&lt;b&gt;diweddaru'n hawdd&lt;/b&gt; eich systemau your Mandrakelinux:"</div><div class='add'>+"Mae Mandriva Online yn darparu ystod eang o wasanaethau gwerthfawr ar gyfer "</div><div class='add'>+"&lt;b&gt;diweddaru'n hawdd&lt;/b&gt; eich systemau your Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16963,39 +16963,39 @@ msgstr "\t* Hyblyg &lt;b&gt;amserlen&lt;/b&gt; diweddariadau."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='del'>-msgstr "\t* Rheolaeth o'ch &lt;b&gt;holl systemau Mandrakelinux&lt;/b&gt; gydag un cyfrif."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='add'>+msgstr "\t* Rheolaeth o'ch &lt;b&gt;holl systemau Mandrivalinux&lt;/b&gt; gydag un cyfrif."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ydych chi angen &lt;b&gt;cymorth?&lt;/b&gt; Mae arbenigwyr technegol Mandrakesoft i'w "</div><div class='add'>+"Ydych chi angen &lt;b&gt;cymorth?&lt;/b&gt; Mae arbenigwyr technegol Mandriva i'w "</div><div class='ctx'> "cael ar  &lt;b&gt;ein platfform cefnogaeth dechnegol &lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Drwy gymorth &lt;b&gt;arbenigwyr cymwysedig Mandrakelinux&lt;/b&gt;, byddwch yn abed "</div><div class='add'>+"Drwy gymorth &lt;b&gt;arbenigwyr cymwysedig Mandrivalinux&lt;/b&gt;, byddwch yn abed "</div><div class='ctx'> "llawer o amser."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Am unrhyw gwestiwn am Mandrakelinux, mae gennych y gallu i brynu cefnogaeth "</div><div class='add'>+"Am unrhyw gwestiwn am Mandrivalinux, mae gennych y gallu i brynu cefnogaeth "</div><div class='ctx'> "ar gyfer unrhyw ddigwyddiad o &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17295,8 +17295,8 @@ msgstr "Offer monitro, cyfrifo prosesau, tcpdunp, nmap..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Dewiniaid Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Dewiniaid Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17392,8 +17392,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "DEWISIADAU:\n"</div><div class='ctx'> "  --help            - argraffu'r neges cymorth.\n"</div><div class='del'>-"  --report          - dylai'r rhaglen fod yn un o offer Mandrakelinux\n"</div><div class='del'>-"  --incident        - ylai'r rhaglen fod yn un o offer Mandrakelinux"</div><div class='add'>+"  --report          - dylai'r rhaglen fod yn un o offer Mandrivalinux\n"</div><div class='add'>+"  --incident        - ylai'r rhaglen fod yn un o offer Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17447,7 +17447,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17460,7 +17460,7 @@ msgid ""</div><div class='ctx'> "--delclient      : delete a client machine from MTS (requires MAC address, "</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ffurfweddwr Gweinydd Terfynell Mandrakelinux\n"</div><div class='add'>+"Ffurfweddwr Gweinydd Terfynell Mandrivalinux\n"</div><div class='ctx'> "--enable         : galluogi MTS\n"</div><div class='ctx'> "--disable        : analluogi MTS\n"</div><div class='ctx'> "--start          : cychwyn MTS\n"</div><div class='hunk'>@@ -17517,7 +17517,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17525,7 +17525,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[DEWIS]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -20302,13 +20302,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Offeryn Cofnodi Gwall Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Offeryn Cofnodi Gwall Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Canolfan Rheoli Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Canolfan Rheoli Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20328,8 +20328,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20373,8 +20373,8 @@ msgstr "Dewin Ffurfweddu"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Dewis Offeryn Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Dewis Offeryn Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20800,7 +20800,7 @@ msgstr "Cychwyn y peiriant"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nid yw'r rhag wyneb hwn wedi ei ffurfweddu eto.\n"</div><div class='ctx'> "Cychwynnwch y cynorthwyydd \"Ychwanegu rhyngwyneb\" o' Ganolfan Rheoli "</div><div class='hunk'>@@ -20810,7 +20810,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nid oes gennych gyswllt wedi ei ffurfweddu â'r Rhyngrwyd.\n"</div><div class='ctx'> "Cychwynnwch gynorthwy-ydd \"%s\" o Ganolfan Rheoli Mandrake"</div><div class='hunk'>@@ -20863,8 +20863,8 @@ msgstr "KDM (rheolwr arddangos KDE)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (rheolwr arddangos Mandrakelinux)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (rheolwr arddangos Mandrivalinux)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21163,7 +21163,7 @@ msgstr "Mewnforio"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21172,7 +21172,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Hawlfraint (C) 2001-2002  Mandrakesoft \n"</div><div class='add'>+"Hawlfraint (C) 2001-2002  Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "        DUPONT Sebastien sdupont (fersiwn wreiddiol)\n"</div><div class='hunk'>@@ -21718,14 +21718,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Hawlfraint (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Hawlfraint (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Mae hwn yn feddalwedd rhydd ac mae modd ei ailddosbarthu o dan amodau GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21755,8 +21755,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Canolfan Gymorth Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Canolfan Gymorth Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25281,8 +25281,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Cofnodion Offer Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Cofnodion Offer Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25796,10 +25796,10 @@ msgstr "Cysylltiad wedi ei gwblhau"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Methodd y cysylltiad.\n"</div><div class='del'>-"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandrakelinux."</div><div class='add'>+"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26684,8 +26684,8 @@ msgstr "Methodd y gosod"</div><div class='ctx'> #~ msgstr "Cadw a chau"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Dewiniaid Mandrakesoft"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Dewiniaid Mandriva"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Dim porwr ar gael! Gosodwch un"</div><div class='head'>diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po<br/>index dac367d81..576243bfc 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/da.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/da.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/da.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/da.po</a></div><div class='hunk'>@@ -69,7 +69,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB-nøglen ser ud til at have skrivebeskyttelse aktiveret, men vi kan ikke\n"</div><div class='ctx'> "tage den ud på en sikker måde nu.\n"</div><div class='hunk'>@@ -77,7 +77,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Klik på knappen for at genstarte maskinen, tag den ud, fjern "</div><div class='ctx'> "skrivebeskyttelsen,\n"</div><div class='del'>-"sæt nøglen ind igen, og start Mandrake Move igen."</div><div class='add'>+"sæt nøglen ind igen, og start Mandriva Move igen."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Din USB-nøgle har ikke nogen gyldige Windows FAT partitioner.\n"</div><div class='hunk'>@@ -107,14 +107,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Du kan også fortsætte uden en USB-nøgle - du vil så stadig\n"</div><div class='del'>-"kunne bruge Mandrake Move som et normalt levende Mandrake \n"</div><div class='add'>+"kunne bruge Mandriva Move som et normalt levende Mandrake \n"</div><div class='ctx'> "operativsystem."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -122,11 +122,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vi fandt ikke nogen USB-nøgle på dit system. Hvis du\n"</div><div class='del'>-"indsætter en USB-nøgle nu, vil Mandrake Move have mulighed\n"</div><div class='add'>+"indsætter en USB-nøgle nu, vil Mandriva Move have mulighed\n"</div><div class='ctx'> "for automatisk at gemme dataene fra dit hjemmekatalog og systemets\n"</div><div class='ctx'> "konfiguration, for den næste opstart af denne eller en anden maskine.\n"</div><div class='ctx'> "Bemærk: Hvis du indsætter en nøgle nu skal du vente nogen sekunder\n"</div><div class='hunk'>@@ -134,7 +134,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Du kan også fortsætte uden en USB-nøgle - du vil så stadig\n"</div><div class='del'>-"kunne bruge Mandrake Move som et normalt levende Mandrake \n"</div><div class='add'>+"kunne bruge Mandriva Move som et normalt levende Mandrake \n"</div><div class='ctx'> "operativsystem."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -261,7 +261,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -277,7 +277,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Dette kan komme fra beskadigede konfigurationsfiler\n"</div><div class='ctx'> "på USB-nøglen, hvis det er tilfældet vil fjernelse af filerne og dernæst\n"</div><div class='del'>-"genstarte Mandrake Move ordne problemet. Klik på den\n"</div><div class='add'>+"genstarte Mandriva Move ordne problemet. Klik på den\n"</div><div class='ctx'> "tilsvarende knap for at gøre dette.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1317,7 +1317,7 @@ msgstr "Sprogvalg"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3736,12 +3736,12 @@ msgstr "aktivér radio-understøttelse"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Før du går videre bør du læse betingelserne i licensen omhyggeligt.  Den "</div><div class='del'>-"omfatter hele Mandrakelinux distributionen. Hvis du er enig i alle "</div><div class='add'>+"omfatter hele Mandrivalinux distributionen. Hvis du er enig i alle "</div><div class='ctx'> "betingelserne i den, så klik på '%s'-boksen. Hvis ikke, så vil klikning på "</div><div class='ctx'> "\"%s\"-knappen genstarte din maskine."</div><div class='ctx'> </div><div class='hunk'>@@ -3916,13 +3916,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux installationen bliver distribueret på flere cdrom-er. Hvis en "</div><div class='add'>+"Mandrivalinux installationen bliver distribueret på flere cdrom-er. Hvis en "</div><div class='ctx'> "valgt pakke ligger på en anden cdrom, vil DrakX udskyde den nuværende cd og "</div><div class='ctx'> "bede dig om at isætte den forespurgte cd. Hvis du ikke har den forespurgte "</div><div class='ctx'> "cd ved hånden, så klik bare på '%s' - de tilsvarende pakker vil da ikke "</div><div class='hunk'>@@ -3932,11 +3932,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3988,11 +3988,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Det er nu tid til at angive hvilke pakker du vil installere på dit system. "</div><div class='del'>-"Der er tusindvis af pakker til dit Mandrakelinux system, og for at gøre det "</div><div class='add'>+"Der er tusindvis af pakker til dit Mandrivalinux system, og for at gøre det "</div><div class='ctx'> "nemmere at håndtere dem er pakkerne blevet placeret i grupper af lignende "</div><div class='ctx'> "programmer.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux opdeler pakkegrupper i fire kategorier. Du kan vælge og vrage "</div><div class='add'>+"Mandrivalinux opdeler pakkegrupper i fire kategorier. Du kan vælge og vrage "</div><div class='ctx'> "programmer fra de forskellige grupper, så en installation af "</div><div class='ctx'> "'Arbejdsstation' kan også have programmer fra 'Udvikling'-kategorien "</div><div class='ctx'> "installeret.\n"</div><div class='hunk'>@@ -4098,10 +4098,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4132,7 +4132,7 @@ msgstr ""</div><div class='ctx'> "!! Når en server-pakke er blevet valgt, enten fordi du specielt valgte den "</div><div class='ctx'> "individuelle pakke, eller fordi den var en del af en gruppe af pakker, vil "</div><div class='ctx'> "du blive spurgt om at bekræfte at du virkelig ønsker at installere disse "</div><div class='del'>-"servere. Som standard under Mandrakelinux bliver installerede servere "</div><div class='add'>+"servere. Som standard under Mandrivalinux bliver installerede servere "</div><div class='ctx'> "startet op ved opstart af maskinen. Selvom de er sikre og ikke har nogen "</div><div class='ctx'> "kendte problemer på udgivelsestidspunktet for distributionen, er det absolut "</div><div class='ctx'> "muligt at sikkerhedshuller blev opdaget efter at denne version af Mandrake "</div><div class='hunk'>@@ -4283,7 +4283,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4339,7 +4339,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (for X Window System) er hjertet af GNU/Linux' grafiske grænseflade som "</div><div class='ctx'> "alle de grafiske miljøer (KDE, GNOME, AfterStep, WindowMaker, mv.) der "</div><div class='del'>-"kommer sammen med Mandrakelinux afhænger af.\n"</div><div class='add'>+"kommer sammen med Mandrivalinux afhænger af.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Du vil se en liste med forskellige parametre der kan ændres for at få den "</div><div class='ctx'> "bedst mulige grafiske fremvisning:\n"</div><div class='hunk'>@@ -4455,12 +4455,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4487,7 +4487,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4496,7 +4496,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4516,11 +4516,11 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Nu skal du vælge hvor på din harddisk du vil installere dit Mandrakelinux-"</div><div class='add'>+"Nu skal du vælge hvor på din harddisk du vil installere dit Mandrivalinux-"</div><div class='ctx'> "operativsystem. Hvis disken er tom eller et eksisterende operativsystem "</div><div class='ctx'> "bruger alt pladsen på den, bliver du nødt til at partitionere drevet. "</div><div class='ctx'> "Partitionering vil sige at diskdrevet opdeles i logiske dele for at lave den "</div><div class='del'>-"plads der behøves til at installere dit nye Mandrakelinux-system.\n"</div><div class='add'>+"plads der behøves til at installere dit nye Mandrivalinux-system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Da partitioneringen af en disk normalt ikke kan fortrydes og kan føre til "</div><div class='ctx'> "tab af data, kan det godt være frustrerende og stressende for uøvede "</div><div class='hunk'>@@ -4546,7 +4546,7 @@ msgstr ""</div><div class='ctx'> "Windows-FAT- eller NTFS-partition. Størrelsesændringen kan fortages uden tab "</div><div class='ctx'> "af data, hvis du i forvejen har defragmenteret Windows-partitionen. Det "</div><div class='ctx'> "anbefales på det kraftigste at du laver en sikkerhedskopi først. Denne "</div><div class='del'>-"mulighed anbefales hvis du vil bruge både Mandrakelinux og Microsoft Windows "</div><div class='add'>+"mulighed anbefales hvis du vil bruge både Mandrivalinux og Microsoft Windows "</div><div class='ctx'> "på samme maskine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "  Før du vælger denne løsning, bør du forstå at størrelsen på din Microsoft "</div><div class='hunk'>@@ -4555,7 +4555,7 @@ msgstr ""</div><div class='ctx'> "nyt programmel.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * '%s': Hvis du vil slette alle data på alle partitioner på denne disk og "</div><div class='del'>-"erstatte dem med dit nye Mandrakelinux-system, kan du vælge denne mulighed. "</div><div class='add'>+"erstatte dem med dit nye Mandrivalinux-system, kan du vælge denne mulighed. "</div><div class='ctx'> "Vær forsigtig, for du vil ikke være i stand til at fortryde denne handling "</div><div class='ctx'> "efter at du har sagt ja.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4719,7 +4719,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4740,7 +4740,7 @@ msgstr ""</div><div class='ctx'> "Klik på '%s' når du er klar til at formatere partitionerne.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klik på '%s' hvis du ønsker at vælge andre partitioner til at installere dit "</div><div class='del'>-"nye Mandrakelinux operativsystem.\n"</div><div class='add'>+"nye Mandrivalinux operativsystem.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klik på '%s' for at vælge partitioner som du ønsker at tjekke for dårlige "</div><div class='ctx'> "blokke."</div><div class='hunk'>@@ -4757,7 +4757,7 @@ msgstr "Forrige"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4769,7 +4769,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"På det tidspunkt hvor du installerer Mandrakelinux er det sandsynligt at "</div><div class='add'>+"På det tidspunkt hvor du installerer Mandrivalinux er det sandsynligt at "</div><div class='ctx'> "nogen af pakkerne er blevet opdaterede siden den oprindelige udgivelse. Fejl "</div><div class='ctx'> "er måske blevet rettet, og sikkerhedsproblemer måske løst. Det er nu muligt "</div><div class='ctx'> "for dig at hente disse ned fra internettet for at disse opdateringer kan "</div><div class='hunk'>@@ -4798,7 +4798,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4812,7 +4812,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Hvis du ikke véd hvad du skal vælge, så behold den foreslåede mulighed. Du "</div><div class='ctx'> "vil kunne ændre det senere med værktøjet draksec som er en del af "</div><div class='del'>-"Mandrakelinux Kontrolcentret.\n"</div><div class='add'>+"Mandrivalinux Kontrolcentret.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Udfyld '%s'-feltet med epost-adressen på den person, som er ansvarlig for "</div><div class='ctx'> "sikkerhed. Sikkerhedsmeddelelser vil blive sendt til denne adresse."</div><div class='hunk'>@@ -4826,7 +4826,7 @@ msgstr "Sikkerhedsadministrator"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4897,7 +4897,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nu skal du vælge hvilke partitioner som skal bruges til installering af dit "</div><div class='del'>-"Mandrakelinux system. Hvis partitionerne allerede er blevet defineret, enten "</div><div class='add'>+"Mandrivalinux system. Hvis partitionerne allerede er blevet defineret, enten "</div><div class='ctx'> "fra en tidligere installation af GNU/Linux eller med et andet "</div><div class='ctx'> "partitioneringsværktøj, kan du bruge de eksisterende partitioner. Ellers "</div><div class='ctx'> "skal disk-partitionerne defineres først.\n"</div><div class='hunk'>@@ -4981,7 +4981,7 @@ msgstr "Skift mellem normal og ekspert-tilstand"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5011,7 +5011,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mere end én Microsoft Windows partition er blevet genkendt på dit diskdrev. "</div><div class='ctx'> "Vælg den som du ønsker at ændre størrelse på for at kunne installere dit nye "</div><div class='del'>-"Mandrakelinux operativsystem.\n"</div><div class='add'>+"Mandrivalinux operativsystem.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Hver partition er listet som følger: 'Linux navn', 'Windows navn', "</div><div class='ctx'> "'Kapacitet'.\n"</div><div class='hunk'>@@ -5058,7 +5058,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5067,19 +5067,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dette trin bliver kun aktiveret hvis der bliver fundet en eksisterende\n"</div><div class='ctx'> "GNU/Linux partition på din maskine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX skal nu vide om du vil udføre en ny installation eller en opgradering\n"</div><div class='del'>-"af et eksisterende Mandrakelinux-system.\n"</div><div class='add'>+"af et eksisterende Mandrivalinux-system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Dette vil stort sét slette hele det gamle system. Dog kan du "</div><div class='ctx'> "afhængigt af din partitionsopsætning forhindre at nogen af dine ekisterende "</div><div class='hunk'>@@ -5088,14 +5088,14 @@ msgstr ""</div><div class='ctx'> "bør du bruge denne mulighed.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Denne installationsklasse lader dig opgradere pakkene som er "</div><div class='del'>-"installeret på dit nuværende Mandrakelinux-system. Din nuværende "</div><div class='add'>+"installeret på dit nuværende Mandrivalinux-system. Din nuværende "</div><div class='ctx'> "partitionsopsætning og brugerdata bliver ikke berørt. De fleste andre "</div><div class='ctx'> "konfigurationstrin forbliver tilgængelige, i lighed med en "</div><div class='ctx'> "standardinstallation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"\"Opgradér\"-valget bør fungere fint på Mandrakelinux-systemer som kører "</div><div class='add'>+"\"Opgradér\"-valget bør fungere fint på Mandrivalinux-systemer som kører "</div><div class='ctx'> "version '8.1' eller nyere. Udførelse af Opgradér på versioner tidligere end "</div><div class='del'>-"Mandrakelinux '8.1' er ikke anbefalet."</div><div class='add'>+"Mandrivalinux '8.1' er ikke anbefalet."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5150,7 +5150,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5190,7 +5190,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Om UTF-8 (ISO 10646)-understøttelse. ISO 10646 er en ny tegnkodning som er "</div><div class='ctx'> "beregnet til at dække alle eksiterende sprog. Dog er fuld understøttelse for "</div><div class='del'>-"dette i GNU/Linux stadig under udvikling. Af denne årsag vil Mandrakelinux' "</div><div class='add'>+"dette i GNU/Linux stadig under udvikling. Af denne årsag vil Mandrivalinux' "</div><div class='ctx'> "brug af UTF-8 afhænge af brugerens valg:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Hvis du vælger et sprog som har en lang tradition for tegnkodning (latin1 "</div><div class='hunk'>@@ -5430,7 +5430,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5451,7 +5451,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nu er det tid til at vælge et udskrivningssystem for din maskine. Andre "</div><div class='hunk'>@@ -5478,7 +5478,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Hvis du laver et valg nu og senere finder ud af at du ikke kan lide dit "</div><div class='ctx'> "udskriftssystem, kan du ændre det ved at køre PrinterDrake fra "</div><div class='del'>-"Mandrakelinuxs Kontrolcenter, og klikke på '%s'-knappen."</div><div class='add'>+"Mandrivalinuxs Kontrolcenter, og klikke på '%s'-knappen."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5594,7 +5594,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5611,7 +5611,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5659,7 +5659,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Hvis du ønsker at konfigurere din adgang til internet eller "</div><div class='ctx'> "lokalnet, kan du gøre dette nu. Kig i den trykte dokumentation eller brug "</div><div class='del'>-"Mandrakelinux Kontrolcenter efter installationen er afsluttet for at drage "</div><div class='add'>+"Mandrivalinux Kontrolcenter efter installationen er afsluttet for at drage "</div><div class='ctx'> "nytte af den fulde indbyggede vejledning. \n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": lader dig konfigurere HTTP- og FTP-proxyadresser, hvis maskinen, "</div><div class='hunk'>@@ -5676,7 +5676,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": Hvis du vil ændre på konfigurationen for opstartsindlæseren, så "</div><div class='ctx'> "klik på denne knap. Dette bør forbeholdes avancerede brugere. Kig i den "</div><div class='ctx'> "trykte dokumentation eller i den indbyggede hjælp om konfiguration af "</div><div class='del'>-"opstartsindlæser i Mandrakelinux Kontrolcenter.\n"</div><div class='add'>+"opstartsindlæser i Mandrivalinux Kontrolcenter.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": her kan du fininstille hvilke tjenester som skal startes på din "</div><div class='ctx'> "maskine. Hvis du skal bruge maskinen som server er det en god idé at "</div><div class='hunk'>@@ -5737,10 +5737,10 @@ msgstr "Tjenester"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Vælg det diskdrev som du vil slette for at installere din nye Mandrakelinux "</div><div class='add'>+"Vælg det diskdrev som du vil slette for at installere din nye Mandrivalinux "</div><div class='ctx'> "partition. Vær forsigtig, alle data som er på denne partition vil gå tabt og "</div><div class='ctx'> "vil ikke kunne genskabes!"</div><div class='ctx'> </div><div class='hunk'>@@ -6094,7 +6094,7 @@ msgstr "Beregner størrelsen på Windows-partitionen"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr "Din Windows partition er for fragmenteret, kør 'defrag' først"</div><div class='ctx'> </div><div class='hunk'>@@ -6211,19 +6211,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6245,7 +6245,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6253,14 +6253,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6270,7 +6270,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6290,10 +6290,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6304,11 +6304,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6324,21 +6324,21 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Introduktion\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Operativsystemet og de forskellige komponenter tilgængelige i Mandrakelinux "</div><div class='add'>+"Operativsystemet og de forskellige komponenter tilgængelige i Mandrivalinux "</div><div class='ctx'> "distributionen vil herefter blive kaldt \"programmelprodukter\". "</div><div class='ctx'> "Programmelprodukterne inkluderer, men er ikke begrænset til: samlingen af "</div><div class='ctx'> "værktøjer, metoder, regler og dokumentation relateret til operativsystemet "</div><div class='del'>-"og de forskellige komponenter i Mandrakelinux-distributionen.\n"</div><div class='add'>+"og de forskellige komponenter i Mandrivalinux-distributionen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Licensaftale\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Læs venligst dette dokument omhyggeligt. Dette dokument er en licensaftale "</div><div class='del'>-"mellem dig og Mandrakesoft S.A., som gælder til disse programmelprodukter. "</div><div class='add'>+"mellem dig og Mandriva S.A., som gælder til disse programmelprodukter. "</div><div class='ctx'> "Ved at installere, kopiere eller bruge disse programmelprodukter accepterer "</div><div class='ctx'> "du udtrykkeligt og fuldt ud at følge denne licensaftale med dens betingelser "</div><div class='ctx'> "og regler. Hvis du er uenig i nogensomhelst del af denne licens, har du ikke "</div><div class='hunk'>@@ -6353,27 +6353,27 @@ msgstr ""</div><div class='ctx'> "2. Begrænset garanti\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Programmelprodukterne og tilhørende dokumentation leveres \"som de er\", "</div><div class='del'>-"uden nogen form for garanti, i den udstrækning lov tillader. Mandrakesoft S."</div><div class='add'>+"uden nogen form for garanti, i den udstrækning lov tillader. Mandriva S."</div><div class='ctx'> "A. vil under ingen omstændigheder efter hvad loven foreskriver være "</div><div class='ctx'> "ansvarlig for specielle, tilfældige, direkte eller indirekte tab af nogen "</div><div class='ctx'> "art (inkluderende uden begrænsninger, skader ved tab af forretning, "</div><div class='ctx'> "forstyrrelser af forretning, finansielle tab, advokatbistand, erstatninger "</div><div class='ctx'> "som resultat af en retssag eller nogen anden form for følgetab) opstået "</div><div class='ctx'> "under brugen eller mangel på samme af disse programmelprodukter, selv hvis "</div><div class='del'>-"Mandrakesoft S.A. er blevet gjort opmærksom på muligheden for eller "</div><div class='add'>+"Mandriva S.A. er blevet gjort opmærksom på muligheden for eller "</div><div class='ctx'> "indtræffelsen af sådanne skader.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "BEGRÆNSET ANSVAR MED HENSYN TIL REGLER OM BESIDDELSE ELLER BRUG AF FORBUDT "</div><div class='ctx'> "PROGRAMMEL I VISSE LANDE\n"</div><div class='ctx'> "\n"</div><div class='del'>-"I den udstrækning som loven tillader vil Mandrakesoft S.A. eller deres "</div><div class='add'>+"I den udstrækning som loven tillader vil Mandriva S.A. eller deres "</div><div class='ctx'> "distributører under ingen omstændigheder være ansvarlig for specielle, "</div><div class='ctx'> "tilfældige, direkte eller indirekte tab af nogen art (inklusive uden "</div><div class='ctx'> "begrænsninger skader ved tab af forretning, forstyrrelser af forretning, "</div><div class='ctx'> "finansielle tab, advokatbistand, erstatninger som resultat af en retssag "</div><div class='ctx'> "eller nogen anden form for tab) opstået ved besiddelse eller brug af "</div><div class='ctx'> "programmelkomponenter eller opstået ved hentning af programmelkomponenter "</div><div class='del'>-"fra et af Mandrakelinux-webstederne som er forbudt eller begrænset i visse "</div><div class='add'>+"fra et af Mandrivalinux-webstederne som er forbudt eller begrænset i visse "</div><div class='ctx'> "lande ved lokal lov. Dette begrænsede ansvar gælder, men er ikke begrænset "</div><div class='ctx'> "til, de stærke krypteringskomponenter inkluderet i programmelprodukterne.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6387,9 +6387,9 @@ msgstr ""</div><div class='ctx'> "bruge, kopiere, tilpasse eller videredistribuere komponenterne, de dækker. "</div><div class='ctx'> "Læs venligst vilkårene og betingelserne i licensaftalen for hver komponent "</div><div class='ctx'> "omhyggeligt før du bruger den. Alle spørgsmål angående en komponent bedes "</div><div class='del'>-"adresseret til komponentens forfatter og ikke til Mandrakesoft. Programmerne "</div><div class='del'>-"udviklet af Mandrakesoft S.A. bliver reguleret efter GPL-licensen. "</div><div class='del'>-"Dokumentationen skrevet af Mandrakesoft S.A. bliver reguleret efter en "</div><div class='add'>+"adresseret til komponentens forfatter og ikke til Mandriva. Programmerne "</div><div class='add'>+"udviklet af Mandriva S.A. bliver reguleret efter GPL-licensen. "</div><div class='add'>+"Dokumentationen skrevet af Mandriva S.A. bliver reguleret efter en "</div><div class='ctx'> "specifik licens. Referér venligst til dokumentationen for yderligere "</div><div class='ctx'> "detaljer.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6398,10 +6398,10 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Alle rettigheder til komponenterne i programmelproduktet tilhører deres "</div><div class='ctx'> "respektive forfattere, og er beskyttet af intellektuelle rettigheds- og "</div><div class='del'>-"ophavsretslove, gældende for programmel. Mandrakesoft S.A. forbeholder sine "</div><div class='add'>+"ophavsretslove, gældende for programmel. Mandriva S.A. forbeholder sine "</div><div class='ctx'> "rettigheder til at ændre eller tilpasse programmelprodukterne, helt eller "</div><div class='del'>-"delvist, med alle midler og til alle formål. \"Mandrake\", \"Mandrakelinux\" "</div><div class='del'>-"samt de tilhørende logoer er varemærker for Mandrakesoft S.A.  \n"</div><div class='add'>+"delvist, med alle midler og til alle formål. \"Mandriva\", \"Mandrivalinux\" "</div><div class='add'>+"samt de tilhørende logoer er varemærker for Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Styrende love\n"</div><div class='hunk'>@@ -6413,7 +6413,7 @@ msgstr ""</div><div class='ctx'> "vedrørende vilkårene i denne licens vil fortrinsvist blive løst udenfor "</div><div class='ctx'> "domstolene. Som en sidste udvej vil uenighederne blive håndteret ved den "</div><div class='ctx'> "rette domstol i Paris, Frankrig. Ved spørgsmål omkring dette dokument, "</div><div class='del'>-"kontakt venligst Mandrakesoft S.A.  \n"</div><div class='add'>+"kontakt venligst Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> # Mangler</div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -6500,7 +6500,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6508,13 +6508,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tillykke, installationen er færdig.\n"</div><div class='ctx'> "Fjern boot-mediet og tryk retur for at genstarte.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"For information om rettelser til denne udgivelse af Mandrakelinux, se Errata "</div><div class='add'>+"For information om rettelser til denne udgivelse af Mandrivalinux, se Errata "</div><div class='ctx'> "på:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6522,7 +6522,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information om konfigurering af dit system kan du finde i kapitlet om efter-"</div><div class='del'>-"installation i den Officielle Mandrakelinux Brugervejledning."</div><div class='add'>+"installation i den Officielle Mandrivalinux Brugervejledning."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6557,12 +6557,12 @@ msgstr "Går til trin `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dit system har kun få resurser. Du kan få problemer med at installere\n"</div><div class='del'>-"Mandrakelinux. Hvis dette sker, kan du prøve en tekst-baseret installation i "</div><div class='add'>+"Mandrivalinux. Hvis dette sker, kan du prøve en tekst-baseret installation i "</div><div class='ctx'> "stedet\n"</div><div class='ctx'> "Dette gøres ved at trykke 'F1' ved opstart fra cdrommen, og så skrive 'text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7102,9 +7102,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kontakter Mandrakelinux netsted for at hente listen over tilgængelige spejle"</div><div class='add'>+"Kontakter Mandrivalinux netsted for at hente listen over tilgængelige spejle"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7328,8 +7328,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux Installation %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9918,13 +9918,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall-konfigurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Dette konfigurerer en personlig brandmur for denne Mandrakelinux-maskine.\n"</div><div class='add'>+"Dette konfigurerer en personlig brandmur for denne Mandrivalinux-maskine.\n"</div><div class='ctx'> "For en stærk dedikeret brandmurs-løsning se venligst den specialiserede "</div><div class='ctx'> "MandrakeSecurity Firewall-distribution."</div><div class='ctx'> </div><div class='hunk'>@@ -13982,11 +13982,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kør Scannerdrake (Udstyr/skanner i Mandrakelinux Kontrolcenter) for at dele "</div><div class='add'>+"Kør Scannerdrake (Udstyr/skanner i Mandrivalinux Kontrolcenter) for at dele "</div><div class='ctx'> "din skanner på netværket.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -15919,33 +15919,33 @@ msgstr "Stop"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Hvad er Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Hvad er Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Velkommen til &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Velkommen til &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux er en &lt;b&gt;Linux-distribution&lt;/b&gt; som består af systemkernen, "</div><div class='add'>+"Mandrivalinux er en &lt;b&gt;Linux-distribution&lt;/b&gt; som består af systemkernen, "</div><div class='ctx'> "kaldet &lt;b&gt;operativsystemet&lt;/b&gt; (baseret på Linux-kernen) sammen med &lt;b&gt;en "</div><div class='ctx'> "masse programmer&lt;/b&gt; som opfylder alle behov som du kan forestille dig."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux er den mest &lt;b&gt;brugervenlige&lt;/b&gt; Linux-distribution i dag. Det "</div><div class='add'>+"Mandrivalinux er den mest &lt;b&gt;brugervenlige&lt;/b&gt; Linux-distribution i dag. Det "</div><div class='ctx'> "er også en af de &lt;b&gt;mest brugte&lt;/b&gt; Linux-distributioner i verden!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -15961,15 +15961,15 @@ msgstr "Velkommen til &lt;b&gt;verdenen af åben kildetekst&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux er bundet til Åben Kildettekst-modellen. Dette betyder at "</div><div class='add'>+"Mandrivalinux er bundet til Åben Kildettekst-modellen. Dette betyder at "</div><div class='ctx'> "denne nye udgave er resultatet af &lt;b&gt;samarbejdet&lt;/b&gt; mellem "</div><div class='del'>-"&lt;b&gt;Mandrakesoft's team af udviklere&lt;/b&gt; og det &lt;b&gt;verdensomspændende "</div><div class='del'>-"fællesskab&lt;/b&gt;  af Mandrakelinux-bidragsydere."</div><div class='add'>+"&lt;b&gt;Mandriva's team af udviklere&lt;/b&gt; og det &lt;b&gt;verdensomspændende "</div><div class='add'>+"fællesskab&lt;/b&gt;  af Mandrivalinux-bidragsydere."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15989,9 +15989,9 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Det meste af programmellet indeholdt i distributionen og alle Mandrakelinux-"</div><div class='add'>+"Det meste af programmellet indeholdt i distributionen og alle Mandrivalinux-"</div><div class='ctx'> "værktøjerne licensieres under &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16022,15 +16022,15 @@ msgstr "&lt;b&gt;Vær med i Fællesskabet&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux har et af de &lt;b&gt;største fællesskaber&lt;/b&gt; af brugere og "</div><div class='add'>+"Mandrivalinux har et af de &lt;b&gt;største fællesskaber&lt;/b&gt; af brugere og "</div><div class='ctx'> "udviklere. Sådan et fællesskabs rolle er meget bred, spændende fra "</div><div class='ctx'> "fejlrapportering til udviklingen af nye programmer. Fællesskabet spiller en "</div><div class='del'>-"&lt;b&gt;nøglerolle&lt;/b&gt; i Mandrakelinux-verdenen."</div><div class='add'>+"&lt;b&gt;nøglerolle&lt;/b&gt; i Mandrivalinux-verdenen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16052,11 +16052,11 @@ msgstr "&lt;b&gt;Download version&lt;/b&gt;."</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Du installerer nu &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Dette er den frie og gratis "</div><div class='del'>-"version som Mandrakesoft ønsker at holde &lt;b&gt;tilgængelig for alle&lt;/b&gt;."</div><div class='add'>+"Du installerer nu &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Dette er den frie og gratis "</div><div class='add'>+"version som Mandriva ønsker at holde &lt;b&gt;tilgængelig for alle&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16089,10 +16089,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Du vil heller ikke have adgang til &lt;b&gt;tjenester indeholdt&lt;/b&gt; i de andre "</div><div class='del'>-"Mandrakesoft produkter."</div><div class='add'>+"Mandriva produkter."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16101,8 +16101,8 @@ msgstr "&lt;b&gt;Discovery, dit første Linux-skrivebord&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Du installerer nu &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Du installerer nu &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16124,17 +16124,17 @@ msgstr "&lt;b&gt;PowerPack, Det ultimative Linux-skrivebord&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Du installerer nu &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Du installerer nu &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack er Mandrakesofts &lt;b&gt;toplinje produkt til Linux-skrivebordet&lt;/b&gt;. "</div><div class='add'>+"PowerPack er Mandrivas &lt;b&gt;toplinje produkt til Linux-skrivebordet&lt;/b&gt;. "</div><div class='ctx'> "PowerPack indeholder &lt;b&gt;tusindvis af programmer&lt;/b&gt; - alt fra det mest "</div><div class='ctx'> "populære til det mest avancerede."</div><div class='ctx'> </div><div class='hunk'>@@ -16145,8 +16145,8 @@ msgstr "&lt;b&gt;PowerPack+, Linux-løsningen for skriveborde og servere&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Du installerer nu &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;"</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Du installerer nu &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16163,22 +16163,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesofts produkter&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivas produkter&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; har udviklet et stort udvalg af &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; har udviklet et stort udvalg af &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "produkter."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux produkter er:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux produkter er:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16198,75 +16198,75 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, Linux-løsningen for skriveborde og servere."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, Mandrakelinux-løsningen for få mest ud "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, Mandrivalinux-løsningen for få mest ud "</div><div class='ctx'> "af din 64-bit processor."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesofts produkter (Nomad Produkter)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivas produkter (Nomad Produkter)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft har udviklet to produkter, som giver dig mulighed for at bruge "</div><div class='del'>-"Mandrakelinux &lt;b&gt;på enhver maskine&lt;/b&gt; og uden noget behov for faktisk at "</div><div class='add'>+"Mandriva har udviklet to produkter, som giver dig mulighed for at bruge "</div><div class='add'>+"Mandrivalinux &lt;b&gt;på enhver maskine&lt;/b&gt; og uden noget behov for faktisk at "</div><div class='ctx'> "installere det:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, en Mandrakelinux-distribution som kører udelukkende fra en "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, en Mandrivalinux-distribution som kører udelukkende fra en "</div><div class='ctx'> "opstartelig CD-ROM."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, en Mandrakelinux-distribution præinstalleret på den "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, en Mandrivalinux-distribution præinstalleret på den "</div><div class='ctx'> "ultra-kompakte “LaCie Mobile Hard Drive”."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesofts produkter (professionelle løsninger)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivas produkter (professionelle løsninger)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Nedenfor er Mandrakesoft-produkterne beregnet til at opfylde de "</div><div class='add'>+"Nedenfor er Mandriva-produkterne beregnet til at opfylde de "</div><div class='ctx'> "&lt;b&gt;professionnelle behov&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrakelinux' skrivebord for "</div><div class='add'>+"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrivalinux' skrivebord for "</div><div class='ctx'> "forretningsverdenen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrakelinux' serverløsning."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrivalinux' serverløsning."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrakelinux' sikkerhedsløsning."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrivalinux' sikkerhedsløsning."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16309,10 +16309,10 @@ msgstr "&lt;b&gt;Vælg dit foretrukne skrivebordsmiljø&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Med PowerPack vil du kunne vælge det &lt;b&gt;grafiske skrivebordsmiljø&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft har valgt &lt;b&gt;KDE&lt;/b&gt; som standard."</div><div class='add'>+"Mandriva har valgt &lt;b&gt;KDE&lt;/b&gt; som standard."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16337,10 +16337,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Med PowerPack+ vil du kunne vælge det &lt;b&gt;grafiske skrivebordsmiljø&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft har valgt &lt;b&gt;KDE&lt;/b&gt; som standard."</div><div class='add'>+"Mandriva har valgt &lt;b&gt;KDE&lt;/b&gt; som standard."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16466,10 +16466,10 @@ msgstr "&lt;b&gt;Nyd det store udvalg af programmer&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"I Mandrakelinux-menuen vil du finde applikationer som er &lt;b&gt;nemme&lt;/b&gt; at "</div><div class='add'>+"I Mandrivalinux-menuen vil du finde applikationer som er &lt;b&gt;nemme&lt;/b&gt; at "</div><div class='ctx'> "bruge til &lt;b&gt;alle dine opgaver&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16736,17 +16736,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Kontrolcenter&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Kontrolcenter&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakelinux Kontrolcenter&lt;/b&gt; er en essentiel samling af Mandrake-"</div><div class='add'>+"&lt;b&gt;Mandrivalinux Kontrolcenter&lt;/b&gt; er en essentiel samling af Mandrake-"</div><div class='ctx'> "specifikke værktøjer beregnet til at forenkle konfigurationen af din maskine,"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16770,16 +16770,16 @@ msgstr "&lt;b&gt;Modellen for Åben Kildetekst&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Som al anden edb-programmering kræver åben kildetekst-programmel &lt;b&gt;tid og "</div><div class='ctx'> "folk&lt;/b&gt; til udvikling. For at respektere filosofien i åben kildetekst "</div><div class='del'>-"sælger Mandrakesoft added-value produkter og tjenester for at &lt;b&gt;fortsat "</div><div class='del'>-"forbedre Mandrakelinux&lt;/b&gt;. Hvis du ønsker at &lt;b&gt;støtte åben kildetekst-"</div><div class='del'>-"filosofien&lt;/b&gt; og udviklingen af Mandrakelinux, så &lt;b&gt;vær sød&lt;/b&gt; at "</div><div class='add'>+"sælger Mandriva added-value produkter og tjenester for at &lt;b&gt;fortsat "</div><div class='add'>+"forbedre Mandrivalinux&lt;/b&gt;. Hvis du ønsker at &lt;b&gt;støtte åben kildetekst-"</div><div class='add'>+"filosofien&lt;/b&gt; og udviklingen af Mandrivalinux, så &lt;b&gt;vær sød&lt;/b&gt; at "</div><div class='ctx'> "overveje køb af et af vores produkter eller tjenester!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16790,10 +16790,10 @@ msgstr "&lt;b&gt;OnlineStore&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Besøg vores &lt;b&gt;e-handelsplatform&lt;/b&gt; for at lære mere om Mandrakesofts "</div><div class='add'>+"Besøg vores &lt;b&gt;e-handelsplatform&lt;/b&gt; for at lære mere om Mandrivas "</div><div class='ctx'> "produkter og tjenester."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16817,24 +16817,24 @@ msgstr "Kig forbi i dag på &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; er den &lt;b&gt;perfekte følgesvend&lt;/b&gt; til dit Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; er den &lt;b&gt;perfekte følgesvend&lt;/b&gt; til dit Mandrivalinux "</div><div class='ctx'> "produkt.."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Drag nytte af &lt;b&gt;værdifulde fordele&lt;/b&gt; ved at være med i Mandrakeclub, med:"</div><div class='add'>+"Drag nytte af &lt;b&gt;værdifulde fordele&lt;/b&gt; ved at være med i Mandriva Club, med:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16856,40 +16856,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Deltagelse i Mandrakelinux &lt;b&gt;brugerfora&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Deltagelse i Mandrivalinux &lt;b&gt;brugerfora&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t*&lt;b&gt;Tidlig og priviligeret adgang&lt;/b&gt;, før offentlige udgivelser, til "</div><div class='del'>-"Mandrakelinux-&lt;b&gt;ISO-aftryk&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux-&lt;b&gt;ISO-aftryk&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; er en ny førsteklasses tjeneste som Mandrakesoft er "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; er en ny førsteklasses tjeneste som Mandriva er "</div><div class='ctx'> "stolt af at tilbyde sine kunder!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline giver et bredt udvalg af værdifulde tjenester for &lt;b&gt;nem "</div><div class='del'>-"opdatering&lt;/b&gt; af dine Mandrakelinux-systemer:"</div><div class='add'>+"Mandriva Online giver et bredt udvalg af værdifulde tjenester for &lt;b&gt;nem "</div><div class='add'>+"opdatering&lt;/b&gt; af dine Mandrivalinux-systemer:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16913,39 +16913,39 @@ msgstr "\t* Fleksible &lt;b&gt;planlagte&lt;/b&gt; opdateringer."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='del'>-msgstr "\t* Styring af &lt;b&gt;alle dine Mandrakelinux-systemer&lt;/b&gt; via én konto."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='add'>+msgstr "\t* Styring af &lt;b&gt;alle dine Mandrivalinux-systemer&lt;/b&gt; via én konto."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Har du behov for &lt;b&gt;assistance?&lt;/b&gt; Mød Mandrakesofts tekniske eksperter på "</div><div class='add'>+"Har du behov for &lt;b&gt;assistance?&lt;/b&gt; Mød Mandrivas tekniske eksperter på "</div><div class='ctx'> "&lt;b&gt;vores tekniske kundestøtteplatform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Takket være hjælpen fra &lt;b&gt;kvalificerede Mandrakelinux-eksperter&lt;/b&gt;, så vil "</div><div class='add'>+"Takket være hjælpen fra &lt;b&gt;kvalificerede Mandrivalinux-eksperter&lt;/b&gt;, så vil "</div><div class='ctx'> "du spare en masse tid."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"For alle spørgsmål relateret til Mandrakelinux så har du muligheden for at "</div><div class='add'>+"For alle spørgsmål relateret til Mandrivalinux så har du muligheden for at "</div><div class='ctx'> "købe kundestøttehjælp på &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17243,8 +17243,8 @@ msgstr "Overvågningsværktøjer, proceskontering, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft konfigurationsprogrammer"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva konfigurationsprogrammer"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17341,8 +17341,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "VALGMULIGHEDER:\n"</div><div class='ctx'> "  --help            - udskriv denne hjælpebesked.\n"</div><div class='del'>-"  --report          - program bær være én af Mandrakelinux' værktøjer\n"</div><div class='del'>-"  --incident        - program bær være én af Mandrakelinux' værktøjer"</div><div class='add'>+"  --report          - program bær være én af Mandrivalinux' værktøjer\n"</div><div class='add'>+"  --incident        - program bær være én af Mandrivalinux' værktøjer"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17395,7 +17395,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17409,7 +17409,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux TerminalServer konfigureringsprogram\n"</div><div class='add'>+"Mandrivalinux TerminalServer konfigureringsprogram\n"</div><div class='ctx'> "--enable         : aktivér MTS\n"</div><div class='ctx'> "--disable        : deaktivér MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17466,7 +17466,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17474,7 +17474,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      spørg ikke det første bekræftelsesspørgsmål i "</div><div class='del'>-"MandrakeUpdate-tilstand\n"</div><div class='add'>+"Mandriva Update-tilstand\n"</div><div class='ctx'> "  --no-verify-rpm        efterprøv ikke pakke-signaturer\n"</div><div class='ctx'> "  --changelog-first      vís changelog før filliste i beskrivelsesvinduet\n"</div><div class='ctx'> "  --merge-all-rpmnew     foreslå at flette alle .rpmnew/.rpmsave filer fundet"</div><div class='hunk'>@@ -20243,13 +20243,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux' værktøj til fejlrapportering"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux' værktøj til fejlrapportering"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Kontrolcenter"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Kontrolcenter"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20269,8 +20269,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20314,8 +20314,8 @@ msgstr "Vejledere til konfiguration"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Vælg Mandrakesoft-værktøj:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Vælg Mandriva-værktøj:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20740,19 +20740,19 @@ msgstr "Startede med opstart"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dette grænsesnit er ikke blevet konfigureret endnu.\n"</div><div class='del'>-"Kør 'Tilføj et grænsesnit'-hjælperen fra Mandrakelinux Kontrolcentret"</div><div class='add'>+"Kør 'Tilføj et grænsesnit'-hjælperen fra Mandrivalinux Kontrolcentret"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Du har ikke konfigureret nogen internetforbindelser.\n"</div><div class='del'>-"Kør '%s'-hjælperen fra Mandrakelinux Kontrolcentret"</div><div class='add'>+"Kør '%s'-hjælperen fra Mandrivalinux Kontrolcentret"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20802,8 +20802,8 @@ msgstr "KDM (KDE Indlogningshåndterer)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux Indlogningshåndterer)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux Indlogningshåndterer)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21102,7 +21102,7 @@ msgstr "Importér"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21111,7 +21111,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 ved Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 ved Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (oprindelig version)\n"</div><div class='hunk'>@@ -21654,14 +21654,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright © 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright © 2003-2004 Mandriva.\n"</div><div class='ctx'> "Dette er frit programmel og kan redistribueres under betingelserne i GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21690,8 +21690,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux hjælpecentral"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux hjælpecentral"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25211,8 +25211,8 @@ msgstr "Ændringen er fortaget, men for at være effektiv skal du logge ud"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux' værktøj-logger"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux' værktøj-logger"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25726,7 +25726,7 @@ msgstr "Opkobling fuldført."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tilslutning mislykkedes.\n"</div><div class='ctx'> "Kontrollér konfigurationen i Mandrakes kontrolcentral."</div><div class='hunk'>@@ -26751,13 +26751,13 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ msgstr "Fejl ved åbning af %s for skrivning: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Dette er HardDrake, et Mandrakelinux-værktøj for konfigurering af "</div><div class='add'>+#~ "Dette er HardDrake, et Mandrivalinux-værktøj for konfigurering af "</div><div class='ctx'> #~ "maskinel.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt;  %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='hunk'>@@ -27187,16 +27187,16 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "Kunne ikke fjerne printeren \"%s\" fra Star Office/OpenOffice.org/GIMP."</div><div class='ctx'> #~ "org."</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Congratulations for choosing Mandrakelinux!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Tillykke med valget af Mandrakelinux!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Congratulations for choosing Mandrivalinux!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Tillykke med valget af Mandrivalinux!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux operating system and its many applications is the "</div><div class='del'>-#~ "result of collaborative efforts between Mandrakesoft developers and "</div><div class='del'>-#~ "Mandrakelinux contributors throughout the world."</div><div class='add'>+#~ "Your new Mandrivalinux operating system and its many applications is the "</div><div class='add'>+#~ "result of collaborative efforts between Mandriva developers and "</div><div class='add'>+#~ "Mandrivalinux contributors throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Dit nye Mandrakelinux-operativsystem og dets mange programmer er "</div><div class='del'>-#~ "resultatet af samarbejde mellem Mandrakesoft-udviklere og Mandrakelinux-"</div><div class='add'>+#~ "Dit nye Mandrivalinux-operativsystem og dets mange programmer er "</div><div class='add'>+#~ "resultatet af samarbejde mellem Mandriva-udviklere og Mandrivalinux-"</div><div class='ctx'> #~ "bidragsydere fra hele verden."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27296,27 +27296,27 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Vís og redigér billeder og fotografier med &lt;b&gt;GQview&lt;/b&gt; og &lt;b&gt;Gimp&lt;/b&gt;!"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Become a &lt;b&gt;Mandrakeclub&lt;/b&gt; member!"</div><div class='del'>-#~ msgstr "Bliv medlem af &lt;b&gt;Mandrakeclub&lt;/b&gt;!"</div><div class='add'>+#~ msgid "Become a &lt;b&gt;Mandriva Club&lt;/b&gt; member!"</div><div class='add'>+#~ msgstr "Bliv medlem af &lt;b&gt;Mandriva Club&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Take advantage of valuable benefits, products and services by joining "</div><div class='del'>-#~ "Mandrakeclub, such as:"</div><div class='add'>+#~ "Mandriva Club, such as:"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Drag nytte af værdifulde fordele, produkter og tjenester ved at være med "</div><div class='del'>-#~ "i Mandrake Club, med:"</div><div class='add'>+#~ "i Mandriva Club, med:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Full access to commercial applications"</div><div class='ctx'> #~ msgstr "\t* Fuld adgang til kommercielle programmer"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"</div><div class='add'>+#~ "\t* Special download mirror list exclusively for Mandriva Club Members"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Speciel liste over filhentningsspejle, udelukkende for Mandrakeclub-"</div><div class='add'>+#~ "\t* Speciel liste over filhentningsspejle, udelukkende for Mandriva Club-"</div><div class='ctx'> #~ "medlemmer"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Voting for software to put in Mandrakelinux"</div><div class='del'>-#~ msgstr "\t* Stem på programmel som skal være med i Mandrakelinux"</div><div class='add'>+#~ msgid "\t* Voting for software to put in Mandrivalinux"</div><div class='add'>+#~ msgstr "\t* Stem på programmel som skal være med i Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Plus much more"</div><div class='ctx'> #~ msgstr "\t* Plus meget mere"</div><div class='hunk'>@@ -27328,14 +27328,14 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ msgid "Do you require assistance?"</div><div class='ctx'> #~ msgstr "Har du brug for hjælp?"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt; is the primary source for technical support."</div><div class='del'>-#~ msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt; er den bedste kilde til teknisk hjælp."</div><div class='add'>+#~ msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt; is the primary source for technical support."</div><div class='add'>+#~ msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt; er den bedste kilde til teknisk hjælp."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "If you have Linux questions, subscribe to Mandrakeexpert at &lt;b&gt;www."</div><div class='add'>+#~ "If you have Linux questions, subscribe to Mandriva Expert at &lt;b&gt;www."</div><div class='ctx'> #~ "mandrakeexpert.com&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Hvis du har Linux-spørgsmål, så abonnér på Mandrakeexpert hos &lt;b&gt;www."</div><div class='add'>+#~ "Hvis du har Linux-spørgsmål, så abonnér på Mandriva Expert hos &lt;b&gt;www."</div><div class='ctx'> #~ "mandrakeexpert.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27353,23 +27353,23 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "&lt;b&gt;www.mandrake-linux.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "</div><div class='add'>+#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "</div><div class='ctx'> #~ "the latest versions of the most popular Open Source applications."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinux indeholder de berømte grafiske skriveborde KDE og GNOME, "</div><div class='add'>+#~ "Mandrivalinux indeholder de berømte grafiske skriveborde KDE og GNOME, "</div><div class='ctx'> #~ "plus den nyeste version af de mest populære Frit Programmel-applikationer."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "</div><div class='add'>+#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "</div><div class='ctx'> #~ "to install and easy to use Linux distribution."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinux er videnom kendt for at være den mest brugervenlige, "</div><div class='add'>+#~ "Mandrivalinux er videnom kendt for at være den mest brugervenlige, "</div><div class='ctx'> #~ "nemmeste at installere og letteste at bruge Linux-distribution, som "</div><div class='ctx'> #~ "findes."</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='add'>+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Find ud af mere om vor Mandrakelinux på en opstartelig CD med "</div><div class='add'>+#~ "\t* Find ud af mere om vor Mandrivalinux på en opstartelig CD med "</div><div class='ctx'> #~ "Mandrakemove"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27417,12 +27417,12 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "&lt;b&gt;MandrakeClustering&lt;/b&gt;: the power and speed of a Linux cluster "</div><div class='ctx'> #~ "combined with the stability and easy-of-use of the world-famous "</div><div class='del'>-#~ "Mandrakelinux distribution. A unique blend for incomparable HPC "</div><div class='add'>+#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "</div><div class='ctx'> #~ "performance."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "&lt;b&gt;MandrakeClustering&lt;/b&gt;: styrken og hastigheden af en Linux-klynge "</div><div class='ctx'> #~ "kombineret med stabiliteten og brugervenligheden af den verdensberømte "</div><div class='del'>-#~ "Mandrakelinux-distribution. En unik sammensætning for enestående HPC-"</div><div class='add'>+#~ "Mandrivalinux-distribution. En unik sammensætning for enestående HPC-"</div><div class='ctx'> #~ "ydelse."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27434,14 +27434,14 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "problemer, fra standard til professionel kundestøtte, pakker fra 1 til 50 "</div><div class='ctx'> #~ "tilfælder, vælg den som møder dine behov bedst!"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Become a Mandrakeclub member!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Bliv medlem af Mandrakeclub!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Become a Mandriva Club member!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Bliv medlem af Mandriva Club!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Do you require assistance?&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Har du brug for hjælp?&lt;/b&gt;"</div><div class='ctx'> </div><div class='del'>-#~ msgid "This is the Mandrakelinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='del'>-#~ msgstr "Dette er Mandrakelinux &lt;b&gt;Download Edition&lt;/b&gt;."</div><div class='add'>+#~ msgid "This is the Mandrivalinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='add'>+#~ msgstr "Dette er Mandrivalinux &lt;b&gt;Download Edition&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "The free download version does not include commercial software, and "</div><div class='hunk'>@@ -27453,12 +27453,12 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "RTC) og skærmkort (såsom ATI® og NVIDIA®)."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux distribution and its many applications are the "</div><div class='del'>-#~ "result of collaborative efforts between Mandrakesoft developers and "</div><div class='del'>-#~ "Mandrakelinux contributors throughout the world."</div><div class='add'>+#~ "Your new Mandrivalinux distribution and its many applications are the "</div><div class='add'>+#~ "result of collaborative efforts between Mandriva developers and "</div><div class='add'>+#~ "Mandrivalinux contributors throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Din nye Mandrakelinux-distribution og dets mange programmer er resultatet "</div><div class='del'>-#~ "af samarbejde mellem Mandrakesoft-udviklere og Mandrakelinux-bidragsydere "</div><div class='add'>+#~ "Din nye Mandrivalinux-distribution og dets mange programmer er resultatet "</div><div class='add'>+#~ "af samarbejde mellem Mandriva-udviklere og Mandrivalinux-bidragsydere "</div><div class='ctx'> #~ "rundtom i hele verden."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;PowerPack+&lt;/b&gt;"</div><div class='hunk'>@@ -27474,25 +27474,25 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "et stort udvalg af serverapplikationer i verdensklasse."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "It is the only Mandrakelinux product that includes the groupware solution."</div><div class='add'>+#~ "It is the only Mandrivalinux product that includes the groupware solution."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Det er den eneste Mandrakelinux-produkt som inkluderer "</div><div class='add'>+#~ "Det er den eneste Mandrivalinux-produkt som inkluderer "</div><div class='ctx'> #~ "gruppevareløsningen."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "When you log into your Mandrakelinux system for the first time, you can "</div><div class='add'>+#~ "When you log into your Mandrivalinux system for the first time, you can "</div><div class='ctx'> #~ "choose between several popular graphical desktops environments, "</div><div class='ctx'> #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Når du logger ind på dit Mandrakelinux-system for første gang, så kan du "</div><div class='add'>+#~ "Når du logger ind på dit Mandrivalinux-system for første gang, så kan du "</div><div class='ctx'> #~ "vælge mellem en række populære grafiske skrivebordsmiljøer, inklusive "</div><div class='ctx'> #~ "KDE, GNOME, WindowMaker, IceWM og andre."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "</div><div class='add'>+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "</div><div class='ctx'> #~ "of your tasks:"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "I Mandrakelinux-menuen vil du finde applikationer som er nemme at bruge "</div><div class='add'>+#~ "I Mandrivalinux-menuen vil du finde applikationer som er nemme at bruge "</div><div class='ctx'> #~ "til alle dine opgaver:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27536,12 +27536,12 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ msgstr "\t* Addressebog (server og klient)"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux distribution is the result of collaborative "</div><div class='del'>-#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "</div><div class='add'>+#~ "Your new Mandrivalinux distribution is the result of collaborative "</div><div class='add'>+#~ "efforts between Mandriva developers and Mandrivalinux contributors "</div><div class='ctx'> #~ "throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Din nye Mandrakelinux-distribution er et resultat af samarbejde mellem "</div><div class='del'>-#~ "Mandrakesoft-udviklere og Mandrakelinux-bidragsydere rundt omkring i hele "</div><div class='add'>+#~ "Din nye Mandrivalinux-distribution er et resultat af samarbejde mellem "</div><div class='add'>+#~ "Mandriva-udviklere og Mandrivalinux-bidragsydere rundt omkring i hele "</div><div class='ctx'> #~ "verden."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27610,13 +27610,13 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Before continuing, you should carefully read the terms of the license. "</div><div class='ctx'> #~ "It\n"</div><div class='del'>-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "</div><div class='add'>+#~ "covers the entire Mandrivalinux distribution. If you do agree with all "</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"</div><div class='ctx'> #~ "will reboot your computer."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Før du går videre bør du læse betingelserne i licensen omhyggeligt.  Den "</div><div class='del'>-#~ "omfatter hele Mandrakelinux distributionen. Hvis du er enig i alle "</div><div class='add'>+#~ "omfatter hele Mandrivalinux distributionen. Hvis du er enig i alle "</div><div class='ctx'> #~ "betingelserne i den, så klik på '%s'-boksen. Hvis ikke, så vil klikning "</div><div class='ctx'> #~ "på \"%s\"-knappen genstarte din maskine."</div><div class='ctx'> </div><div class='hunk'>@@ -27718,25 +27718,25 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "facilitet, så afmarkér boksen med '%s'."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+#~ "The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> #~ "selected package is located on another CD-ROM, DrakX will eject the "</div><div class='ctx'> #~ "current\n"</div><div class='ctx'> #~ "CD and ask you to insert the correct CD as required."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinux installationen bliver distribueret på flere cdrom-er. Hvis "</div><div class='add'>+#~ "Mandrivalinux installationen bliver distribueret på flere cdrom-er. Hvis "</div><div class='ctx'> #~ "en valgt pakke ligger på en anden cdrom, vil DrakX udskyde den nuværende "</div><div class='ctx'> #~ "cd og bede dig om at isætte den rigtige CD, om nødvendigt."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "It is now time to specify which programs you wish to install on your\n"</div><div class='del'>-#~ "system. There are thousands of packages available for Mandrakelinux, and\n"</div><div class='add'>+#~ "system. There are thousands of packages available for Mandrivalinux, and\n"</div><div class='ctx'> #~ "to make it simpler to manage the packages have been placed into groups "</div><div class='ctx'> #~ "of\n"</div><div class='ctx'> #~ "similar applications.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Packages are sorted into groups corresponding to a particular use of "</div><div class='ctx'> #~ "your\n"</div><div class='del'>-#~ "machine. Mandrakelinux sorts packages groups in four categories. You can\n"</div><div class='add'>+#~ "machine. Mandrivalinux sorts packages groups in four categories. You can\n"</div><div class='ctx'> #~ "mix and match applications from the various categories, so a\n"</div><div class='ctx'> #~ "``Workstation'' installation can still have applications from the\n"</div><div class='ctx'> #~ "``Development'' category installed.\n"</div><div class='hunk'>@@ -27789,12 +27789,12 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "updating an existing system."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Det er nu tid til at angive hvilke pakker du vil installere på dit "</div><div class='del'>-#~ "system. Der er tusindvis af pakker til dit Mandrakelinux system, og for "</div><div class='add'>+#~ "system. Der er tusindvis af pakker til dit Mandrivalinux system, og for "</div><div class='ctx'> #~ "at gøre det nemmere at håndtere dem er pakker blevet placeret i grupper "</div><div class='ctx'> #~ "af lignende programmer.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Pakkerne er ordnet i grupper svarende til en bestemt anvendelse af din "</div><div class='del'>-#~ "maskine. Mandrakelinux opdeler pakkegrupper i fire kategorier. Du kan "</div><div class='add'>+#~ "maskine. Mandrivalinux opdeler pakkegrupper i fire kategorier. Du kan "</div><div class='ctx'> #~ "vælge og vrage programmer fra de forskellige grupper, så en installation "</div><div class='ctx'> #~ "af 'Arbejdsstation' kan også have programmer fra 'Udvikling'-kategorien "</div><div class='ctx'> #~ "installeret.\n"</div><div class='hunk'>@@ -27852,11 +27852,11 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "chose the individual package or because it was part of a group of "</div><div class='ctx'> #~ "packages,\n"</div><div class='ctx'> #~ "you will be asked to confirm that you really want those servers to be\n"</div><div class='del'>-#~ "installed. By default Mandrakelinux will automatically start any "</div><div class='add'>+#~ "installed. By default Mandrivalinux will automatically start any "</div><div class='ctx'> #~ "installed\n"</div><div class='ctx'> #~ "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> #~ "the time the distribution was shipped, it is entirely possible that that\n"</div><div class='del'>-#~ "security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+#~ "security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> #~ "finalized. If you do not know what a particular service is supposed to "</div><div class='ctx'> #~ "do\n"</div><div class='ctx'> #~ "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"</div><div class='hunk'>@@ -27894,11 +27894,11 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "!! Når en server-pakke er blevet valgt, enten fordi du specielt valgte "</div><div class='ctx'> #~ "den individuelle pakke, eller fordi den var en del af en gruppe af "</div><div class='ctx'> #~ "pakker, vil du blive spurgt om at bekræfte at du virkelig ønsker at "</div><div class='del'>-#~ "installere disse servere. Som standard under Mandrakelinux bliver "</div><div class='add'>+#~ "installere disse servere. Som standard under Mandrivalinux bliver "</div><div class='ctx'> #~ "installerede servere startet op ved opstart af maskinen. Selvom de er "</div><div class='ctx'> #~ "sikre og ikke har nogen kendte problemer på udgivelsestidspunktet for "</div><div class='ctx'> #~ "distributionen, er det absolut muligt at sikkerhedshuller blev opdaget "</div><div class='del'>-#~ "efter at denne version af Mandrakelinux blev færdiggjort. Hvis du ikke "</div><div class='add'>+#~ "efter at denne version af Mandrivalinux blev færdiggjort. Hvis du ikke "</div><div class='ctx'> #~ "véd hvad en bestemt tjeneste vil gøre eller hvorfor den skal installeres, "</div><div class='ctx'> #~ "så klik '%s' her. Et klik med '%s' her vil installere de nævnte servere "</div><div class='ctx'> #~ "og de vil som standard blive startet automatisk under opstarten!!\n"</div><div class='hunk'>@@ -27922,7 +27922,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "You will now set up your Internet/network connection. If you wish to\n"</div><div class='ctx'> #~ "connect your computer to the Internet or to a local network, click \"%s"</div><div class='ctx'> #~ "\".\n"</div><div class='del'>-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"</div><div class='add'>+#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"</div><div class='ctx'> #~ "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"</div><div class='ctx'> #~ "configure the network, or to do it later, in which case clicking the \"%s"</div><div class='ctx'> #~ "\"\n"</div><div class='hunk'>@@ -27943,7 +27943,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "modems\n"</div><div class='ctx'> #~ "that require additional software to work compared to Normal modems. Some "</div><div class='ctx'> #~ "of\n"</div><div class='del'>-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"</div><div class='add'>+#~ "those modems actually work under Mandrivalinux, some others do not. You\n"</div><div class='ctx'> #~ "can consult the list of supported modems at LinModems.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You can consult the ``Starter Guide'' chapter about Internet connections\n"</div><div class='hunk'>@@ -27954,7 +27954,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "Du vil nu kunne opsætte din internet- eller netværksopkobling. Hvis du "</div><div class='ctx'> #~ "ønsker at forbinde din maskine til internettet eller til et lokalnetværk "</div><div class='ctx'> #~ "så klik på '%s'.\n"</div><div class='del'>-#~ "Mandrakelinux vil prøve at automatisk finde netværksenheder og modemer. "</div><div class='add'>+#~ "Mandrivalinux vil prøve at automatisk finde netværksenheder og modemer. "</div><div class='ctx'> #~ "Hvis denne søgning mislykkes så fjern markeringen i boksen '%s'. Du kan "</div><div class='ctx'> #~ "også vælge at ikke konfigurere netværket, eller gøre det senere; i så "</div><div class='ctx'> #~ "tilfælde vil klik på '%s'-knappen føre dig til næste trin.\n"</div><div class='hunk'>@@ -28089,7 +28089,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "X (for X Window System) is the heart of the GNU/Linux graphical "</div><div class='ctx'> #~ "interface\n"</div><div class='ctx'> #~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-#~ "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You will be presented with a list of different parameters to change to "</div><div class='ctx'> #~ "get\n"</div><div class='hunk'>@@ -28152,7 +28152,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "X (for X Window System) er hjertet af GNU/Linux' grafiske grænseflade som "</div><div class='ctx'> #~ "alle de grafiske miljøer (KDE, GNOME, AfterStep, WindowMaker, mv.) der "</div><div class='del'>-#~ "kommer sammen med Mandrakelinux afhænger af.\n"</div><div class='add'>+#~ "kommer sammen med Mandrivalinux afhænger af.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Du vil blive vist en liste med forskellige parametre der kan ændres for "</div><div class='ctx'> #~ "at få den bedst mulige grafiske fremvisning:\n"</div><div class='hunk'>@@ -28275,7 +28275,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "have to partition the drive. Basically, partitioning a hard drive "</div><div class='ctx'> #~ "consists\n"</div><div class='ctx'> #~ "of logically dividing it to create the space needed to install your new\n"</div><div class='del'>-#~ "Mandrakelinux system.\n"</div><div class='add'>+#~ "Mandrivalinux system.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> #~ "and can lead to lost data if there is an existing operating system "</div><div class='hunk'>@@ -28314,7 +28314,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> #~ "data, provided you have previously defragmented the Windows partition.\n"</div><div class='ctx'> #~ "Backing up your data is strongly recommended.. Using this option is\n"</div><div class='del'>-#~ "recommended if you want to use both Mandrakelinux and Microsoft Windows "</div><div class='add'>+#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "</div><div class='ctx'> #~ "on\n"</div><div class='ctx'> #~ "the same computer.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28324,7 +28324,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "Windows to store your data or to install new software.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": if you want to delete all data and all partitions present on\n"</div><div class='del'>-#~ "your hard drive and replace them with your new Mandrakelinux system,\n"</div><div class='add'>+#~ "your hard drive and replace them with your new Mandrivalinux system,\n"</div><div class='ctx'> #~ "choose this option. Be careful, because you will not be able to undo "</div><div class='ctx'> #~ "your\n"</div><div class='ctx'> #~ "choice after you confirm.\n"</div><div class='hunk'>@@ -28349,11 +28349,11 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "refer to the ``Managing Your Partitions'' section in the ``Starter "</div><div class='ctx'> #~ "Guide''."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Nu skal du vælge hvor på din harddisk du vil installere dit Mandrakelinux-"</div><div class='add'>+#~ "Nu skal du vælge hvor på din harddisk du vil installere dit Mandrivalinux-"</div><div class='ctx'> #~ "operativsystem. Hvis disken er tom eller et eksisterende operativsystem "</div><div class='ctx'> #~ "bruger alt pladsen på den, bliver du nødt til at partitionere drevet. "</div><div class='ctx'> #~ "Partitionering vil sige at diskdrevet opdeles i logiske dele for at lave "</div><div class='del'>-#~ "den plads der behøves til at installere dit nye Mandrakelinux-system.\n"</div><div class='add'>+#~ "den plads der behøves til at installere dit nye Mandrivalinux-system.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Da partitioneringen af en disk normalt ikke kan fortrydes og kan føre til "</div><div class='ctx'> #~ "tab af data, hvis der allerede er et eksisterende operativsystem "</div><div class='hunk'>@@ -28381,7 +28381,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "Windows-FAT- eller NTFS-partition. Størrelsesændringen kan fortages uden "</div><div class='ctx'> #~ "tab af data, hvis du i forvejen har defragmenteret Windows-partitionen. "</div><div class='ctx'> #~ "Det anbefales på det kraftigste at du laver en sikkerhedskopi først. "</div><div class='del'>-#~ "Denne mulighed anbefales hvis du vil bruge både Mandrakelinux og "</div><div class='add'>+#~ "Denne mulighed anbefales hvis du vil bruge både Mandrivalinux og "</div><div class='ctx'> #~ "Microsoft Windows på samme maskine.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "  Før du vælger denne løsning, bør du forstå at størrelsen på din "</div><div class='hunk'>@@ -28390,7 +28390,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "eller installere nyt programmel.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * '%s': hvis du vil slette alle data på alle partitioner på denne disk "</div><div class='del'>-#~ "og erstatte dem med dit nye Mandrakelinux-system, kan du vælge denne "</div><div class='add'>+#~ "og erstatte dem med dit nye Mandrivalinux-system, kan du vælge denne "</div><div class='ctx'> #~ "mulighed. Vær forsigtig, for du vil ikke være i stand til at fortryde "</div><div class='ctx'> #~ "dine ændringer efter at du har sagt ja.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28500,7 +28500,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "Click on \"%s\" when you are ready to format the partitions.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-#~ "Mandrakelinux operating system installation.\n"</div><div class='add'>+#~ "Mandrivalinux operating system installation.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click on \"%s\" if you wish to select partitions that will be checked "</div><div class='ctx'> #~ "for\n"</div><div class='hunk'>@@ -28526,13 +28526,13 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "Klik på '%s' når du er klar til at formatere partitionerne.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Klik på '%s' hvis du ønsker at vælge andre partitioner til at installere "</div><div class='del'>-#~ "dit nye Mandrakelinux operativsystem.\n"</div><div class='add'>+#~ "dit nye Mandrivalinux operativsystem.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Klik på '%s' for at vælge partitioner som du ønsker at tjekke for dårlige "</div><div class='ctx'> #~ "blokke."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "At the time you are installing Mandrakelinux, it is likely that some\n"</div><div class='add'>+#~ "At the time you are installing Mandrivalinux, it is likely that some\n"</div><div class='ctx'> #~ "packages will have been updated since the initial release. Bugs may have\n"</div><div class='ctx'> #~ "been fixed, security issues resolved. To allow you to benefit from these\n"</div><div class='ctx'> #~ "updates, you are now able to download them from the Internet. Check \"%s"</div><div class='hunk'>@@ -28547,7 +28547,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "selected package(s), or \"%s\" to abort."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "På det tidspunkt hvor du installerer Mandrakelinux er det sandsynligt at "</div><div class='add'>+#~ "På det tidspunkt hvor du installerer Mandrivalinux er det sandsynligt at "</div><div class='ctx'> #~ "nogen af pakkerne er blevet opdaterede siden den oprindelige udgivelse. "</div><div class='ctx'> #~ "Fejl er måske blevet rettet, og sikkerhedsproblemer måske løst. Det er nu "</div><div class='ctx'> #~ "muligt for dig at hente disse ned fra internettet for at disse "</div><div class='hunk'>@@ -28611,7 +28611,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "DrakX now needs to know if you want to perform a new install or an "</div><div class='ctx'> #~ "upgrade\n"</div><div class='del'>-#~ "of an existing Mandrakelinux system:\n"</div><div class='add'>+#~ "of an existing Mandrivalinux system:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": For the most part, this completely wipes out the old system. "</div><div class='ctx'> #~ "If\n"</div><div class='hunk'>@@ -28623,22 +28623,22 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "written.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": this installation class allows you to update the packages\n"</div><div class='del'>-#~ "currently installed on your Mandrakelinux system. Your current\n"</div><div class='add'>+#~ "currently installed on your Mandrivalinux system. Your current\n"</div><div class='ctx'> #~ "partitioning scheme and user data is not altered. Most of other\n"</div><div class='ctx'> #~ "configuration steps remain available, similar to a standard "</div><div class='ctx'> #~ "installation.\n"</div><div class='ctx'> #~ "\n"</div><div class='del'>-#~ "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> #~ "running version \"8.1\" or later. Performing an Upgrade on versions "</div><div class='ctx'> #~ "prior\n"</div><div class='del'>-#~ "to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+#~ "to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Dette trin bliver kun aktiveret hvis der bliver fundet en eksisterende\n"</div><div class='ctx'> #~ "GNU/Linux partition på din maskine.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "DrakX skal nu vide om du vil udføre en ny installation eller en "</div><div class='ctx'> #~ "opgradering\n"</div><div class='del'>-#~ "af et eksisterende Mandrakelinux-system.\n"</div><div class='add'>+#~ "af et eksisterende Mandrivalinux-system.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": Dette vil stort sét slette hele det gamle system. Hvis du "</div><div class='ctx'> #~ "ønsker at ændre hvordan diskene bliver partitioneret, eller ændre på "</div><div class='hunk'>@@ -28647,14 +28647,14 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "blive overskrevne. \n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": Denne installationsklasse lader dig opgradere pakkene som er "</div><div class='del'>-#~ "installeret på dit nuværende Mandrakelinux-system. Din nuværende "</div><div class='add'>+#~ "installeret på dit nuværende Mandrivalinux-system. Din nuværende "</div><div class='ctx'> #~ "partitionsopsætning og brugerdata bliver ikke berørt. De fleste andre "</div><div class='ctx'> #~ "konfigurationstrin forbliver tilgængelige, i lighed med en "</div><div class='ctx'> #~ "standardinstallation.\n"</div><div class='ctx'> #~ "\n"</div><div class='del'>-#~ "\"Opgradér\"-valget bør fungere på Mandrakelinux-systemer som kører "</div><div class='add'>+#~ "\"Opgradér\"-valget bør fungere på Mandrivalinux-systemer som kører "</div><div class='ctx'> #~ "version 8.1 eller nyere. Udførelse af Opgradér på versioner tidligere end "</div><div class='del'>-#~ "Mandrakelinux 8.1 er ikke anbefalet."</div><div class='add'>+#~ "Mandrivalinux 8.1 er ikke anbefalet."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Depending on the language you chose in section , DrakX will "</div><div class='hunk'>@@ -28714,7 +28714,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "About UTF-8 (unicode) support: Unicode is a new character encoding meant "</div><div class='ctx'> #~ "to\n"</div><div class='ctx'> #~ "cover all existing languages. Though full support for it in GNU/Linux is\n"</div><div class='del'>-#~ "still under development. For that reason, Mandrakelinux will be using it\n"</div><div class='add'>+#~ "still under development. For that reason, Mandrivalinux will be using it\n"</div><div class='ctx'> #~ "or not depending on the user choices:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * If you choose a languages with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -28963,7 +28963,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "checking this box.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"</div><div class='del'>-#~ "\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"</div><div class='add'>+#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"</div><div class='ctx'> #~ "system! Be sure you know what you are doing before changing any of the\n"</div><div class='ctx'> #~ "options. !!\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -29001,7 +29001,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Vær opmærksom på at hvis du vælger ikke at installere en opstartsindlæser "</div><div class='ctx'> #~ "(ved at vælge '%s'), skal du være sikker på at du har en anden måde at "</div><div class='del'>-#~ "starte dit Mandrakelinux-system op på! Vær sikker på hvad du gør hvis du "</div><div class='add'>+#~ "starte dit Mandrivalinux-system op på! Vær sikker på hvad du gør hvis du "</div><div class='ctx'> #~ "ændrer nogen af tilvalgene her!\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Et klik på '%s'-knappen i denne dialog vil tilbyde avancerede muligheder "</div><div class='hunk'>@@ -29094,7 +29094,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Now, it's time to select a printing system for your computer. Other OSs "</div><div class='ctx'> #~ "may\n"</div><div class='del'>-#~ "offer you one, but Mandrakelinux offers two. Each of the printing "</div><div class='add'>+#~ "offer you one, but Mandrivalinux offers two. Each of the printing "</div><div class='ctx'> #~ "systems\n"</div><div class='ctx'> #~ "is best suited to particular types of configuration.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -29628,10 +29628,10 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "værktøjer til at forenkle konfigurationen af din maskine,"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='add'>+#~ "Find all Mandriva products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='ctx'> #~ "our full service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Find alle Mandrakesoft-produkter og -tjenester på &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='add'>+#~ "Find alle Mandriva-produkter og -tjenester på &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='ctx'> #~ "vor fuldstændige e-handelsplatform."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "Become a &lt;b&gt;MandrakeClub&lt;/b&gt; member!"</div><div class='hunk'>@@ -29642,7 +29642,7 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "MandrakeClub, such as:"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Drag nytte af værdifulde fordele, produkter og tjenester ved at være med "</div><div class='del'>-#~ "i Mandrake Club, med:"</div><div class='add'>+#~ "i Mandriva Club, med:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "\t* Special download mirror list exclusively for MandrakeClub Members"</div><div class='hunk'>@@ -29653,26 +29653,26 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ msgid "\t* Special discounts for products and services at MandrakeStore"</div><div class='ctx'> #~ msgstr "\t* Specielle rabatter for produkter og tjenester hos MandrakeStore"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with &lt;b&gt;MandrakeMove&lt;/b&gt;"</div><div class='add'>+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with &lt;b&gt;Mandriva Move&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Find ud af mere om vor Mandrakelinux på en opstartelig CD med "</div><div class='del'>-#~ "MandrakeMove"</div><div class='add'>+#~ "\t* Find ud af mere om vor Mandrivalinux på en opstartelig CD med "</div><div class='add'>+#~ "Mandriva Move"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products at &lt;b&gt;MandrakeStore&lt;/b&gt; -- our full "</div><div class='add'>+#~ "Find all Mandriva products at &lt;b&gt;MandrakeStore&lt;/b&gt; -- our full "</div><div class='ctx'> #~ "service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Find alle Mandrakesoft-produkter hos &lt;b&gt;MandrakeStore&lt;/b&gt; - vores "</div><div class='add'>+#~ "Find alle Mandriva-produkter hos &lt;b&gt;MandrakeStore&lt;/b&gt; - vores "</div><div class='ctx'> #~ "fuldstændige e-handelplatform."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Become a MandrakeClub member!&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Bliv medlem af MandrakeClub!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "</div><div class='add'>+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "</div><div class='ctx'> #~ "tasks:"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "I Mandrakelinux-menuen vil du finde nemme applikationer for alle opgaver:"</div><div class='add'>+#~ "I Mandrivalinux-menuen vil du finde nemme applikationer for alle opgaver:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "\t* Take charge of your personal data with the integrated personal "</div><div class='hunk'>@@ -29709,8 +29709,8 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> #~ "  --report          - program bær være én af Mandrakes værktøjer\n"</div><div class='ctx'> #~ "  --incident        - program bær være én af Mandrakes værktøjer"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "This interface has not been configured yet.\n"</div><div class='hunk'>@@ -29830,10 +29830,10 @@ msgstr "Installation mislykkedes"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Take advantage of valuable benefits, products and services by joining "</div><div class='del'>-#~ "Mandrake Club, such as:"</div><div class='add'>+#~ "Mandriva Club, such as:"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Drag nytte af værdifulde fordele, produkter og tjenester ved at være med "</div><div class='del'>-#~ "i Mandrake Club, med:"</div><div class='add'>+#~ "i Mandriva Club, med:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "TCP/IP"</div><div class='ctx'> #~ msgstr "TCP/IP"</div><div class='head'>diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po<br/>index e0cb61ed4..ab646b84e 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/de.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/de.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/de.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/de.po</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> # translation of de.po to Deutsch</div><div class='ctx'> # translation of DrakX-de.po to german</div><div class='ctx'> # german translation of the MandrakeInstaller.</div><div class='del'>-# Copyright (C) 2000-2003 Mandrakesoft S.A.</div><div class='add'>+# Copyright (C) 2000-2003 Mandriva S.A.</div><div class='ctx'> # Stefan Siegel &lt;siegel@linux-mandrake.com&gt;, 2000, 2001, 2002, 2003.</div><div class='ctx'> # Sebastian Deutscher &lt;sebastian_deutscher@web.de&gt;, 2003,2004.</div><div class='ctx'> # Gerhard Ortner &lt;gerhard.ortner@aon.at&gt;, 2003, 2004.</div><div class='hunk'>@@ -80,14 +80,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Der Schreibschutz des USB-Sticks scheint aktiv zu sein, aber das sichere\n"</div><div class='ctx'> "Entfernen ist jetzt nicht möglich.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Starten Sie den Rechner neu, entfernen Sie den USB-Stick, deaktivieren Sie\n"</div><div class='del'>-"den Schreibschutz und starten Sie Mandrake Move erneut."</div><div class='add'>+"den Schreibschutz und starten Sie Mandriva Move erneut."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -105,7 +105,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ihr USB-Stick enthält keine gültige Windows(FAT)-Partition.\n"</div><div class='hunk'>@@ -116,14 +116,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Sie können auch ohne einen USB-Stick weitermachen - \n"</div><div class='del'>-"Sie können dann Mandrake Move immernoch als normales\n"</div><div class='add'>+"Sie können dann Mandriva Move immernoch als normales\n"</div><div class='ctx'> "Mandrake Betriebssystem nutzen."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -131,19 +131,19 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Es wurde kein USB-Stick an Ihrem System gefunden.\n"</div><div class='ctx'> "Wenn Sie jetzt einen USB-Stick anschließen, kann\n"</div><div class='del'>-"Mandrake Move transparent die Daten in Ihrem Persönlichen\n"</div><div class='add'>+"Mandriva Move transparent die Daten in Ihrem Persönlichen\n"</div><div class='ctx'> "Verzeichnis und die systemweite Konfiguration speichern.\n"</div><div class='ctx'> "Diese stehen dann beim nächsten Booten zur Verfügung.\n"</div><div class='ctx'> "Wenn Sie jetzt einen USB-Stick anschließen, warten Sie bitte\n"</div><div class='ctx'> "mehrere Sekunden, bevor sie die Erkennung nochmals\n"</div><div class='ctx'> "starten.\n"</div><div class='ctx'> "Sie können auch ohne einen USB-Stick weitermachen - \n"</div><div class='del'>-"Sie können dann Mandrake Move immernoch als normales\n"</div><div class='add'>+"Sie können dann Mandriva Move immernoch als normales\n"</div><div class='ctx'> "Mandrake Betriebssystem nutzen."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -270,7 +270,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -286,7 +286,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Das kann durch defekte System-Konfigurations-Dateien\n"</div><div class='ctx'> "auf dem USB-Stick passieren. Entfernen Sie die Dateien\n"</div><div class='del'>-"und starten Sie Mandrake Move neu. Um das zu machen,\n"</div><div class='add'>+"und starten Sie Mandriva Move neu. Um das zu machen,\n"</div><div class='ctx'> "klicken Sie auf die entsprechende Schaltfläche.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1328,11 +1328,11 @@ msgstr "Sprachauswahl"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux unterstützt verschiedene Sprachen. Wählen\n"</div><div class='add'>+"Mandrivalinux unterstützt verschiedene Sprachen. Wählen\n"</div><div class='ctx'> "Sie die Sprachen, die Sie installieren wollen.Diese stehen Ihnen zur\n"</div><div class='ctx'> "Verfügung, nachdem die Installation fertig ist und Sie einen Neustart\n"</div><div class='ctx'> "durchgeführt haben."</div><div class='hunk'>@@ -1676,12 +1676,12 @@ msgstr ""</div><div class='ctx'> "Administrator wahrscheinlich folgendes ausführen: „C:\\&gt;net localgroup \"Pre-"</div><div class='ctx'> "Windows 2000 Compatible Access\" everyone /add“. Anschließend muss der "</div><div class='ctx'> "Server neu gestartet werden.\n"</div><div class='del'>-"Damit Sie Ihren Mandrakelinux-Rechner zur Windows™-Domäne hinzufügen können, "</div><div class='add'>+"Damit Sie Ihren Mandrivalinux-Rechner zur Windows™-Domäne hinzufügen können, "</div><div class='ctx'> "benötigen Sie noch Benutzername und Passwort eines Domänen-Administrators.\n"</div><div class='ctx'> "Sollte das Netzwerk noch nicht aktiv sein, wird DrakX nach der "</div><div class='ctx'> "Netzwerkkonfiguration versuchen, sich in die Domäne zu integrieren.\n"</div><div class='ctx'> "Sollte dies schief gehen, und die Domänenauthentifizierung funktioniert "</div><div class='del'>-"nicht, verwenden Sie nach der Installation von Mandrakelinux folgenden "</div><div class='add'>+"nicht, verwenden Sie nach der Installation von Mandrivalinux folgenden "</div><div class='ctx'> "Befehl: „smbpasswd -j DOMÄNE -U BENUTZER%%PASSWORT“, wobei „DOMÄNE“ die "</div><div class='ctx'> "Windows™-Domäne ist, „BENUTZER“ und „PASSWORT“ der Benutzername und das "</div><div class='ctx'> "Passwort des Domänen-Administrators.\n"</div><div class='hunk'>@@ -3781,12 +3781,12 @@ msgstr "Radio Unterstützung aktivieren"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Lesen Sie bitte aufmerksam die Lizenz, bevor Sie fortfahren. Sie umfasst\n"</div><div class='del'>-"die gesamte Mandrakelinux Distribution. Sollten Sie nicht in allen Punkten\n"</div><div class='add'>+"die gesamte Mandrivalinux Distribution. Sollten Sie nicht in allen Punkten\n"</div><div class='ctx'> "zustimmen, betätigen Sie bitte die Schaltfläche „%s“, um die Installation\n"</div><div class='ctx'> "abzubrechen. Um mit der Installation fortzufahren, betätigen Sie die\n"</div><div class='ctx'> "Schaltfläche „%s“."</div><div class='hunk'>@@ -3969,13 +3969,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Die Mandrakelinux-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"</div><div class='add'>+"Die Mandrivalinux-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"</div><div class='ctx'> "kann daher vorkommen, dass DrakX Pakete von anderen, als der\n"</div><div class='ctx'> "Installations-CD-ROM installieren will. In diesem Fall wird es die aktuelle\n"</div><div class='ctx'> "CD auswerfen und nach einer anderen fragen. Wenn Sie dieses CD nicht haben,\n"</div><div class='hunk'>@@ -3988,11 +3988,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4044,7 +4044,7 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nun ist es Zeit sich zu entscheiden, welche Programme Sie auf Ihrem Rechner\n"</div><div class='del'>-"installieren wollen. Es gibt tausende von Paketen für Mandrakelinux, und\n"</div><div class='add'>+"installieren wollen. Es gibt tausende von Paketen für Mandrivalinux, und\n"</div><div class='ctx'> "Sie müssen sie nicht alle auswendig kennen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Die Pakete sind nach ihrer Verwendung in vier Kategorien eingeteilt. Sie\n"</div><div class='hunk'>@@ -4155,10 +4155,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4190,7 +4190,7 @@ msgstr ""</div><div class='ctx'> "!! Es kommt vor, dass Server- und Dienst-Pakete angewählt wurden - entweder\n"</div><div class='ctx'> "absichtlich, oder als Paket einer ganzen Gruppe; sollte das der Fall sein,\n"</div><div class='ctx'> "werden Sie nun gefragt, ob Sie diese wirklich installiert haben wollen.\n"</div><div class='del'>-"Unter Mandrakelinux werden installierte Server und Dienste automatisch beim\n"</div><div class='add'>+"Unter Mandrivalinux werden installierte Server und Dienste automatisch beim\n"</div><div class='ctx'> "Betriebssystemstart gestartet. Selbst wenn zum Zeitpunkt, als die\n"</div><div class='ctx'> "Distribution zusammengestellt wurde, keine Sicherheitslücken oder Fehler in\n"</div><div class='ctx'> "diesen Paketen bekannt waren, ist natürlich nicht auszuschließen, dass\n"</div><div class='hunk'>@@ -4356,7 +4356,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4412,7 +4412,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (das X Window System) ist das Herz der grafischen Benutzeroberfläche von\n"</div><div class='ctx'> "GNU/Linux. Es bildet die Grundlage für die Vielzahl grafischer\n"</div><div class='del'>-"Benutzerumgebungen, die Mandrakelinux Ihnen anbietet (wie etwa KDE, GNOME,\n"</div><div class='add'>+"Benutzerumgebungen, die Mandrivalinux Ihnen anbietet (wie etwa KDE, GNOME,\n"</div><div class='ctx'> "AfterStep oder WindowMaker).\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Sie erhalten eine Liste möglicher Parameter, mit deren Hilfe Sie die\n"</div><div class='hunk'>@@ -4539,12 +4539,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4571,7 +4571,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4580,7 +4580,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4600,11 +4600,11 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrakelinux\n"</div><div class='add'>+"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrivalinux\n"</div><div class='ctx'> "System installiert werden soll. Sofern alles leer ist bzw. ein\n"</div><div class='ctx'> "Betriebssystem alles belegt, müssen die Platte(n) neu partitioniert werden.\n"</div><div class='ctx'> "Prinzipiell besteht das Partitionieren der Platte(n) darin, den\n"</div><div class='del'>-"Plattenplatz so aufzuteilen, dass Ihr Mandrakelinux darauf installiert\n"</div><div class='add'>+"Plattenplatz so aufzuteilen, dass Ihr Mandrivalinux darauf installiert\n"</div><div class='ctx'> "werden kann.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Da dieser Schritt normalerweise irreversibel ist und auch zu Datenverlusten\n"</div><div class='hunk'>@@ -4635,7 +4635,7 @@ msgstr ""</div><div class='ctx'> "defragmentiert. Dennoch sollten Sie vor diesem Schritt eine Sicherungskopie\n"</div><div class='ctx'> "Ihrer Daten auf einem anderem Medium als der zu verändernden Festplatte\n"</div><div class='ctx'> "vornehmen. Sie sollten diese Variante wählen, falls Sie beide\n"</div><div class='del'>-"Betriebssysteme (Microsoft Windows und Mandrakelinux) nebeneinander nutzen\n"</div><div class='add'>+"Betriebssysteme (Microsoft Windows und Mandrivalinux) nebeneinander nutzen\n"</div><div class='ctx'> "wollen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Bevor Sie sich für diese Variante entscheiden, sei hier noch einmal\n"</div><div class='hunk'>@@ -4643,7 +4643,7 @@ msgstr ""</div><div class='ctx'> "als momentan.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * „%s“: Falls Sie alle Daten Ihrer Platte verlieren, und sie durch Ihr\n"</div><div class='del'>-"neues Mandrakelinux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"</div><div class='add'>+"neues Mandrivalinux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"</div><div class='ctx'> "Beachten Sie, dass dieser Schritt nicht rückgängig gemacht werden kann.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! Wenn Sie diese Variante wählen, werden alle Ihre Daten auf der Platte\n"</div><div class='hunk'>@@ -4813,7 +4813,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4835,7 +4835,7 @@ msgstr ""</div><div class='ctx'> "Schaltfläche „%s“, um mit dem Formatieren der Partitionen zu beginnen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Betätigen Sie „%s“, wenn Sie eine andere Partition für Ihr neues\n"</div><div class='del'>-"Mandrakelinux vorgesehen haben.\n"</div><div class='add'>+"Mandrivalinux vorgesehen haben.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Betätigen Sie die Schaltfläche „%s“, falls Sie Partitionen auf defekte\n"</div><div class='ctx'> "Blöcke untersuchen wollen."</div><div class='hunk'>@@ -4854,7 +4854,7 @@ msgstr "Zurück"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4866,7 +4866,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrakelinux\n"</div><div class='add'>+"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrivalinux\n"</div><div class='ctx'> "Installation bereits einige Pakete aktualisiert wurden, etwa da noch Fehler\n"</div><div class='ctx'> "entdeckt und beseitigt wurden oder da in Paketen Sicherheitslücken entdeckt\n"</div><div class='ctx'> "wurden, für die bereits Lösungen existieren. Um von diesen aktualisierten\n"</div><div class='hunk'>@@ -4901,7 +4901,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4915,7 +4915,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Sollten Sie sich an dieser Stelle nicht sicher sein, so behalten Sie die\n"</div><div class='ctx'> "Standardeinstellung bei. Sie können die Ebene später noch mittels draksec\n"</div><div class='del'>-"im Mandrakelinux Control Center anpassen.\n"</div><div class='add'>+"im Mandrivalinux Control Center anpassen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Das Feld „%s“ dient dazu, dem System mitzuteilen, wer für die Sicherheit\n"</div><div class='ctx'> "dieses Rechners verantwortlich ist. An dieses Kennzeichen/diese E-Mail\n"</div><div class='hunk'>@@ -4932,7 +4932,7 @@ msgstr "Sicherheitsadministrator:"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -5096,7 +5096,7 @@ msgstr "In den Normal-Modus wechseln"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5125,7 +5125,7 @@ msgid ""</div><div class='ctx'> "disk or partition is called \"C:\")."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Es wurde mehr als eine Windows-Partition gefunden. Wählen Sie bitte, welche\n"</div><div class='del'>-"Sie verkleinern wollen, um Platz für Ihr neues Mandrakelinux zu schaffen.\n"</div><div class='add'>+"Sie verkleinern wollen, um Platz für Ihr neues Mandrivalinux zu schaffen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Die Partitionen werden folgendermaßen aufgelistet: „Linux-Name“,\n"</div><div class='ctx'> "„Windows-Name“, „Kapazität“.\n"</div><div class='hunk'>@@ -5177,7 +5177,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5186,35 +5186,35 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dieser Schritt wird nur aufgerufen, wenn mindestens eine GNU/Linux\n"</div><div class='ctx'> "Partition auf Ihren Festplatten gefunden wird.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX fragt Sie nun nach der gewünschten Installationsart. Sie haben die\n"</div><div class='ctx'> "Wahl zwischen einer Aktualisierung einer bereits vorhandenen\n"</div><div class='del'>-"Mandrakelinux-Version oder einer kompletten Neuinstallation:\n"</div><div class='add'>+"Mandrivalinux-Version oder einer kompletten Neuinstallation:\n"</div><div class='ctx'> "\n"</div><div class='del'>-" * „%s“: Entfernt komplett ältere Versionen von Mandrakelinux, die noch\n"</div><div class='add'>+" * „%s“: Entfernt komplett ältere Versionen von Mandrivalinux, die noch\n"</div><div class='ctx'> "installiert sind - um genau zu sein, können Sie je nach aktuellem Inhalt\n"</div><div class='ctx'> "Ihrer Platte auch einige ältere Linux- oder anderweitige Partitionen\n"</div><div class='ctx'> "unangetastet behalten. Diese Installationsart ist gut, wenn Sie die\n"</div><div class='ctx'> "Partitionseinteilung auf Ihrer Festplatte sowieso ändern oder das benutzte\n"</div><div class='ctx'> "Dateisystem austauschen wollen\n"</div><div class='ctx'> "\n"</div><div class='del'>-" * „%s“: Mit dieser Variante können Sie eine existierende Mandrakelinux\n"</div><div class='add'>+" * „%s“: Mit dieser Variante können Sie eine existierende Mandrivalinux\n"</div><div class='ctx'> "Version aktualisieren. Die Partitionstabellen sowie die persönlichen\n"</div><div class='ctx'> "Verzeichnisse der Anwender bleiben erhalten. Alle anderen\n"</div><div class='ctx'> "Installationsschritte werden wie bei einer Installation ausgeführt.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Aktualisierungen von Mandrakelinux „8.1“ oder neueren Systemen sollten\n"</div><div class='del'>-"problemlos funktionieren. Ältere Versionen von Mandrakelinux sollten Sie\n"</div><div class='add'>+"Aktualisierungen von Mandrivalinux „8.1“ oder neueren Systemen sollten\n"</div><div class='add'>+"problemlos funktionieren. Ältere Versionen von Mandrivalinux sollten Sie\n"</div><div class='ctx'> "nicht zu aktualisieren versuchen."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -5276,7 +5276,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5317,7 +5317,7 @@ msgstr ""</div><div class='ctx'> "Zur UTF-8 (Unicode) Unterstützung: Unicode ist ein Zeichenkodierung, die\n"</div><div class='ctx'> "die existierenden Kodierungen ablösen soll und die Zeichen aller\n"</div><div class='ctx'> "existierender Sprachen beinhalten. Komplette Unterstützung in GNU/Linux ist\n"</div><div class='del'>-"leider immer noch nicht gegeben. Daher verwendet Mandrakelinux diese\n"</div><div class='add'>+"leider immer noch nicht gegeben. Daher verwendet Mandrivalinux diese\n"</div><div class='ctx'> "Kodierung nur auf Wunsch des Anwenders:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Falls Sie eine Sprache nutzen, die eine gut unterstütztes Kodierung\n"</div><div class='hunk'>@@ -5575,7 +5575,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5596,11 +5596,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Hier können Sie das Drucksystem für Ihren Rechner wählen. Andere\n"</div><div class='del'>-"Betriebssysteme bieten Ihnen nur eines, bei Mandrakelinux können Sie\n"</div><div class='add'>+"Betriebssysteme bieten Ihnen nur eines, bei Mandrivalinux können Sie\n"</div><div class='ctx'> "zwischen zwei verschiedenen wählen. jedes dieser Systeme ist für eine\n"</div><div class='ctx'> "bestimmte Konfiguration des Systems am besten geeignet.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5623,7 +5623,7 @@ msgstr ""</div><div class='ctx'> "starten. „%s“ bietet grafische Konfigurations- und Druckmenüs.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Sie können diese Wahl später immer wieder ändern, indem Sie PrinterDrake\n"</div><div class='del'>-"aus dem Mandrakelinux Control Center starten und dort die Schaltfläche „%s“\n"</div><div class='add'>+"aus dem Mandrivalinux Control Center starten und dort die Schaltfläche „%s“\n"</div><div class='ctx'> "betätigen."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='hunk'>@@ -5750,7 +5750,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5767,7 +5767,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5818,7 +5818,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * „%s“: Falls Sie Ihren Internetzugang oder Ihr lokales Netzwerk nun\n"</div><div class='ctx'> "einrichten wollen, können Sie das hier tun. Lesen Sie sich dazu die\n"</div><div class='del'>-"gedruckte Dokumentation durch oder benutzen Sie das Mandrakelinux Control\n"</div><div class='add'>+"gedruckte Dokumentation durch oder benutzen Sie das Mandrivalinux Control\n"</div><div class='ctx'> "Center nachdem die Installation beendet ist.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * „%s“: Hier können Sie HTTP- und FTP-Proxyadressen eintragen falls Ihre\n"</div><div class='hunk'>@@ -5837,10 +5837,10 @@ msgstr ""</div><div class='ctx'> "(„Bootloader“) ändern wollen, wählen Sie diese Schaltfläche. Es sei\n"</div><div class='ctx'> "angemerkt, dass dieser Punkt sich an fortgeschrittenere Nutzer richtet.\n"</div><div class='ctx'> "Hilfe finden Sie in der gedruckten Dokumentation oder im integrierten\n"</div><div class='del'>-"Hilfeteil des Mandrakelinux Control Center.\n"</div><div class='add'>+"Hilfeteil des Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * „%s“: Sie können hier die Dienste wählen, die ab dem Start von\n"</div><div class='del'>-"Mandrakelinux zur Verfügung gestellt werden sollen. Wollen Sie den Rechner\n"</div><div class='add'>+"Mandrivalinux zur Verfügung gestellt werden sollen. Wollen Sie den Rechner\n"</div><div class='ctx'> "als Server verwenden, sollten Sie unbedingt einen Blick auf diese Liste\n"</div><div class='ctx'> "werfen."</div><div class='ctx'> </div><div class='hunk'>@@ -5901,11 +5901,11 @@ msgstr "Dienste"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bitte wählen Sie die Festplatte, die Sie löschen wollen, um Ihr neues\n"</div><div class='del'>-"Mandrakelinux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"</div><div class='add'>+"Mandrivalinux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"</div><div class='ctx'> "dieser Platte nach diesem Schritt unwiederbringlich verloren sind!"</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -6262,7 +6262,7 @@ msgstr "Berechne die Größe der Windows-Partition"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ihre Windows-Partition ist zu sehr fragmentiert.\n"</div><div class='hunk'>@@ -6390,19 +6390,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6424,7 +6424,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6432,14 +6432,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6449,7 +6449,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6469,10 +6469,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6483,11 +6483,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6503,31 +6503,31 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bei dieser Übersetzung handelt es sich um eine inoffizielle Übersetzung\n"</div><div class='del'>-"der Mandrakelinux-Lizenz in die deutsche Sprache. Sie ist keine\n"</div><div class='add'>+"der Mandrivalinux-Lizenz in die deutsche Sprache. Sie ist keine\n"</div><div class='ctx'> "rechtsverbindliche Darstellung der Lizenzbedingungen der Software in\n"</div><div class='ctx'> "dieser Distribution - nur der ursprüngliche französische Text der\n"</div><div class='del'>-"Mandrakelinux-Lizenz ist rechtsverbindlich. Wir hoffen aber, dass diese\n"</div><div class='add'>+"Mandrivalinux-Lizenz ist rechtsverbindlich. Wir hoffen aber, dass diese\n"</div><div class='ctx'> "Übersetzung den deutschsprechenden Benutzern das Verständnis dieser\n"</div><div class='ctx'> "Lizenz erleichtert.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Einführung\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Das Betriebssystem und die anderen Komponenten, die in Mandrakelinux\n"</div><div class='add'>+"Das Betriebssystem und die anderen Komponenten, die in Mandrivalinux\n"</div><div class='ctx'> "enthalten sind, werden hier „Software-Produkte“ genannt. Die\n"</div><div class='ctx'> "Software-Produkte umfassen, aber sind nicht beschränkt auf, die\n"</div><div class='ctx'> "Gesamtheit der Programme, Methoden, Regeln, und Dokumentation, welche\n"</div><div class='del'>-"zum Betriebssystem und den anderen Komponenten der Mandrakelinux\n"</div><div class='add'>+"zum Betriebssystem und den anderen Komponenten der Mandrivalinux\n"</div><div class='ctx'> "Distribution gehören.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Lizenzabkommen\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Bitte lesen Sie dieses Dokument sorgfältig. Dieses Dokument ist ein\n"</div><div class='del'>-"Lizenzabkommen zwischen Ihnen und Mandrakesoft S. A. welches sich auf\n"</div><div class='add'>+"Lizenzabkommen zwischen Ihnen und Mandriva S. A. welches sich auf\n"</div><div class='ctx'> "die Software-Produkte bezieht.\n"</div><div class='ctx'> "Durch Installation, Duplizierung oder Benutzung der Software-Produkte in\n"</div><div class='ctx'> "irgendeiner Art und Weise erklären Sie sich mit den Bedingungen dieser\n"</div><div class='hunk'>@@ -6546,14 +6546,14 @@ msgstr ""</div><div class='ctx'> "Die Software-Produkte und die beigefügte Dokumentation werden dem\n"</div><div class='ctx'> "Benutzer lediglich zur Verfügung gestellt, es wird keinerlei Garantie\n"</div><div class='ctx'> "gegeben soweit es gesetzlich zulässig ist.\n"</div><div class='del'>-"Mandrakesoft S. A. haftet unter keinen Umständen, soweit gesetzlich\n"</div><div class='add'>+"Mandriva S. A. haftet unter keinen Umständen, soweit gesetzlich\n"</div><div class='ctx'> "zulässig, für direkte oder indirekte Schäden irgendwelcher Art,\n"</div><div class='ctx'> "(inklusive uneingeschränkten Schäden aufgrund Verlust von\n"</div><div class='ctx'> "Geschäftsbeziehungen, Unterbrechung von Geschäftsvorgängen,\n"</div><div class='ctx'> "finanziellen Verlust, Gebühren oder Strafen aufgrund gerichtlicher\n"</div><div class='ctx'> "Entscheide, oder jegliche Folgeschäden) die aufgrund der Benutzung oder\n"</div><div class='ctx'> "der Unmöglichkeit der Benutzung der Software-Produkte entstehen, auch\n"</div><div class='del'>-"wenn Mandrakesoft S. A. über die Möglichkeit und das Auftreten\n"</div><div class='add'>+"wenn Mandriva S. A. über die Möglichkeit und das Auftreten\n"</div><div class='ctx'> "derartiger Schäden unterrichtet wurde.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6561,14 +6561,14 @@ msgstr ""</div><div class='ctx'> "BENUTZUNG VON SOFTWARE, DIE IN EINIGEN LÄNDERN VERBOTEN IST.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Soweit gesetzlich zulässig, haften Mandrakesoft S. A. und deren\n"</div><div class='add'>+"Soweit gesetzlich zulässig, haften Mandriva S. A. und deren\n"</div><div class='ctx'> "Vertreiber unter keinen Umständen für direkte oder indirekte Schäden\n"</div><div class='ctx'> "irgendwelcher Art, (inklusive uneingeschränkten Schäden aufgrund Verlust\n"</div><div class='ctx'> "von Geschäftsbeziehungen, Unterbrechung von Geschäftsvorgängen,\n"</div><div class='ctx'> "finanziellen Verlust, Gebühren oder Strafen aufgrund gerichtlicher\n"</div><div class='ctx'> "Entscheide, oder jegliche Folgeschäden) die aufgrund des Besitzes und\n"</div><div class='ctx'> "der Benutzung von Software-Komponenten oder aufgrund des Ladens von\n"</div><div class='del'>-"Software-Komponenten von den Internet-Servern von Mandrakesoft S. A.,\n"</div><div class='add'>+"Software-Komponenten von den Internet-Servern von Mandriva S. A.,\n"</div><div class='ctx'> "deren Besitz und Benutzung in einigen Ländern aufgrund lokaler Gesetze\n"</div><div class='ctx'> "nicht gestattet ist, entstehen.\n"</div><div class='ctx'> "Diese Einschränkung der Verantwortlichkeit bezieht sich auch, aber nicht\n"</div><div class='hunk'>@@ -6586,9 +6586,9 @@ msgstr ""</div><div class='ctx'> "benutzen, zu duplizieren, anzupassen, und weiterzugeben. Bitte lesen sie\n"</div><div class='ctx'> "sorgfältig die Bedingungen der Lizenzabkommen von jeder Komponente,\n"</div><div class='ctx'> "bevor Sie sie benutzen. Jegliche Frage zur Lizenz einer Komponente ist an\n"</div><div class='del'>-"den Autor der Komponente und nicht an Mandrakesoft S. A. zu richten. Die\n"</div><div class='del'>-"von Mandrakesoft S. A. erstellten Programme unterliegen der GPL.\n"</div><div class='del'>-"Von Mandrakesoft S. A. geschriebene Dokumentation unterliegt einer\n"</div><div class='add'>+"den Autor der Komponente und nicht an Mandriva S. A. zu richten. Die\n"</div><div class='add'>+"von Mandriva S. A. erstellten Programme unterliegen der GPL.\n"</div><div class='add'>+"Von Mandriva S. A. geschriebene Dokumentation unterliegt einer\n"</div><div class='ctx'> "spezifischen Lizenz. Bitte lesen Sie die Dokumentation für weitere\n"</div><div class='ctx'> "Details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6598,10 +6598,10 @@ msgstr ""</div><div class='ctx'> "Alle Rechte an den Komponenten der Software-Produkte liegen bei den\n"</div><div class='ctx'> "entsprechenden Autoren und sind durch die Urheberrechtsgesetze für\n"</div><div class='ctx'> "Softwareprodukte geschützt.\n"</div><div class='del'>-"Mandrakesoft S. A. behält sich das Recht vor, die Software-Produkte zu\n"</div><div class='add'>+"Mandriva S. A. behält sich das Recht vor, die Software-Produkte zu\n"</div><div class='ctx'> "modifizieren und anzupassen.\n"</div><div class='del'>-"„Mandrake“, „Mandrakelinux“ und entsprechende Logos sind eingetragene\n"</div><div class='del'>-"Warenzeichen der Mandrakesoft S. A..\n"</div><div class='add'>+"„Mandrake“, „Mandrivalinux“ und entsprechende Logos sind eingetragene\n"</div><div class='add'>+"Warenzeichen der Mandriva S. A..\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Gesetzliche Bestimmungen\n"</div><div class='hunk'>@@ -6615,7 +6615,7 @@ msgstr ""</div><div class='ctx'> "werden vorzugsweise außergerichtlich beigelegt. Letztes Mittel ist das\n"</div><div class='ctx'> "zuständige Gericht in Paris, Frankreich.\n"</div><div class='ctx'> "Zu jeglicher Frage zu diesem Dokument kontaktieren Sie bitte\n"</div><div class='del'>-"Mandrakesoft S. A.\n"</div><div class='add'>+"Mandriva S. A.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6709,7 +6709,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6717,7 +6717,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Herzlichen Glückwunsch, die Installation ist abgeschlossen.\n"</div><div class='ctx'> "Entfernen Sie die Startmedien (CD-ROMs / Disketten) und drücken Sie die "</div><div class='hunk'>@@ -6729,7 +6729,7 @@ msgstr ""</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Wie Sie Ihr System warten können, erfahren Sie im Kapitel „Nach der "</div><div class='del'>-"Installation“ im offiziellen Benutzerhandbuch von Mandrakelinux."</div><div class='add'>+"Installation“ im offiziellen Benutzerhandbuch von Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6764,7 +6764,7 @@ msgstr "Beginn von Schritt „%s“\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -7317,9 +7317,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kontaktiere Mandrakelinux Web-Server, um eine Liste verfügbarer Pakete zu "</div><div class='add'>+"Kontaktiere Mandrivalinux Web-Server, um eine Liste verfügbarer Pakete zu "</div><div class='ctx'> "erhalten..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7549,8 +7549,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux-Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux-Installation %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10138,14 +10138,14 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "DrakFirewall-Konfigurator\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Hiermit konfigurieren Sie eine persönliche Firewall für diesen\n"</div><div class='del'>-"Mandrakelinux-Rechner. Sollten Sie an einer speziellen ausgereiften\n"</div><div class='add'>+"Mandrivalinux-Rechner. Sollten Sie an einer speziellen ausgereiften\n"</div><div class='ctx'> "Firewall-Lösung interessiert sein, schauen Sie sich nach der speziell\n"</div><div class='ctx'> "dafür entwickelten MandrakeSecurity-Firewall-Distribution um."</div><div class='ctx'> </div><div class='hunk'>@@ -14237,11 +14237,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Starten Sie Scannerdrake (Hardware/Scanner im Mandrakelinux "</div><div class='add'>+"Starten Sie Scannerdrake (Hardware/Scanner im Mandrivalinux "</div><div class='ctx'> "Kontrollzentrum), um Ihren Scanner im Netzwerk freizugeben.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -16239,23 +16239,23 @@ msgstr "Stopp"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Was ist Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Was ist Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Willkommen zu &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Willkommen zu &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux ist eine &lt;b&gt;Linuxdistribution&lt;/b&gt;, die sowohl den Kern des "</div><div class='add'>+"Mandrivalinux ist eine &lt;b&gt;Linuxdistribution&lt;/b&gt;, die sowohl den Kern des "</div><div class='ctx'> "Systems umfasst, der &lt;b&gt;Betriebssystem&lt;/b&gt; (basierend auf dem Linux-Kernel) "</div><div class='ctx'> "genannt wird, als auch &lt;b&gt;eine Menge Anwendungen&lt;/b&gt;, die jeden Bedarf "</div><div class='ctx'> "abdecken, den Sie sich vorstellen können."</div><div class='hunk'>@@ -16263,10 +16263,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux ist die &lt;b&gt;benutzerfreundlichste&lt;/b&gt; Linuxdistribution "</div><div class='add'>+"Mandrivalinux ist die &lt;b&gt;benutzerfreundlichste&lt;/b&gt; Linuxdistribution "</div><div class='ctx'> "heutzutage. Sie ist außerdem eine der &lt;b&gt;am weitesten verbreiteten&lt;/b&gt; "</div><div class='ctx'> "Linuxdistributionen weltweit!"</div><div class='ctx'> </div><div class='hunk'>@@ -16283,14 +16283,14 @@ msgstr "Willkommen in der &lt;b&gt;Open Source Welt&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux verpflichtet sich dem Open-Source-Modell. Das bedeutet, dass "</div><div class='add'>+"Mandrivalinux verpflichtet sich dem Open-Source-Modell. Das bedeutet, dass "</div><div class='ctx'> "diese neue Ausgabe das Resultat der &lt;b&gt;Zusammenarbeit&lt;/b&gt; zwischen "</div><div class='del'>-"&lt;b&gt;Mandrakesofts Entwicklern&lt;/b&gt; und der &lt;b&gt;weltweiten Gemeinschaft&lt;/b&gt; von "</div><div class='add'>+"&lt;b&gt;Mandrivas Entwicklern&lt;/b&gt; und der &lt;b&gt;weltweiten Gemeinschaft&lt;/b&gt; von "</div><div class='ctx'> "Mitwirkenden ist."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='hunk'>@@ -16311,10 +16311,10 @@ msgstr "&lt;b&gt;Die GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ein Großteil der in der Distribution enthaltenen Programme und alle "</div><div class='del'>-"Mandrakelinux-Werkzeuge sind unter der &lt;b&gt;General Public License&lt;/b&gt; "</div><div class='add'>+"Mandrivalinux-Werkzeuge sind unter der &lt;b&gt;General Public License&lt;/b&gt; "</div><div class='ctx'> "lizensiert."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16346,15 +16346,15 @@ msgstr "&lt;b&gt;Treten Sie der Gemeinschaft bei&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux hat eine der &lt;b&gt;größten Gemeinschaften&lt;/b&gt; von Nutzern und "</div><div class='add'>+"Mandrivalinux hat eine der &lt;b&gt;größten Gemeinschaften&lt;/b&gt; von Nutzern und "</div><div class='ctx'> "Entwicklern. Die Rolle dieser Gemeinschaft ist sehr umfassend und erstreckt "</div><div class='ctx'> "sich von Fehlerberichten bis zur Entwicklung neuer Anwendungen. Die "</div><div class='del'>-"Gemeinschaft spielt eine &lt;b&gt;Schlüsselrolle&lt;/b&gt; in der Mandrakelinux-Welt."</div><div class='add'>+"Gemeinschaft spielt eine &lt;b&gt;Schlüsselrolle&lt;/b&gt; in der Mandrivalinux-Welt."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16376,11 +16376,11 @@ msgstr "&lt;b&gt;Download-Version&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Sie installieren &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Das ist die freie Version, "</div><div class='del'>-"die Mandrakesoft &lt;b&gt;für jeden zur Verfügung&lt;/b&gt; stellt."</div><div class='add'>+"Sie installieren &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Das ist die freie Version, "</div><div class='add'>+"die Mandriva &lt;b&gt;für jeden zur Verfügung&lt;/b&gt; stellt."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16413,9 +16413,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Sie werden auch keinen Zugriff auf die in den anderen Mandrakesoft-Produkten "</div><div class='add'>+"Sie werden auch keinen Zugriff auf die in den anderen Mandriva-Produkten "</div><div class='ctx'> "&lt;b&gt;inbegriffenen Dienstleistungen&lt;/b&gt; haben."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -16425,8 +16425,8 @@ msgstr "&lt;b&gt;Discovery, Ihr erster Linux-Desktop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Sie installieren &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Sie installieren &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16448,17 +16448,17 @@ msgstr "&lt;b&gt;PowerPack, der ultimative Linux-Desktop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Sie installieren &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Sie installieren &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack ist Mandrakesofts &lt;b&gt;erstklassiger Linux-Desktop&lt;/b&gt;. PowerPack "</div><div class='add'>+"PowerPack ist Mandrivas &lt;b&gt;erstklassiger Linux-Desktop&lt;/b&gt;. PowerPack "</div><div class='ctx'> "beinhaltet &lt;b&gt;tausende Anwendungen&lt;/b&gt; -- alles vom Beliebtesten bis zum "</div><div class='ctx'> "Fortschrittlichsten."</div><div class='ctx'> </div><div class='hunk'>@@ -16469,8 +16469,8 @@ msgstr "&lt;b&gt;PowerPack+, die Linuxlösung für Desktops und Server&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Sie installieren &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Sie installieren &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16487,22 +16487,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft Produkte&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Produkte&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; hat eine breite Auswahl an &lt;b&gt;Mandrakelinux&lt;/b&gt;-"</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; hat eine breite Auswahl an &lt;b&gt;Mandrivalinux&lt;/b&gt;-"</div><div class='ctx'> "Produkten entwickelt."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Die Mandrakelinux Produkte sind:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Die Mandrivalinux Produkte sind:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16522,74 +16522,74 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, die Linuxlösung für Desktops und Server."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux für x86-64&lt;/b&gt;, die Mandrakelinux-Lösung, um das Beste "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux für x86-64&lt;/b&gt;, die Mandrivalinux-Lösung, um das Beste "</div><div class='ctx'> "aus Ihrem 64-Bit-Prozessor zu machen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft Produkte (Nomaden-Produkte)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Produkte (Nomaden-Produkte)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft hat zwei Produkte entwickelt, die es Ihnen erlauben, "</div><div class='del'>-"Mandrakelinux &lt;b&gt;auf jedem Rechner&lt;/b&gt; ohne vorherige Installation zu "</div><div class='add'>+"Mandriva hat zwei Produkte entwickelt, die es Ihnen erlauben, "</div><div class='add'>+"Mandrivalinux &lt;b&gt;auf jedem Rechner&lt;/b&gt; ohne vorherige Installation zu "</div><div class='ctx'> "verwenden:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, eine Mandrakelinux-Distribution, die komplett von einer "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, eine Mandrivalinux-Distribution, die komplett von einer "</div><div class='ctx'> "startbaren CD-ROM läuft."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, eine Mandrakelinux-Distribution vorinstalliert auf "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, eine Mandrivalinux-Distribution vorinstalliert auf "</div><div class='ctx'> "der ultra-kompakten „LaCie Mobilen Festplatte“."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft Produkte (Professionelle Lösungen)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Produkte (Professionelle Lösungen)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Unten aufgeführt sind die Mandrakesoft-Produkte für die &lt;b&gt;professionellen "</div><div class='add'>+"Unten aufgeführt sind die Mandriva-Produkte für die &lt;b&gt;professionellen "</div><div class='ctx'> "Bedürfnisse&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, der Mandrakelinux-Desktop für Geschäfte."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, der Mandrivalinux-Desktop für Geschäfte."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, die Mandrakelinux-Serverlösung."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, die Mandrivalinux-Serverlösung."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Multi-Network-Firewall&lt;/b&gt;, die Mandrakelinux-Sicherheitslösung."</div><div class='add'>+"\t* &lt;b&gt;Multi-Network-Firewall&lt;/b&gt;, die Mandrivalinux-Sicherheitslösung."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16633,10 +16633,10 @@ msgstr "&lt;b&gt;Wählen Sie Ihre Desktop-Umgebung&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mit PowerPack werden Sie die Auswahl der &lt;b&gt;grafischen Desktop-Umgebung&lt;/b&gt; "</div><div class='del'>-"haben.  Mandrakesoft hat &lt;b&gt;KDE&lt;/b&gt; als Voreinstellung gewählt."</div><div class='add'>+"haben.  Mandriva hat &lt;b&gt;KDE&lt;/b&gt; als Voreinstellung gewählt."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16661,10 +16661,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mit PowerPack+ werden Sie die Auswahl der &lt;b&gt;grafischen Desktop-Umgebung&lt;/b&gt; "</div><div class='del'>-"haben.  Mandrakesoft hat &lt;b&gt;KDE&lt;/b&gt; als Voreinstellung gewählt."</div><div class='add'>+"haben.  Mandriva hat &lt;b&gt;KDE&lt;/b&gt; als Voreinstellung gewählt."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16793,10 +16793,10 @@ msgstr "&lt;b&gt;Genießen Sie die breite Auswahl an Anwendungen&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Im Mandrakelinux-Menü finden Sie &lt;b&gt;einfach zu bedienende&lt;/b&gt; Anwendungen "</div><div class='add'>+"Im Mandrivalinux-Menü finden Sie &lt;b&gt;einfach zu bedienende&lt;/b&gt; Anwendungen "</div><div class='ctx'> "für &lt;b&gt;alle Ihre Aufgaben&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -17069,18 +17069,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Kontrollzentrum&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Kontrollzentrum&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Das &lt;b&gt;Mandrakelinux-Kontrollzentrum&lt;/b&gt; ist eine wesentliche Sammlung der "</div><div class='del'>-"Mandrakelinux-spezifischen Werkzeuge um die Einrichtung des Computers zu "</div><div class='add'>+"Das &lt;b&gt;Mandrivalinux-Kontrollzentrum&lt;/b&gt; ist eine wesentliche Sammlung der "</div><div class='add'>+"Mandrivalinux-spezifischen Werkzeuge um die Einrichtung des Computers zu "</div><div class='ctx'> "vereinfachen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -17105,16 +17105,16 @@ msgstr "&lt;b&gt;Das Open-Source-Modell&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Wie jede andere Software, benötigt auch Open Source Software &lt;b&gt;Zeit und "</div><div class='ctx'> "Leute&lt;/b&gt; für ihre Entwicklung. Um die Open Source Philosophie anzuerkennen, "</div><div class='del'>-"verkauft Mandrakesoft Mehrwertprodukte und Dienstleistungen, um "</div><div class='del'>-"&lt;b&gt;Mandrakelinux zu verbessern&lt;/b&gt;. Wenn Sie die Open Source Philosophy und "</div><div class='del'>-"die Entwicklung von Mandrakelinux &lt;b&gt;unterstützen&lt;/b&gt; wollen, ziehen Sie "</div><div class='add'>+"verkauft Mandriva Mehrwertprodukte und Dienstleistungen, um "</div><div class='add'>+"&lt;b&gt;Mandrivalinux zu verbessern&lt;/b&gt;. Wenn Sie die Open Source Philosophy und "</div><div class='add'>+"die Entwicklung von Mandrivalinux &lt;b&gt;unterstützen&lt;/b&gt; wollen, ziehen Sie "</div><div class='ctx'> "&lt;b&gt;bitte&lt;/b&gt; den Kauf eines unserer Produkte oder Dienstleistungen in "</div><div class='ctx'> "Betracht!"</div><div class='ctx'> </div><div class='hunk'>@@ -17126,10 +17126,10 @@ msgstr "&lt;b&gt;Online Warenhaus&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Um mehr über Mandrakesoft-Produkte und -dienstleistungen zu erfahren, können "</div><div class='add'>+"Um mehr über Mandriva-Produkte und -dienstleistungen zu erfahren, können "</div><div class='ctx'> "Sie unsere &lt;b&gt;e-commerce Plattform&lt;/b&gt; besuchen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -17154,24 +17154,24 @@ msgstr "Schauen Sie noch heute unter &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; rein!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; ist der &lt;b&gt;perfekte Begleiter&lt;/b&gt; für Ihr Mandrakelinux-"</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; ist der &lt;b&gt;perfekte Begleiter&lt;/b&gt; für Ihr Mandrivalinux-"</div><div class='ctx'> "Produkt."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Profitieren Sie durch einen Beitritt in den Mandrakeclub von &lt;b&gt;wertvollen "</div><div class='add'>+"Profitieren Sie durch einen Beitritt in den Mandriva Club von &lt;b&gt;wertvollen "</div><div class='ctx'> "Vorteilen&lt;/b&gt;, wie beispielsweise:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -17194,40 +17194,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Teilnahme an Mandrakelinux &lt;b&gt;Nutzerforen&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Teilnahme an Mandrivalinux &lt;b&gt;Nutzerforen&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Früher und privilegierter Zugriff&lt;/b&gt;, vor der öffentlichen Ausgabe, "</div><div class='del'>-"auf Mandrakelinux &lt;b&gt;ISO-Abbilder&lt;/b&gt;."</div><div class='add'>+"auf Mandrivalinux &lt;b&gt;ISO-Abbilder&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; ist eine neue Premiumdienstleistung, die Mandrakesoft "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; ist eine neue Premiumdienstleistung, die Mandriva "</div><div class='ctx'> "stolz seinen Kunden anbietet!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline bietet eine breite Palette wertvoller Dienstleistungen zur "</div><div class='del'>-"&lt;b&gt;einfachen Aktualisierung&lt;/b&gt; Ihres Mandrakelinux-Systems:"</div><div class='add'>+"Mandriva Online bietet eine breite Palette wertvoller Dienstleistungen zur "</div><div class='add'>+"&lt;b&gt;einfachen Aktualisierung&lt;/b&gt; Ihres Mandrivalinux-Systems:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17252,40 +17252,40 @@ msgstr "\t* Flexible &lt;b&gt;planmäßige&lt;/b&gt; Aktualisierungen."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='del'>-msgstr "\t* Verwaltung &lt;b&gt;all Ihrer Mandrakelinux-Systeme&lt;/b&gt; mit einem Konto."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='add'>+msgstr "\t* Verwaltung &lt;b&gt;all Ihrer Mandrivalinux-Systeme&lt;/b&gt; mit einem Konto."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Benötigen Sie &lt;b&gt;Unterstützung?&lt;/b&gt; Treffen Sie Mandrakesofts "</div><div class='add'>+"Benötigen Sie &lt;b&gt;Unterstützung?&lt;/b&gt; Treffen Sie Mandrivas "</div><div class='ctx'> "Technikexperten auf &lt;b&gt;unserer technischen Supportplattform&lt;/b&gt; www."</div><div class='ctx'> "mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Dank der &lt;b&gt;qualifzierten Mandrakelinux-Experten&lt;/b&gt; werden Sie eine Menge "</div><div class='add'>+"Dank der &lt;b&gt;qualifzierten Mandrivalinux-Experten&lt;/b&gt; werden Sie eine Menge "</div><div class='ctx'> "Zeit sparen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Zu jeder Frage bezüglich Mandrakelinux können Sie Support unter &lt;b&gt;store."</div><div class='add'>+"Zu jeder Frage bezüglich Mandrivalinux können Sie Support unter &lt;b&gt;store."</div><div class='ctx'> "mandrakesoft.com&lt;/b&gt; kaufen."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17586,8 +17586,8 @@ msgstr "Überwachungswerkzeuge, Prozessverwaltung, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft-Assistenten"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva-Assistenten"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17681,8 +17681,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "OPTIONEN:\n"</div><div class='ctx'> "  --help            - Asgabe dieses Hilfetextes.\n"</div><div class='del'>-"  --report          - Name eines Mandrakelinux-Werkzeuges.\n"</div><div class='del'>-"  --incident        - Name eines Mandrakelinux-Werkzeuges."</div><div class='add'>+"  --report          - Name eines Mandrivalinux-Werkzeuges.\n"</div><div class='add'>+"  --incident        - Name eines Mandrivalinux-Werkzeuges."</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17738,7 +17738,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17809,14 +17809,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='del'>-"  --no-confirmation      keine Fragen im MandrakeUpdate-Modus stellen\n"</div><div class='add'>+"  --no-confirmation      keine Fragen im Mandriva Update-Modus stellen\n"</div><div class='ctx'> "  --no-verify-rpm        Paketsignaturen nicht überprüfen\n"</div><div class='ctx'> "  --changelog-first      Änderungsprotokoll vor Dateiliste anzeigen\n"</div><div class='ctx'> "  --merge-all-rpmnew     Zusammenlegen aller .rpmnew/.rpmsave-Dateien "</div><div class='hunk'>@@ -20635,13 +20635,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux Fehlerberichte"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux Fehlerberichte"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Kontrollzentrum"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Kontrollzentrum"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20661,8 +20661,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20706,8 +20706,8 @@ msgstr "Konfigurationsassistenten"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Wählen Sie ein Mandrakesoft-Werkzeug:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Wählen Sie ein Mandriva-Werkzeug:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21134,20 +21134,20 @@ msgstr "Beim Hochfahren gestartet"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Diese Schnittstelle wurde noch nicht eingerichtet.\n"</div><div class='del'>-"Starten Sie den Assistenten „Schnittstelle hinzufügen“ im Mandrakelinux "</div><div class='add'>+"Starten Sie den Assistenten „Schnittstelle hinzufügen“ im Mandrivalinux "</div><div class='ctx'> "Kontrollzentrum."</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sie haben noch keine eingerichtete Internetverbindung.\n"</div><div class='del'>-"Starten Sie den Assistenten „%s“ im Mandrakelinux Kontrollzentrum."</div><div class='add'>+"Starten Sie den Assistenten „%s“ im Mandrivalinux Kontrollzentrum."</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21197,8 +21197,8 @@ msgstr "KDM (KDE Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21497,7 +21497,7 @@ msgstr "Importieren"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21506,7 +21506,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright © 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright © 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (Orginalversion)\n"</div><div class='hunk'>@@ -22059,14 +22059,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright © 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright © 2003-2004 Mandriva.\n"</div><div class='ctx'> "Dies ist freie Software und kann unter der den Bedingungen der GNU GPL "</div><div class='ctx'> "weitergegeben werden.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -22096,8 +22096,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux Hilfezentrum"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux Hilfezentrum"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25649,8 +25649,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux Werkzeugprotokolle"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux Werkzeugprotokolle"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26167,10 +26167,10 @@ msgstr "Verbindung fertiggestellt."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Verbinden fehlgeschlagen.\n"</div><div class='del'>-"Überprüfen Sie Ihre Konfiguration im Mandrakelinux Kontrollzentrum."</div><div class='add'>+"Überprüfen Sie Ihre Konfiguration im Mandrivalinux Kontrollzentrum."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po<br/>index 62d73b948..edd371902 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/el.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/el.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/el.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/el.po</a></div><div class='hunk'>@@ -61,7 +61,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -80,7 +80,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -88,7 +88,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -96,7 +96,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -222,7 +222,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1260,11 +1260,11 @@ msgstr "χειροκίνητα"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Το Mandrakelinux υποστηρίζει πολλαπλές γλώσσες.Επιλέξτε \n"</div><div class='add'>+"Το Mandrivalinux υποστηρίζει πολλαπλές γλώσσες.Επιλέξτε \n"</div><div class='ctx'> "τις άλλες γλώσσες που θα είναι διαθέσιμες μετά το πέρας της \n"</div><div class='ctx'> "εγκατάστασης και την επανεκκίνηση του συστήματός σας."</div><div class='ctx'> </div><div class='hunk'>@@ -3639,7 +3639,7 @@ msgstr "ενεργοποίηση ραδιοφώνου"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3819,13 +3819,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Η εγκατάσταση του Mandrakelinux είναι μοιρασμένο σε αρκετά CD-ROM. Το \n"</div><div class='add'>+"Η εγκατάσταση του Mandrivalinux είναι μοιρασμένο σε αρκετά CD-ROM. Το \n"</div><div class='ctx'> "DrakX ξέρει αν ένα επιλεγμένο πακέτο υπάρχει σε άλλο CD-ROM, θα εξάγει το \n"</div><div class='ctx'> "τρέχον CD και θα ζητήσει να εισάγετε ένα άλλο όταν αυτό θα χρειαστεί."</div><div class='ctx'> </div><div class='hunk'>@@ -3833,11 +3833,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3994,10 +3994,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4179,7 +4179,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4347,12 +4347,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4379,7 +4379,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4388,7 +4388,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4607,7 +4607,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4649,7 +4649,7 @@ msgstr "Προηγούμενο"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4689,7 +4689,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4714,7 +4714,7 @@ msgstr "Διαχειριστής Ασφαλείας:"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4873,7 +4873,7 @@ msgstr "Αλλαγή σε κανονικό τρόπο λειτουργίας"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4950,7 +4950,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4959,13 +4959,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ενεργοποίηση τώρα Linux\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5041,7 +5041,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5277,7 +5277,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5298,7 +5298,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Άλλο\n"</div><div class='hunk'>@@ -5447,7 +5447,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5464,7 +5464,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5526,11 +5526,11 @@ msgstr "Υπηρεσίες"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Επιλέξτε τον δίσκο που θέλετε να διαγράψετε για να εγκαταστήσετε \n"</div><div class='del'>-"την νέα κατάτμηση Mandrakelinux. ΠΡΟΣΟΧΗ: Όλα τα δεδομένα θα διαγραφούν\n"</div><div class='add'>+"την νέα κατάτμηση Mandrivalinux. ΠΡΟΣΟΧΗ: Όλα τα δεδομένα θα διαγραφούν\n"</div><div class='ctx'> "και θα είναι αδύνατη η επαναφορά τους!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -5883,12 +5883,12 @@ msgstr "Υπολογίζεται το μέγεθος της κατάτμησης</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Η κατάτμηση των Windows είναι πολύ κατακερματισμένη, παρακαλώ τρέξτε πρώτα "</div><div class='ctx'> "το ``defrag'' μέσα από τα Windows και ξεκινήστε ξανά την εγκατάσταση του  "</div><div class='del'>-"Mandrakelinux "</div><div class='add'>+"Mandrivalinux "</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6005,19 +6005,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6039,7 +6039,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6047,14 +6047,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6064,7 +6064,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6084,10 +6084,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6098,11 +6098,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6118,7 +6118,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6277,7 +6277,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6285,14 +6285,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Συγχαρητήρια, η εγκατάσταση ολοκληρώθηκε.\n"</div><div class='ctx'> "Αφαιρέστε την δισκέτα ή το CD εκκίνησης και πατήστε return για "</div><div class='ctx'> "επανεκκίνηση.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Για πληροφορίες σχετικά με διορθώσεις αυτής της έκδοσης του Mandrakelinux,\n"</div><div class='add'>+"Για πληροφορίες σχετικά με διορθώσεις αυτής της έκδοσης του Mandrivalinux,\n"</div><div class='ctx'> "συμβουλευτείτε την σελίδα: \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6301,7 +6301,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Πληροφορίες σχετικά με τις ρυθμίσεις του συστήματός σας υπάρχουν στο "</div><div class='ctx'> "σχετικό\n"</div><div class='del'>-"κεφάλαιο του επίσημου οδηγού χρήσης του Mandrakelinux."</div><div class='add'>+"κεφάλαιο του επίσημου οδηγού χρήσης του Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6336,13 +6336,13 @@ msgstr "Βήμα `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Το σύστημά σας δεν έχει αρκετούς πόρους. Μπορεί να αντιμετωπίσετε "</div><div class='ctx'> "προβλήματα\n"</div><div class='del'>-"στην εγκατάσταση του Mandrakelinux. Εάν συμβεί αυτό, μπορείτε να δοκιμάσετε "</div><div class='add'>+"στην εγκατάσταση του Mandrivalinux. Εάν συμβεί αυτό, μπορείτε να δοκιμάσετε "</div><div class='ctx'> "εγκατάσταση κειμένου.\n"</div><div class='ctx'> "Πατήστε F1 κατά την εκκίνηση από CDROM, μετά γράψτε `text'."</div><div class='ctx'> </div><div class='hunk'>@@ -6883,9 +6883,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Σύνδεση με την τοποθεσία της Mandrakelinux για λήψη των διαθέσιμων τόπων "</div><div class='add'>+"Σύνδεση με την τοποθεσία της Mandrivalinux για λήψη των διαθέσιμων τόπων "</div><div class='ctx'> "λήψης..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7107,8 +7107,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Εγκατάσταση Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Εγκατάσταση Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9692,7 +9692,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13573,7 +13573,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15487,18 +15487,18 @@ msgstr "Τερματισμός"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Καλώς Ορίσατε στο &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Καλώς Ορίσατε στο &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15507,7 +15507,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15524,9 +15524,9 @@ msgstr "Καλώς ορίσατε στον κόσμο του Ανοιχτού Κ</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15546,7 +15546,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15572,10 +15572,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15594,8 +15594,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15622,7 +15622,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15632,7 +15632,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15651,13 +15651,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15669,7 +15669,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15683,19 +15683,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "Κέντρο Ελέγχου Mandrakelinux"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "Κέντρο Ελέγχου Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -15716,61 +15716,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15808,7 +15808,7 @@ msgstr "Επιλέξτε το κλειδί κρυπτογράφησης του �</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15829,7 +15829,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15946,7 +15946,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16181,14 +16181,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Κέντρο Ελέγχου Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Κέντρο Ελέγχου Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16210,21 +16210,21 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Online Store&lt;/b&gt;"</div><div class='del'>-msgstr "Κέντρο Ελέγχου Mandrakelinux"</div><div class='add'>+msgstr "Κέντρο Ελέγχου Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16247,20 +16247,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16279,33 +16279,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16328,32 +16328,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16651,8 +16651,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Κέντρο Ελέγχου Mandrakelinux"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Κέντρο Ελέγχου Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -16779,7 +16779,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16846,7 +16846,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -19442,13 +19442,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Εργαλείο Αναφοράς Σφαλμάτων Mandrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Κέντρο Ελέγχου Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Κέντρο Ελέγχου Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19468,8 +19468,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19513,7 +19513,7 @@ msgstr "Οδηγοί Ρύθμισης"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19926,7 +19926,7 @@ msgstr "Ξεκίνησαν στην εκκίνηση"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Η διεπαφή δεν έχει ρυθμιστή ακόμα. \n"</div><div class='ctx'> "Εκτελέστε τον οδηγό ρύθμισης στην κυρίως οθόνη"</div><div class='hunk'>@@ -19935,7 +19935,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Η διεπαφή δεν έχει ρυθμιστή ακόμα. \n"</div><div class='ctx'> "Εκτελέστε τον οδηγό ρύθμισης στην κυρίως οθόνη"</div><div class='hunk'>@@ -19988,7 +19988,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -20287,7 +20287,7 @@ msgstr "Εισαγωγή"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20815,7 +20815,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -20842,7 +20842,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Κέντρο Ελέγχου Mandrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -23797,7 +23797,7 @@ msgid ""</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Αυτό είναι το HardDrake, ένα εργαλείο ρύθμισης της Mandrakelinux\n"</div><div class='add'>+"Αυτό είναι το HardDrake, ένα εργαλείο ρύθμισης της Mandrivalinux\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Έκδοση:&lt;/span&gt; %s\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Δημιουργός:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -23910,7 +23910,7 @@ msgstr "Η αλλαγή έγινε, αλλά για να ισχύσει θα π�</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Επεξήγηση Εργαλείων της Mandrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -24420,10 +24420,10 @@ msgstr "Η σύνδεση έγινε."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Η σύνδεση απέτυχε.\n"</div><div class='del'>-"Επαληθεύστε τις ρυθμίσεις σας στο Κέντρο Ελέγχου Mandrakelinux."</div><div class='add'>+"Επαληθεύστε τις ρυθμίσεις σας στο Κέντρο Ελέγχου Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24658,7 +24658,7 @@ msgstr "Επαναδημιουργία λίστας με τους ρυθμισμ</div><div class='ctx'> #: standalone/scannerdrake:101</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported by this version of %s."</div><div class='del'>-msgstr "Το %s δεν υποστηρίζεται από αυτή την έκδοση του Mandrakelinux."</div><div class='add'>+msgstr "Το %s δεν υποστηρίζεται από αυτή την έκδοση του Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:104</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24699,7 +24699,7 @@ msgstr ""</div><div class='ctx'> #: standalone/scannerdrake:144</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported under Linux."</div><div class='del'>-msgstr "Το %s δεν υποστηρίζεται από αυτή την έκδοση του Mandrakelinux."</div><div class='add'>+msgstr "Το %s δεν υποστηρίζεται από αυτή την έκδοση του Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:171 standalone/scannerdrake:185</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25283,8 +25283,8 @@ msgstr "Η εγκατάσταση απέτυχε"</div><div class='ctx'> #~ msgstr "δεν βρέθηκε καμία γραμματοσειρά\n"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Κέντρο Ελέγχου Mandrakelinux"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Κέντρο Ελέγχου Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Δεν βρέθηκε περιηγητής! Παρακαλώ εγκαταστήστε τον"</div><div class='hunk'>@@ -25784,8 +25784,8 @@ msgstr "Η εγκατάσταση απέτυχε"</div><div class='ctx'> #~ msgid "mkraid failed"</div><div class='ctx'> #~ msgstr "αποτυχία mkraid"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Connection failed.\n"</div><div class='head'>diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po<br/>index 3e3027485..3f7eeeda9 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/eo.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/eo.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/eo.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/eo.po</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> # Esperanto drakbootdisk</div><div class='del'>-# Copyright (C) 2000, 2001 Mandrakesoft</div><div class='add'>+# Copyright (C) 2000, 2001 Mandriva</div><div class='ctx'> # D. Dale Gulledge &lt;dsplat@rochester.rr.com&gt;, 2000.</div><div class='ctx'> #</div><div class='ctx'> msgid ""</div><div class='hunk'>@@ -59,7 +59,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -78,7 +78,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -86,7 +86,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -94,7 +94,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -220,7 +220,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1238,7 +1238,7 @@ msgstr "Mianmaro"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3558,7 +3558,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3668,7 +3668,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3679,11 +3679,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3790,10 +3790,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3918,7 +3918,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4016,12 +4016,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4048,7 +4048,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4057,7 +4057,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4186,7 +4186,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4204,7 +4204,7 @@ msgstr "Antaŭa"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4233,7 +4233,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4249,7 +4249,7 @@ msgstr "Malproksimaj lpd Printilaj Opcioj"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4335,7 +4335,7 @@ msgstr "Ŝanĝu al Normala reĝimo"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4380,7 +4380,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4389,13 +4389,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4436,7 +4436,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4614,7 +4614,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4635,7 +4635,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nun estas tempo por elekti pressistemon por via komputilo. Aliaj mastrum-"</div><div class='hunk'>@@ -4784,7 +4784,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4801,7 +4801,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4863,7 +4863,7 @@ msgstr "Servoj"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5191,7 +5191,7 @@ msgstr "Kalkulante la liberan spacon sur la Vindoza subdisko"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Via Vindoza subdisko estas tro fragmentigata, bonvole uzu ``defrag'' antaŭe"</div><div class='hunk'>@@ -5310,19 +5310,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5344,7 +5344,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5352,14 +5352,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5369,7 +5369,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5389,10 +5389,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5403,11 +5403,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5423,7 +5423,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Enkonduko\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5439,7 +5439,7 @@ msgstr ""</div><div class='ctx'> "1. Licenckonsento \n"</div><div class='ctx'> "Bonvole legu tiun ĉi dokumenton zorge. Tiu ĉi dokumento estas licenckonsento "</div><div class='ctx'> "inter vi kaj\n"</div><div class='del'>-"Mandrakesoft S.A. kiu aplikiĝas al la softvarproduktoj.\n"</div><div class='add'>+"Mandriva S.A. kiu aplikiĝas al la softvarproduktoj.\n"</div><div class='ctx'> "Per instalado, duobligado aŭ uzado de la softvarproduktoj en ajna maniero, "</div><div class='ctx'> "vi eksplicite\n"</div><div class='ctx'> "akceptas kaj plene konsentas agi konforme al la teksto kaj kondiĉoj de tiu "</div><div class='hunk'>@@ -5532,7 +5532,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5540,7 +5540,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5576,7 +5576,7 @@ msgstr "Eniras paŝon `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -6117,7 +6117,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mi kontaktas la Linuks-Mandrakan retpaĝon por havigi la liston de "</div><div class='ctx'> "disponeblaj speguloj..."</div><div class='hunk'>@@ -6333,7 +6333,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr "Linuks-Mandrejka Instalado %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -8907,7 +8907,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12532,7 +12532,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14284,18 +14284,18 @@ msgstr "Haltu"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Bonvenon ĉe &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Bonvenon ĉe &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14304,7 +14304,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14321,9 +14321,9 @@ msgstr "Provu konfiguraĵon"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14343,7 +14343,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14369,10 +14369,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14391,8 +14391,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14419,7 +14419,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14429,7 +14429,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14448,13 +14448,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14466,7 +14466,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14480,19 +14480,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "Konekti al la interreto"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14513,61 +14513,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14605,7 +14605,7 @@ msgstr "&lt;b&gt;Programaj medioj&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14626,7 +14626,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14656,7 +14656,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/15.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Kontact&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/15.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -14743,7 +14743,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14978,14 +14978,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux-Regejo&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux-Regejo&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15007,9 +15007,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15021,7 +15021,7 @@ msgstr "Konekti al la interreto"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15044,20 +15044,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15076,33 +15076,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -15125,32 +15125,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15441,7 +15441,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "Konekti al la interreto"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -15531,8 +15531,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "OPCIOJ:\n"</div><div class='ctx'> "  --help            - montru tiun help-mesaĝon.\n"</div><div class='del'>-"  --report          - programo estu iu de Mandrakelinux iloj\n"</div><div class='del'>-"  --incident        - programo estu iu de Mandrakelinux iloj"</div><div class='add'>+"  --report          - programo estu iu de Mandrivalinux iloj\n"</div><div class='add'>+"  --incident        - programo estu iu de Mandrivalinux iloj"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15579,7 +15579,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15650,14 +15650,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPCIO]...\n"</div><div class='del'>-"  --no-confirmation      ne postulu unue konfirmadon en MandrakeUpdate mode\n"</div><div class='add'>+"  --no-confirmation      ne postulu unue konfirmadon en Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm       ne kontrolu la pakaĵ-subskribojn\n"</div><div class='ctx'> "  --changelog-first      afiŝu changelog antaŭ dosierliston en la priskribo-"</div><div class='ctx'> "fenestro\n"</div><div class='hunk'>@@ -18114,13 +18114,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Konekti al la interreto"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux-Regejo"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux-Regejo"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18140,8 +18140,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -18185,7 +18185,7 @@ msgstr "ISDN-a Konfiguraĵon"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18594,14 +18594,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -18652,7 +18652,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18944,7 +18944,7 @@ msgstr "Importu"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19429,7 +19429,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -19456,7 +19456,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Irigilo por la Mandrajka helpo"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -22438,7 +22438,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Konekti al la interreto"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -22942,7 +22942,7 @@ msgstr "Speco de konekto"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -23773,7 +23773,7 @@ msgstr "Instalado malsukcesis"</div><div class='ctx'> #~ msgstr "Malinstalu printvicon"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='ctx'> #~ msgstr "Konekti al la interreto"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='head'>diff --git a/perl-install/share/po/es.po b/perl-install/share/po/es.po<br/>index df441a12d..30397fc24 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/es.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/es.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/es.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/es.po</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # translation of DrakX-es.po to Español</div><div class='ctx'> # translation of DrakX-es.po to Spanish</div><div class='ctx'> # spanish translation of DrakX</div><div class='del'>-# Copyright (C) 2000, 2001,2002 Mandrakesoft S.A.</div><div class='add'>+# Copyright (C) 2000, 2001,2002 Mandriva S.A.</div><div class='ctx'> # Fabian Mandelbaum &lt;fabman@mandrakesoft.com&gt;, 2000, 2001, 2002,2003, 2004.</div><div class='ctx'> # Fabian Mandelbaum &lt;fmandelbaum@hotmail.com&gt;, 2003, 2004.</div><div class='ctx'> # Pablo Saratxaga &lt;pablo@mandrakesoft.com&gt;, 2004.</div><div class='hunk'>@@ -75,7 +75,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "La llave USB parece tener habilitada la protección contra escritura, pero "</div><div class='ctx'> "ahora\n"</div><div class='hunk'>@@ -83,7 +83,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Haga clic sobre el botón para reiniciar la máquina, desconéctela, quite\n"</div><div class='del'>-"dicha protección, vuelva a conectarla y lance Mandrake Move otra vez."</div><div class='add'>+"dicha protección, vuelva a conectarla y lance Mandriva Move otra vez."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -101,7 +101,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Su llave USB no tiene particiones Windows (FAT) válidas.\n"</div><div class='hunk'>@@ -112,14 +112,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "También puede continuar sin una llave USB - todavía podrá\n"</div><div class='del'>-"utilizar Mandrake Move como un Sistema Operativo\n"</div><div class='del'>-"Mandrakelinux \"en vivo\" normal."</div><div class='add'>+"utilizar Mandriva Move como un Sistema Operativo\n"</div><div class='add'>+"Mandrivalinux \"en vivo\" normal."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -127,11 +127,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "No detectamos llave USB alguna en su sistema. Si conecta\n"</div><div class='del'>-"una llave USB ahora, Mandrake Move podrá guardar los datos\n"</div><div class='add'>+"una llave USB ahora, Mandriva Move podrá guardar los datos\n"</div><div class='ctx'> "en su directorio personal de manera transparente y también\n"</div><div class='ctx'> "la configuración del sistema, para el próximo arranque en esta\n"</div><div class='ctx'> "computadora o en otra. Nota: si conecta una llave ahora, espere\n"</div><div class='hunk'>@@ -139,7 +139,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "También puede continuar sin una llave USB - todavía podrá\n"</div><div class='del'>-"utilizar Mandrake Move como un Sistema Operativo Mandrakelinux \"en vivo\" "</div><div class='add'>+"utilizar Mandriva Move como un Sistema Operativo Mandrivalinux \"en vivo\" "</div><div class='ctx'> "normal."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -268,7 +268,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -284,7 +284,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Se puede deber a archivos de configuración del sistema corruptos\n"</div><div class='ctx'> "en la llave USB, en este caso quitarlos y luego volver a iniciar\n"</div><div class='del'>-"Mandrake Move debería solucionar el problema. Para hacerlo,\n"</div><div class='add'>+"Mandriva Move debería solucionar el problema. Para hacerlo,\n"</div><div class='ctx'> "haga clic sobre el botón correspondiente.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1326,11 +1326,11 @@ msgstr "Selección del idioma"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux puede soportar múltiples idiomas. Seleccione\n"</div><div class='add'>+"Mandrivalinux puede soportar múltiples idiomas. Seleccione\n"</div><div class='ctx'> "los que desea instalar. Los mismos estarán disponibles cuando\n"</div><div class='ctx'> "su instalación esté completa y Usted reinicie su sistema."</div><div class='ctx'> </div><div class='hunk'>@@ -3765,12 +3765,12 @@ msgstr "habilitar el soporte para radio"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Antes de continuar, debería leer cuidadosamente los términos de la\n"</div><div class='del'>-"licencia. La misma cubre a toda la distribución Mandrakelinux. Si está de\n"</div><div class='add'>+"licencia. La misma cubre a toda la distribución Mandrivalinux. Si está de\n"</div><div class='ctx'> "acuerdo con todos los términos en la misma, haga clic en el botón \"%s\".\n"</div><div class='ctx'> "Si no, haga clic en el botón \"%s\" lo que reiniciará su computadora."</div><div class='ctx'> </div><div class='hunk'>@@ -3960,13 +3960,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"La instalación de Mandrakelinux se distribuye en varios CD-ROM. Si un\n"</div><div class='add'>+"La instalación de Mandrivalinux se distribuye en varios CD-ROM. Si un\n"</div><div class='ctx'> "paquete seleccionado se encuentra en otro CD-ROM, DrakX expulsará el CD\n"</div><div class='ctx'> "corriente y le pedirá que inserte el necesario. Si no tiene el CD necesario\n"</div><div class='ctx'> "a mano, simplemente haga clic sobre \"%s\", no se instalarán los paquetes\n"</div><div class='hunk'>@@ -3978,11 +3978,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4034,11 +4034,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ahora es el momento de especificar los programas que desea instalar en su\n"</div><div class='del'>-"sistema. Hay miles de paquetes disponibles para Mandrakelinux, y para hacer\n"</div><div class='add'>+"sistema. Hay miles de paquetes disponibles para Mandrivalinux, y para hacer\n"</div><div class='ctx'> "más simple el manejo de los paquetes, los mismos se han puesto en grupos de\n"</div><div class='ctx'> "aplicaciones similares.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux clasifica los grupos de paquetes en cuatro categorías. Puede\n"</div><div class='add'>+"Mandrivalinux clasifica los grupos de paquetes en cuatro categorías. Puede\n"</div><div class='ctx'> "mezclar y hacer coincidir aplicaciones de varias categorías, por lo que una\n"</div><div class='ctx'> "instalación de \"Estación de trabajo\" puede tener instaladas aplicaciones\n"</div><div class='ctx'> "de la categoría \"Desarrollo\".\n"</div><div class='hunk'>@@ -4146,10 +4146,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4184,11 +4184,11 @@ msgstr ""</div><div class='ctx'> "seleccionó específicamente el paquete individual o porque el mismo era\n"</div><div class='ctx'> "parte de un grupo de paquetes, se le pedirá que confirme que realmente\n"</div><div class='ctx'> "desea que se instalen esos servidores. De manera predeterminada,\n"</div><div class='del'>-"Mandrakelinux iniciará automáticamente todos los servicios instalados al\n"</div><div class='add'>+"Mandrivalinux iniciará automáticamente todos los servicios instalados al\n"</div><div class='ctx'> "momento del arranque. Aunque estos son seguros y no tienen problemas\n"</div><div class='ctx'> "conocidos al momento en que se publicó la distribución, es muy posible que\n"</div><div class='ctx'> "se descubran vulnerabilidades en la seguridad luego que se terminó con esta\n"</div><div class='del'>-"versión de Mandrakelinux. Si no sabe que es lo que se supone que hace un\n"</div><div class='add'>+"versión de Mandrivalinux. Si no sabe que es lo que se supone que hace un\n"</div><div class='ctx'> "servicio o la razón por la cual se está instalando, entonces haga clic\n"</div><div class='ctx'> "sobre \"%s\". Si hace clic sobre \"%s\" se instalarán todos los servicios\n"</div><div class='ctx'> "listados y los mismos se iniciarán automáticamente al momento del arranque.\n"</div><div class='hunk'>@@ -4350,7 +4350,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4406,7 +4406,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (por \"X Window System\") es el corazón de la interfaz gráfica de\n"</div><div class='ctx'> "GNU/Linux en el que se apoyan todos los entornos gráficos (KDE, GNOME,\n"</div><div class='del'>-"AfterStep, WindowMaker, etc.) que se incluyen con Mandrakelinux.\n"</div><div class='add'>+"AfterStep, WindowMaker, etc.) que se incluyen con Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Se le presentará la lista de parámetros diferentes a cambiar para obtener\n"</div><div class='ctx'> "una presentación gráfica óptima.\n"</div><div class='hunk'>@@ -4534,12 +4534,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4566,7 +4566,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4575,7 +4575,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4596,11 +4596,11 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ahora necesita elegir el lugar de su disco rígido donde se instalará su\n"</div><div class='del'>-"sistema operativo Mandrakelinux. Si su disco rígido está vacío o si un\n"</div><div class='add'>+"sistema operativo Mandrivalinux. Si su disco rígido está vacío o si un\n"</div><div class='ctx'> "sistema operativo existente está utilizando todo el espacio disponible,\n"</div><div class='ctx'> "necesitará particionar el disco. Básicamente, particionar un disco rígido\n"</div><div class='ctx'> "consiste en dividirlo lógicamente para crear espacio para instalar su\n"</div><div class='del'>-"sistema Mandrakelinux nuevo.\n"</div><div class='add'>+"sistema Mandrivalinux nuevo.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Debido a que el proceso de particionado de un disco rígido por lo general\n"</div><div class='ctx'> "es irreversible y puede llevar a pérdida de datos, el particionado puede\n"</div><div class='hunk'>@@ -4630,7 +4630,7 @@ msgstr ""</div><div class='ctx'> "realizar sin la pérdida de datos, siempre y cuando Usted haya\n"</div><div class='ctx'> "desfragmentado con anterioridad la partición Windows. Es altamente\n"</div><div class='ctx'> "recomendable hacer una copia de respaldo de sus datos. Se recomienda usar\n"</div><div class='del'>-"esta solución si desea utilizar tanto Mandrakelinux como Microsoft Windows\n"</div><div class='add'>+"esta solución si desea utilizar tanto Mandrivalinux como Microsoft Windows\n"</div><div class='ctx'> "en la misma computadora.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Antes de elegir esta opción, por favor comprenda que después de este\n"</div><div class='hunk'>@@ -4640,7 +4640,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". Si desea borrar todos los datos y todas las particiones\n"</div><div class='ctx'> "presentes en su disco rígido y reemplazarlos con su nuevo sistema\n"</div><div class='del'>-"Mandrakelinux, seleccione esta opción. Tenga cuidado con esta solución ya\n"</div><div class='add'>+"Mandrivalinux, seleccione esta opción. Tenga cuidado con esta solución ya\n"</div><div class='ctx'> "que no podrá revertir su elección después de confirmarla.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! Si elige esta opción, se perderán todos los datos en su disco. !!\n"</div><div class='hunk'>@@ -4805,7 +4805,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4828,7 +4828,7 @@ msgstr ""</div><div class='ctx'> "Haga clic sobre \"%s\" cuando esté listo para formatear las particiones.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Haga clic sobre \"%s\" si desea elegir otra partición para la instalación\n"</div><div class='del'>-"de su sistema operativo Mandrakelinux nuevo.\n"</div><div class='add'>+"de su sistema operativo Mandrivalinux nuevo.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Haga clic sobre \"%s\" si desea seleccionar las particiones del disco en\n"</div><div class='ctx'> "las que se buscarán bloques defectuosos."</div><div class='hunk'>@@ -4847,7 +4847,7 @@ msgstr "Anterior"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4859,7 +4859,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Es probable que cuando instale Mandrakelinux algunos paquetes se hayan\n"</div><div class='add'>+"Es probable que cuando instale Mandrivalinux algunos paquetes se hayan\n"</div><div class='ctx'> "actualizado desde la publicación inicial. Se pueden haber corregido errores\n"</div><div class='ctx'> "y solucionado problemas de seguridad. Para permitir que Usted se beneficie\n"</div><div class='ctx'> "de estas actualizaciones, ahora las puede descargar desde la Internet.\n"</div><div class='hunk'>@@ -4890,7 +4890,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4904,7 +4904,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Si no sabe cual elegir, mantenga la opción predeterminada. Podrá cambiarla\n"</div><div class='ctx'> "más adelante con la herramienta draksec, que es parte del Centro de Control\n"</div><div class='del'>-"de Mandrakelinux.\n"</div><div class='add'>+"de Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Complete el campo \"%s\" con la dirección de correo electrónico de la\n"</div><div class='ctx'> "persona responsable de la seguridad. Los mensajes relativos a la seguridad\n"</div><div class='hunk'>@@ -4921,7 +4921,7 @@ msgstr "Administrador de seguridad"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4992,7 +4992,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ahora necesita elegir qué particiones se utilizarán para la instalación de\n"</div><div class='del'>-"su sistema Mandrakelinux. Si ya se han definido particiones, ya sea por\n"</div><div class='add'>+"su sistema Mandrivalinux. Si ya se han definido particiones, ya sea por\n"</div><div class='ctx'> "una instalación previa de GNU/Linux o con otra herramienta de particionado,\n"</div><div class='ctx'> "puede utilizarlas. De lo contrario, se deben definir particiones en el\n"</div><div class='ctx'> "disco rígido.\n"</div><div class='hunk'>@@ -5086,7 +5086,7 @@ msgstr "Cambiar entre el modo normal/experto"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5116,7 +5116,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Se ha detectado más de una partición Microsoft Windows en su disco rígido.\n"</div><div class='ctx'> "Por favor, elija aquella a la cual desea cambiar el tamaño para poder\n"</div><div class='del'>-"instalar su sistema operativo Mandrakelinux nuevo.\n"</div><div class='add'>+"instalar su sistema operativo Mandrivalinux nuevo.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cada partición se lista como sigue: \"Nombre Linux\", \"Nombre Windows\",\n"</div><div class='ctx'> "\"Capacidad\".\n"</div><div class='hunk'>@@ -5172,7 +5172,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5181,19 +5181,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Este paso se activa sólo si se encontró una partición GNU/Linux existente\n"</div><div class='ctx'> "en su máquina.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX ahora necesita saber si desea realizar una instalación nueva o una\n"</div><div class='del'>-"actualización de un sistema Mandrakelinux existente:\n"</div><div class='add'>+"actualización de un sistema Mandrivalinux existente:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". En gran parte, esta opción borrará por completo el sistema\n"</div><div class='ctx'> "anterior. Sin embargo, dependiendo de su esquema de particiones, puede\n"</div><div class='hunk'>@@ -5202,15 +5202,15 @@ msgstr ""</div><div class='ctx'> "particionan sus discos, debería usar esta opción.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Esta clase de instalación le permite actualizar los paquetes que\n"</div><div class='del'>-"en este momento están instalados en su sistema Mandrakelinux. No se alteran\n"</div><div class='add'>+"en este momento están instalados en su sistema Mandrivalinux. No se alteran\n"</div><div class='ctx'> "las particiones corrientes de sus discos ni los datos de los usuarios. La\n"</div><div class='ctx'> "mayoría de los otros pasos de configuración permanecen disponibles y son\n"</div><div class='ctx'> "similares a una instalación estándar.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "El uso de la opción \"Actualizar\" debería funcionar sin problemas para los\n"</div><div class='del'>-"sistemas Mandrakelinux que corren la versión \"8.1\" o una posterior. No se\n"</div><div class='add'>+"sistemas Mandrivalinux que corren la versión \"8.1\" o una posterior. No se\n"</div><div class='ctx'> "recomienda realizar una actualización sobre versiones anteriores a\n"</div><div class='del'>-"Mandrakelinux versión \"8.1\"."</div><div class='add'>+"Mandrivalinux versión \"8.1\"."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml</div><div class='hunk'>@@ -5271,7 +5271,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5312,7 +5312,7 @@ msgstr ""</div><div class='ctx'> "Acerca del soporte UTF-8 (Unicode): Unicode es una codificación nueva de\n"</div><div class='ctx'> "caracteres que pretende cubrir todos los idiomas existentes. Sin embargo,\n"</div><div class='ctx'> "el soporte completo para Unicode bajo GNU/Linux todavía está en desarrollo.\n"</div><div class='del'>-"Por esta razón, Mandrakelinux lo usará o no dependiendo de las elecciones\n"</div><div class='add'>+"Por esta razón, Mandrivalinux lo usará o no dependiendo de las elecciones\n"</div><div class='ctx'> "del usuario:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Si elige un idioma con codificación legada fuerte (idiomas latin1, ruso,\n"</div><div class='hunk'>@@ -5572,7 +5572,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5593,12 +5593,12 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ahora es el momento de seleccionar un sistema de impresión para su\n"</div><div class='ctx'> "computadora. Otros sistemas operativos pueden ofrecerle uno, pero\n"</div><div class='del'>-"Mandrakelinux le ofrece dos. Cada uno de los sistemas de impresión es más\n"</div><div class='add'>+"Mandrivalinux le ofrece dos. Cada uno de los sistemas de impresión es más\n"</div><div class='ctx'> "adecuado para tipos de configuración particulares.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" - \"print, do not queue\" (imprimir sin poner en cola) es la\n"</div><div class='hunk'>@@ -5621,7 +5621,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Si hace una elección ahora y más tarde encuentra que a Usted no le gusta su\n"</div><div class='ctx'> "sistema de impresión, puede cambiarlo ejecutando PrinterDrake desde el\n"</div><div class='del'>-"Centro de Control de Mandrakelinux y haciendo clic sobre el botón \"%s\"."</div><div class='add'>+"Centro de Control de Mandrivalinux y haciendo clic sobre el botón \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5747,7 +5747,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5764,7 +5764,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5816,7 +5816,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": si desea configurar ahora el acceso a la Internet o a su red\n"</div><div class='ctx'> "local, puede hacerlo ahora. Consulte la documentación impresa o utilice el\n"</div><div class='del'>-"Centro de Control de Mandrakelinux luego que finalizó la instalación para\n"</div><div class='add'>+"Centro de Control de Mandrivalinux luego que finalizó la instalación para\n"</div><div class='ctx'> "aprovechar la ayuda en línea completa.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": permite configurar las direcciones de los proxy HTTP y FTP si la\n"</div><div class='hunk'>@@ -5835,7 +5835,7 @@ msgstr ""</div><div class='ctx'> "haga clic sobre este botón. Esto debería estar reservado para los usuarios\n"</div><div class='ctx'> "avanzados. Consulte la documentación impresa o la ayuda en línea acerca de\n"</div><div class='ctx'> "la configuración del cargador de arranque en el Centro de Control de\n"</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": por medio de esta entrada podrá tener un control fino sobre qué\n"</div><div class='ctx'> "servicios correrán en su máquina. Si planifica utilizar esta máquina como\n"</div><div class='hunk'>@@ -5898,11 +5898,11 @@ msgstr "Servicios"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Elija la unidad de disco que desea borrar para instalar su partición\n"</div><div class='del'>-"Mandrakelinux nueva. Tenga cuidado, ¡se perderán todos los datos presentes\n"</div><div class='add'>+"Mandrivalinux nueva. Tenga cuidado, ¡se perderán todos los datos presentes\n"</div><div class='ctx'> "en dicha unidad de disco y no se podrán recuperar!."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -6261,7 +6261,7 @@ msgstr "Calculando el espacio de la partición Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Su partición Windows está muy fragmentada, por favor primero ejecute \"defrag"</div><div class='hunk'>@@ -6385,19 +6385,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6419,7 +6419,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6427,14 +6427,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6444,7 +6444,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6464,10 +6464,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6478,11 +6478,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6498,7 +6498,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "EL PRESENTE TEXTO ES UNA TRADUCCIÓN A PROPÓSITO EXCLUSIVAMENTE\n"</div><div class='ctx'> "INFORMATIVO DE LOS TÉRMINOS DE LA LICENCIA DE MANDRAKELINUX. EN\n"</div><div class='hunk'>@@ -6511,18 +6511,18 @@ msgstr ""</div><div class='ctx'> "Introducción\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "El sistema operativo y los diferentes componentes disponibles en\n"</div><div class='del'>-"la distribución Mandrakelinux se denominarán \"Productos Software\"\n"</div><div class='add'>+"la distribución Mandrivalinux se denominarán \"Productos Software\"\n"</div><div class='ctx'> "en adelante.\n"</div><div class='ctx'> "Los Productos Software incluyen, pero no están restringidos a,\n"</div><div class='ctx'> "el conjunto de programas, métodos, reglas y documentación\n"</div><div class='ctx'> "relativas al sistema operativo y a los diferentes componentes de la\n"</div><div class='del'>-"distribución Mandrakelinux.\n"</div><div class='add'>+"distribución Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Acuerdo de Licencia\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Por favor, lea con cuidado este documento. El mismo constituye un\n"</div><div class='del'>-"contrato de licencia entre Usted y Mandrakesoft S.A. que se aplica\n"</div><div class='add'>+"contrato de licencia entre Usted y Mandriva S.A. que se aplica\n"</div><div class='ctx'> " a los Productos Software.\n"</div><div class='ctx'> "El hecho de instalar, duplicar o usar los Productos Software de\n"</div><div class='ctx'> "cualquier manera, indica que acepta explícitamente, y está de acuerdo\n"</div><div class='hunk'>@@ -6542,7 +6542,7 @@ msgstr ""</div><div class='ctx'> "Los Productos Software y la documentación que los acompaña se\n"</div><div class='ctx'> "proporcionan \"tal cual\", sin garantía alguna hasta donde lo permita la "</div><div class='ctx'> "ley.\n"</div><div class='del'>-"Mandrakesoft S.A. no se responsabilizará, bajo circunstancia alguna,\n"</div><div class='add'>+"Mandriva S.A. no se responsabilizará, bajo circunstancia alguna,\n"</div><div class='ctx'> "y hasta donde lo permita la ley, por cualquier daño directo o indirecto,\n"</div><div class='ctx'> "especial o accesorio, de cualquier naturaleza (incluyendo\n"</div><div class='ctx'> "sin limitación daños por pérdidas de beneficios, interrupción de\n"</div><div class='hunk'>@@ -6550,13 +6550,13 @@ msgstr ""</div><div class='ctx'> "costas legales y penalidades resultantes de un juicio en la corte,\n"</div><div class='ctx'> " o cualquier pérdida consecuente)\n"</div><div class='ctx'> "que resulte del uso o de la incapacidad de uso de los\n"</div><div class='del'>-"Productos Software, incluso si Mandrakesoft S.A. hubiera sido informada\n"</div><div class='add'>+"Productos Software, incluso si Mandriva S.A. hubiera sido informada\n"</div><div class='ctx'> "de la posibilidad de ocurrencia de tales daños.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "ADVERTENCIA EN CUANTO A LA POSESIÓN O USO DE PROGRAMAS PROHIBIDOS\n"</div><div class='ctx'> "EN CIERTOS PAÍSES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Dentro de lo que permita la ley, Mandrakesoft S.A. ni sus proveedores\n"</div><div class='add'>+"Dentro de lo que permita la ley, Mandriva S.A. ni sus proveedores\n"</div><div class='ctx'> "podrán ser responsabilizados en circunstancia alguna por un perjuicio\n"</div><div class='ctx'> "especial, directo, indirecto o accesorio, de cualquier naturaleza\n"</div><div class='ctx'> "(incluyendo sin limitación daños por pérdidas de beneficio, interrupción\n"</div><div class='hunk'>@@ -6565,7 +6565,7 @@ msgstr ""</div><div class='ctx'> "de un juicio en la corte, o cualquier pérdida consecuente) como\n"</div><div class='ctx'> "consecuencia de la posesión y el uso de los componentes software\n"</div><div class='ctx'> "o como consecuencia de la descarga de los componentes\n"</div><div class='del'>-"software desde alguno de los sitios Mandrakelinux, los cuales están\n"</div><div class='add'>+"software desde alguno de los sitios Mandrivalinux, los cuales están\n"</div><div class='ctx'> "prohibidos o restringidos en algunos países por las leyes locales.\n"</div><div class='ctx'> "Esta responsabilidad limitada se aplica, pero no esta limitada, a los\n"</div><div class='ctx'> "componentes de criptografía fuerte incluídos en los Productos Software.\n"</div><div class='hunk'>@@ -6584,9 +6584,9 @@ msgstr ""</div><div class='ctx'> "términos y condiciones de las licencias que acompañan a cada uno de\n"</div><div class='ctx'> "ellos antes de usarlos. Toda pregunta relativa a la licencia de un\n"</div><div class='ctx'> "componente se debe dirigir al autor (o su representante) de dicho\n"</div><div class='del'>-"componente, y no a Mandrakesoft.  Los programas desarrollados\n"</div><div class='del'>-"por Mandrakesoft están sometidos a la licencia GPL.  La documentación\n"</div><div class='del'>-"escrita por Mandrakesoft está sometida a una licencia especifica.\n"</div><div class='add'>+"componente, y no a Mandriva.  Los programas desarrollados\n"</div><div class='add'>+"por Mandriva están sometidos a la licencia GPL.  La documentación\n"</div><div class='add'>+"escrita por Mandriva está sometida a una licencia especifica.\n"</div><div class='ctx'> "Por favor, consulte la documentación para obtener más detalles.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6596,11 +6596,11 @@ msgstr ""</div><div class='ctx'> "pertenecen a sus autores respectivos y están protegidos por la ley\n"</div><div class='ctx'> "de propiedad intelectual y de copyright aplicables a los programas\n"</div><div class='ctx'> "de software.\n"</div><div class='del'>-"Mandrakesoft S.A. se reserva el derecho de modificar o adaptar los\n"</div><div class='add'>+"Mandriva S.A. se reserva el derecho de modificar o adaptar los\n"</div><div class='ctx'> "Productos Software, como un todo o en parte, por todos los medios\n"</div><div class='ctx'> "y para cualquier propósito.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" y los logos asociados están registrados\n"</div><div class='del'>-"por Mandrakesoft S.A.\n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" y los logos asociados están registrados\n"</div><div class='add'>+"por Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Disposiciones diversas\n"</div><div class='hunk'>@@ -6616,7 +6616,7 @@ msgstr ""</div><div class='ctx'> "la disputa será tramitada en la Corte de Ley correspondiente de\n"</div><div class='ctx'> "París, Francia.\n"</div><div class='ctx'> "Para cualquier pregunta relacionada con este documento, por favor,\n"</div><div class='del'>-"póngase en contacto con Mandrakesoft S.A.\n"</div><div class='add'>+"póngase en contacto con Mandriva S.A.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6715,7 +6715,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6723,14 +6723,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Felicidades, la instalación está completa.\n"</div><div class='ctx'> "Extraiga el soporte de arranque y presione Intro para reiniciar.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Para obtener información sobre correcciones disponibles para esta versión\n"</div><div class='del'>-"de Mandrakelinux, consulte el archivo de erratas disponible en\n"</div><div class='add'>+"de Mandrivalinux, consulte el archivo de erratas disponible en\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='hunk'>@@ -6738,7 +6738,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Hay información disponible sobre cómo configurar su sistema en el capítulo "</div><div class='ctx'> "de\n"</div><div class='del'>-"configuración tras la instalación de la Guía del Usuario de Mandrakelinux "</div><div class='add'>+"configuración tras la instalación de la Guía del Usuario de Mandrivalinux "</div><div class='ctx'> "oficial."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6774,12 +6774,12 @@ msgstr "Entrando en la etapa '%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Su sistema tiene pocos recursos. Puede tener algún problema instalando\n"</div><div class='del'>-"Mandrakelinux. Si eso ocurre, puede intentar una instalación tipo texto.\n"</div><div class='add'>+"Mandrivalinux. Si eso ocurre, puede intentar una instalación tipo texto.\n"</div><div class='ctx'> "Para ello, presione 'F1' cuando arranque desde el CDROM, e introduzca 'text'."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_gtk.pm:228 install_steps_interactive.pm:624</div><div class='hunk'>@@ -7323,9 +7323,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Contactando con el sitio web de Mandrakelinux para obtener la lista de las "</div><div class='add'>+"Contactando con el sitio web de Mandrivalinux para obtener la lista de las "</div><div class='ctx'> "réplicas disponibles"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7553,8 +7553,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Instalación %s de Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Instalación %s de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10143,13 +10143,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "configurador de drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Esto configura un cortafuegos personal para esta máquina Mandrakelinux.\n"</div><div class='add'>+"Esto configura un cortafuegos personal para esta máquina Mandrivalinux.\n"</div><div class='ctx'> "Para una solución potente de cortafuegos dedicada, por favor eche un "</div><div class='ctx'> "vistazo\n"</div><div class='ctx'> "a la distribución especializada MandrakeSecurity Firewall."</div><div class='hunk'>@@ -14253,12 +14253,12 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ejecute Scannerdrake (Hardware/Escáner en en Centro de Control de "</div><div class='del'>-"Mandrakelinux) para compartir su escáner en la red.\n"</div><div class='add'>+"Mandrivalinux) para compartir su escáner en la red.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='ctx'> #: printer/printerdrake.pm:3933</div><div class='hunk'>@@ -16230,23 +16230,23 @@ msgstr "Parar"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;¿Qué es Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;¿Qué es Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "¡Bienvenido a &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "¡Bienvenido a &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux es una &lt;b&gt;distribución Linux&lt;/b&gt; que incluye la base del "</div><div class='add'>+"Mandrivalinux es una &lt;b&gt;distribución Linux&lt;/b&gt; que incluye la base del "</div><div class='ctx'> "sistema, llamado el &lt;b&gt;sistema operativo&lt;/b&gt; (basado en el núcleo Linux) así "</div><div class='ctx'> "como &lt;b&gt;una gran cantidad de programas&lt;/b&gt; que cubren todas las cosas que le "</div><div class='ctx'> "gustaría hacer."</div><div class='hunk'>@@ -16254,11 +16254,11 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux es la distribución más &lt;b&gt;amigable&lt;/b&gt; hoy en día. "</div><div class='del'>-"¡Mandrakelinux es también una de las distribuciones Linux &lt;b&gt;más usadas&lt;/b&gt; "</div><div class='add'>+"Mandrivalinux es la distribución más &lt;b&gt;amigable&lt;/b&gt; hoy en día. "</div><div class='add'>+"¡Mandrivalinux es también una de las distribuciones Linux &lt;b&gt;más usadas&lt;/b&gt; "</div><div class='ctx'> "en todo el mundo!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16274,15 +16274,15 @@ msgstr "¡Bienvenido al &lt;b&gt;mundo del Código Abierto&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux está comprometido con el modelo Open Source. Ello significa "</div><div class='add'>+"Mandrivalinux está comprometido con el modelo Open Source. Ello significa "</div><div class='ctx'> "que esta nueva versión es el resultado de la &lt;b&gt;colaboración&lt;/b&gt; entre el "</div><div class='del'>-"&lt;b&gt;equipo de desarrolladores de Mandrakesoft&lt;/b&gt; y la &lt;b&gt;comunidad mundial&lt;/"</div><div class='del'>-"b&gt; de contribuyentes de Mandrakelinux."</div><div class='add'>+"&lt;b&gt;equipo de desarrolladores de Mandriva&lt;/b&gt; y la &lt;b&gt;comunidad mundial&lt;/"</div><div class='add'>+"b&gt; de contribuyentes de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16302,10 +16302,10 @@ msgstr "&lt;b&gt;La GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "La mayoría de los programas incluidos en esta distribución, así como todas "</div><div class='del'>-"las herramientas de Mandrakelinux están bajo la &lt;b&gt;Licencia Pública General "</div><div class='add'>+"las herramientas de Mandrivalinux están bajo la &lt;b&gt;Licencia Pública General "</div><div class='ctx'> "(GPL)&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16338,15 +16338,15 @@ msgstr "&lt;b&gt;¡Únase a la comunidad!&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux posee una de las &lt;b&gt;mayores comunidades&lt;/b&gt; de usuarios y "</div><div class='add'>+"Mandrivalinux posee una de las &lt;b&gt;mayores comunidades&lt;/b&gt; de usuarios y "</div><div class='ctx'> "desarrolladores. El rol de dicha comunidad es muy amplio, yendo de las "</div><div class='ctx'> "notificaciones de errores al desarrollo de nuevos programas. La comunidad "</div><div class='del'>-"juega un &lt;b&gt;papel clave&lt;/b&gt; en el mundo de Mandrakelinux."</div><div class='add'>+"juega un &lt;b&gt;papel clave&lt;/b&gt; en el mundo de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16367,11 +16367,11 @@ msgstr "&lt;b&gt;Versión de descarga&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Instalando &lt;b&gt;Mandrakelinux \"Download\"&lt;/b&gt;. Esta es la versión gratuita "</div><div class='del'>-"que Mandrakesoft desea mantener &lt;b&gt;disponible a todo el mundo&lt;/b&gt;."</div><div class='add'>+"Instalando &lt;b&gt;Mandrivalinux \"Download\"&lt;/b&gt;. Esta es la versión gratuita "</div><div class='add'>+"que Mandriva desea mantener &lt;b&gt;disponible a todo el mundo&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16403,10 +16403,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tampoco tendrá acceso a los &lt;b&gt;servicios incluidos&lt;/b&gt; en los otros "</div><div class='del'>-"productos de Mandrakesoft."</div><div class='add'>+"productos de Mandriva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16415,8 +16415,8 @@ msgstr "&lt;b&gt;Discovery, Su primer escritorio Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Instalando &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Instalando &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16438,13 +16438,13 @@ msgstr "&lt;b&gt;PowerPack, lo último en el escritorio Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Instalando &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Instalando &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16459,8 +16459,8 @@ msgstr "&lt;b&gt;PowerPack+, La solución Linux para escritorios y servidores&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Ya está instalando &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Ya está instalando &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16476,22 +16476,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Productos Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Productos Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; ha desarrollado una amplia gama de productos "</div><div class='del'>-"&lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; ha desarrollado una amplia gama de productos "</div><div class='add'>+"&lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Los productos Mandrakelinux son:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Los productos Mandrivalinux son:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16511,76 +16511,76 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, La solución Linux para escritorio y servidor."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux para x86-64&lt;/b&gt;, La solución de Mandrakelinux para dar "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux para x86-64&lt;/b&gt;, La solución de Mandrivalinux para dar "</div><div class='ctx'> "lo mejor de su procesador de 64 bits."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Productos Mandrakesoft (Productos Nómada)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Productos Mandriva (Productos Nómada)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft ha desarrollado dos productos que le permiten usar "</div><div class='del'>-"Mandrakelinux &lt;b&gt;en cualquier ordenador&lt;/b&gt; sin necesidad de instalación."</div><div class='add'>+"Mandriva ha desarrollado dos productos que le permiten usar "</div><div class='add'>+"Mandrivalinux &lt;b&gt;en cualquier ordenador&lt;/b&gt; sin necesidad de instalación."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, una distribución de Mandrakelinux que se ejecuta de forma "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, una distribución de Mandrivalinux que se ejecuta de forma "</div><div class='ctx'> "completa desde una CD-ROM autoarrancable."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Trotamundo («GlobeTrotter»)&lt;/b&gt;, es una distribución Mandrakelinux "</div><div class='add'>+"\t* &lt;b&gt;Trotamundo («GlobeTrotter»)&lt;/b&gt;, es una distribución Mandrivalinux "</div><div class='ctx'> "preinstalada en el disco duro ultra-compacto  “LaCie Mobile Hard Drive”."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Productos Mandrakesoft (Soluciones Profesionales)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Productos Mandriva (Soluciones Profesionales)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Abajo están los productos de Mandrakesoft diseñados para cubrir las "</div><div class='add'>+"Abajo están los productos de Mandriva diseñados para cubrir las "</div><div class='ctx'> "&lt;b&gt;necesidades profesionales&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, El escritorio empresarial de Mandrakelinux."</div><div class='add'>+"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, El escritorio empresarial de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Corporate Server&lt;/b&gt;, La solución para servidor de Mandrakelinux."</div><div class='add'>+"\t* &lt;b&gt;Corporate Server&lt;/b&gt;, La solución para servidor de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, La solución para la seguridad de "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16624,10 +16624,10 @@ msgstr "&lt;b&gt;¡Elija su entorno gráfico de escritorio favorito!&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Con PowerPack+, tendrá la oportunidad de un &lt;b&gt;entorno gráfico de "</div><div class='del'>-"escritorio&lt;/b&gt;. Mandrakesoft ha elegido &lt;b&gt;KDE&lt;/b&gt; como predeterminado."</div><div class='add'>+"escritorio&lt;/b&gt;. Mandriva ha elegido &lt;b&gt;KDE&lt;/b&gt; como predeterminado."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16652,10 +16652,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Con PowerPack+, tendrá la oportunidad de un &lt;b&gt;entorno gráfico de "</div><div class='del'>-"escritorio&lt;/b&gt;. Mandrakesoft ha elegido &lt;b&gt;KDE&lt;/b&gt; como predeterminado."</div><div class='add'>+"escritorio&lt;/b&gt;. Mandriva ha elegido &lt;b&gt;KDE&lt;/b&gt; como predeterminado."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16783,10 +16783,10 @@ msgstr "&lt;b&gt;Aprecie la amplia gama de programas&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"En el menú Mandrakelinux encontrará aplicaciones &lt;b&gt;fáciles de usar&lt;/b&gt; para "</div><div class='add'>+"En el menú Mandrivalinux encontrará aplicaciones &lt;b&gt;fáciles de usar&lt;/b&gt; para "</div><div class='ctx'> "&lt;b&gt;todas sus tareas&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -17056,18 +17056,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Centro de control de Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Centro de control de Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"El &lt;b&gt;Centro de Control de Mandrakelinux&lt;/b&gt; es una colección esencial de "</div><div class='del'>-"utilitarios específicos de Mandrakelinux para simplificar la configuración "</div><div class='add'>+"El &lt;b&gt;Centro de Control de Mandrivalinux&lt;/b&gt; es una colección esencial de "</div><div class='add'>+"utilitarios específicos de Mandrivalinux para simplificar la configuración "</div><div class='ctx'> "de su computadora."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -17092,16 +17092,16 @@ msgstr "&lt;b&gt;El modelo de Código Abierto&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Como todos los programas de ordenador, el software de código abierto "</div><div class='ctx'> "&lt;b&gt;requiere tiempo y personas&lt;/b&gt; para su desarrollo. Para continuar la "</div><div class='del'>-"filosofía del código abierto, Mandrakesoft vende productos de valor añadido "</div><div class='del'>-"y servicios para &lt;b&gt;seguir mejorando Mandrakelinux&lt;/b&gt;. Si desea &lt;b&gt;apoyar a "</div><div class='del'>-"la filosofía de código abierto&lt;/b&gt; y al desarrollo de Mandrakelinux, &lt;b&gt;por "</div><div class='add'>+"filosofía del código abierto, Mandriva vende productos de valor añadido "</div><div class='add'>+"y servicios para &lt;b&gt;seguir mejorando Mandrivalinux&lt;/b&gt;. Si desea &lt;b&gt;apoyar a "</div><div class='add'>+"la filosofía de código abierto&lt;/b&gt; y al desarrollo de Mandrivalinux, &lt;b&gt;por "</div><div class='ctx'> "favor&lt;/b&gt;, ¡considere el comprar uno de nuestros productos o servicios!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -17112,11 +17112,11 @@ msgstr "&lt;b&gt;Tienda en línea&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Para saber más sobre todos los productos y servicios Mandrakesoft, visite "</div><div class='del'>-"&lt;b&gt;Mandrakestore&lt;/b&gt;, nuestra plataforma completa de servicios e-commerce."</div><div class='add'>+"Para saber más sobre todos los productos y servicios Mandriva, visite "</div><div class='add'>+"&lt;b&gt;Mandriva Store&lt;/b&gt;, nuestra plataforma completa de servicios e-commerce."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17140,25 +17140,25 @@ msgstr "Visítela hoy mismo en &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; es el &lt;b&gt;compañero perfecto&lt;/b&gt; de su producto "</div><div class='del'>-"Mandrakelinux ..."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; es el &lt;b&gt;compañero perfecto&lt;/b&gt; de su producto "</div><div class='add'>+"Mandrivalinux ..."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Aproveche &lt;b&gt;beneficios, productos y servicios valiosos&lt;/b&gt; uniéndose a "</div><div class='del'>-"Mandrakeclub, tales como:"</div><div class='add'>+"Mandriva Club, tales como:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17180,40 +17180,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Participar en los &lt;b&gt;foros de usuarios&lt;/b&gt; de Mandrakelinux."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Participar en los &lt;b&gt;foros de usuarios&lt;/b&gt; de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Acceso privilegiado y con anterioridad&lt;/b&gt;, antes del lanzamiento "</div><div class='del'>-"público, de las &lt;b&gt;imágenes ISO&lt;/b&gt; de Mandrakelinux ."</div><div class='add'>+"público, de las &lt;b&gt;imágenes ISO&lt;/b&gt; de Mandrivalinux ."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"¡&lt;b&gt;Mandrakeonline&lt;/b&gt; es un nuevo servicio premium que Mandrakesoft está "</div><div class='add'>+"¡&lt;b&gt;Mandriva Online&lt;/b&gt; es un nuevo servicio premium que Mandriva está "</div><div class='ctx'> "orgulloso de ofrecer a sus clientes!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline aporta un amplio espectro de valiosos servicios para la "</div><div class='del'>-"&lt;b&gt;fácil actualización&lt;/b&gt; de sus sistemas Mandrakelinux:"</div><div class='add'>+"Mandriva Online aporta un amplio espectro de valiosos servicios para la "</div><div class='add'>+"&lt;b&gt;fácil actualización&lt;/b&gt; de sus sistemas Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17239,40 +17239,40 @@ msgstr "\t* Flexibilidad en la &lt;b&gt;programación&lt;/b&gt;de actualizaciones."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Gestión de &lt;b&gt;todos sus sistemas Mandrakelinux&lt;/b&gt; con una única cuenta."</div><div class='add'>+"\t* Gestión de &lt;b&gt;todos sus sistemas Mandrivalinux&lt;/b&gt; con una única cuenta."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"¿Necesita &lt;b&gt;ayuda?&lt;/b&gt; Encuentre técnicos expertos de Mandrakesoft "</div><div class='add'>+"¿Necesita &lt;b&gt;ayuda?&lt;/b&gt; Encuentre técnicos expertos de Mandriva "</div><div class='ctx'> "en&lt;b&gt;nuestra plataforma de soporte técnico&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Gracias a la ayuda de &lt;b&gt;expertos cualificado en Mandrakelinux&lt;/b&gt;, ahorrará "</div><div class='add'>+"Gracias a la ayuda de &lt;b&gt;expertos cualificado en Mandrivalinux&lt;/b&gt;, ahorrará "</div><div class='ctx'> "mucho tiempo."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Para cualquier pregunta relacionada con Mandrakelinux, tiene la posibilidad "</div><div class='add'>+"Para cualquier pregunta relacionada con Mandrivalinux, tiene la posibilidad "</div><div class='ctx'> "de adquirir soporte de incidentes en &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17573,8 +17573,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Asistentes de Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Asistentes de Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17727,7 +17727,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17741,7 +17741,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPCIONES]...\n"</div><div class='del'>-"Configurador del Servidor de Terminales de Mandrakelinux\n"</div><div class='add'>+"Configurador del Servidor de Terminales de Mandrivalinux\n"</div><div class='ctx'> "--enable         : habilitar MTS\n"</div><div class='ctx'> "--disable        : deshabilitar MTS\n"</div><div class='ctx'> "--start          : iniciar MTS\n"</div><div class='hunk'>@@ -17799,14 +17799,14 @@ msgstr "[--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPCIÓN]...\n"</div><div class='del'>-"  --no-confirmation     no pedir confirmación en modo MandrakeUpdate\n"</div><div class='add'>+"  --no-confirmation     no pedir confirmación en modo Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm       no verificar firmas de los paquetes\n"</div><div class='ctx'> "  --changelog-first     mostrar changelog antes de lista de archivos en "</div><div class='ctx'> "ventana de descripción\n"</div><div class='hunk'>@@ -20599,13 +20599,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Herramienta de Reporte de Errores de Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Herramienta de Reporte de Errores de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Centro de control de Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Centro de control de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20625,8 +20625,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20670,8 +20670,8 @@ msgstr "Asistentes de configuración"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Seleccione la herramienta Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Seleccione la herramienta Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21098,20 +21098,20 @@ msgstr "Iniciado al arranque"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Todavía no se ha configurado esta interfaz.\n"</div><div class='ctx'> "Lance el asistente \"Añadir una interfaz\" desde el Centro de Control de "</div><div class='del'>-"Mandrakelinux"</div><div class='add'>+"Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Todavía no tiene ninguna conexión a Internet configurada.\n"</div><div class='del'>-"Lance el asistente \"%s\" desde el Centro de Control de Mandrakelinux"</div><div class='add'>+"Lance el asistente \"%s\" desde el Centro de Control de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21161,8 +21161,8 @@ msgstr "XDM (administrador de conexión KDE)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "XDM (administrador de conexión Mandrakelinux)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "XDM (administrador de conexión Mandrivalinux)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21463,7 +21463,7 @@ msgstr "Importar"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21472,7 +21472,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 por Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 por Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (versión original)\n"</div><div class='hunk'>@@ -22025,14 +22025,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Esto es software libre y puede redistribuirse bajo los términos de la GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -22062,8 +22062,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Centro de ayuda de Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Centro de ayuda de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25607,8 +25607,8 @@ msgstr "Se ha realizado el cambio, pero no se hará efectivo hasta que salga"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Registros de las Herramientas Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Registros de las Herramientas Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26131,10 +26131,10 @@ msgstr "Conexión completa."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Falló la conexión.\n"</div><div class='del'>-"Verifique su configuración en el Centro de Control de Mandrakelinux."</div><div class='add'>+"Verifique su configuración en el Centro de Control de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po<br/>index e30a7dad6..3d4181888 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/et.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/et.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/et.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/et.po</a></div><div class='hunk'>@@ -68,7 +68,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB mälupulk paistab olevat kirjutuskaitsega, kuid praegu ei tundu\n"</div><div class='ctx'> "olevat turvalist võimalust seda lahti ühendada.\n"</div><div class='hunk'>@@ -94,7 +94,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Teie USB mälupulgal pole ühtki sobivat Windows (FAT) partitsiooni.\n"</div><div class='hunk'>@@ -105,14 +105,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Võite muidugi jätkata ka ilma USB mälupulgata - ka sel\n"</div><div class='del'>-"juhul on Teil võimalik kasutada Mandrake Move'i kui\n"</div><div class='add'>+"juhul on Teil võimalik kasutada Mandriva Move'i kui\n"</div><div class='ctx'> "tavalist Mandrake operatsioonisüsteemi."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -120,11 +120,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Teie süsteemist ei suudetud leida ühtki USB mälupulka.\n"</div><div class='del'>-"Kui ühendate USB mälupulga nüüd, võib Mandrake Move\n"</div><div class='add'>+"Kui ühendate USB mälupulga nüüd, võib Mandriva Move\n"</div><div class='ctx'> "salvestada läbipaistvalt Teie kodukataloogi andmed ning\n"</div><div class='ctx'> "süsteemse seadistuse järgmiseks alglaadimiseks selles\n"</div><div class='ctx'> "või mõnes muus arvutis. Märkus: kui ühendate mälupulga\n"</div><div class='hunk'>@@ -133,7 +133,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Võite muidugi jätkata ka ilma USB mälupulgata - ka sel\n"</div><div class='del'>-"juhul on Teil võimalik kasutada Mandrake Move'i kui\n"</div><div class='add'>+"juhul on Teil võimalik kasutada Mandriva Move'i kui\n"</div><div class='ctx'> "tavalist Mandrake operatsioonisüsteemi."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -258,7 +258,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -274,7 +274,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Selle põhjus võib olla vigaste süsteemsete seadistusfailide\n"</div><div class='ctx'> "olemasolu USB mälupulgal, millisel juhul eemaldage failid ja\n"</div><div class='del'>-"taaskäivitage Mandrake Move, mis peaks asjad korda tegema.\n"</div><div class='add'>+"taaskäivitage Mandriva Move, mis peaks asjad korda tegema.\n"</div><div class='ctx'> "Selleks klõpsake vastaval nupul.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1307,11 +1307,11 @@ msgstr "Keelevalik"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux toetab paljusid keeli. Valige keeled, mida\n"</div><div class='add'>+"Mandrivalinux toetab paljusid keeli. Valige keeled, mida\n"</div><div class='ctx'> "soovite paigaldada. Kui paigaldamine on lõpetatud ja Te teete\n"</div><div class='ctx'> "süsteemile taaskäivituse, saate neid kasutada."</div><div class='ctx'> </div><div class='hunk'>@@ -3715,12 +3715,12 @@ msgstr "raadiotoe lubamine"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Enne jätkamist lugege hoolikalt läbi litsentsileping. See kehtib kogu\n"</div><div class='del'>-"Mandrakelinuxi distributsiooni kohta. Kui Te kõigi selle tingimustega\n"</div><div class='add'>+"Mandrivalinuxi distributsiooni kohta. Kui Te kõigi selle tingimustega\n"</div><div class='ctx'> "nõus olete, märkige ära kast \"%s\". Kui Teile aga miski ei meeldi, siis\n"</div><div class='ctx'> "klõps nupule \"%s\" sooritab arvuti taaskäivitamise."</div><div class='ctx'> </div><div class='hunk'>@@ -3898,13 +3898,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinuxi paigalduspaketid on jagatud mitme CD vahel.\n"</div><div class='add'>+"Mandrivalinuxi paigalduspaketid on jagatud mitme CD vahel.\n"</div><div class='ctx'> "DrakX suudab ära tunda, kui valitud pakett asub muul CD-l,\n"</div><div class='ctx'> "ning väljastab siis seesoleva CD ja palub sisestada selle,\n"</div><div class='ctx'> "mida parajasti vaja läheb.\n"</div><div class='hunk'>@@ -3915,11 +3915,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3971,7 +3971,7 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nüüd on aeg valida rakendused, mida soovite oma süsteemi paigaldada.\n"</div><div class='del'>-"Mandrakelinux pakub tuhandeid pakette ja mõistagi ei eelda keegi,\n"</div><div class='add'>+"Mandrivalinux pakub tuhandeid pakette ja mõistagi ei eelda keegi,\n"</div><div class='ctx'> "et Te neid kõiki juba ette tunneksite.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Paketid on rühmitatud gruppidesse vastavalt nende kasutusalale.\n"</div><div class='hunk'>@@ -4082,10 +4082,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4116,11 +4116,11 @@ msgstr ""</div><div class='ctx'> "!! Kui tahtlikult või seetõttu, et asi kuulus gruppi,\n"</div><div class='ctx'> "on valitud mõni serveripakett, palutakse Teilt kinnitust,\n"</div><div class='ctx'> "et Te ikka tõesti soovite neid servereid paigaldada.\n"</div><div class='del'>-"Mandrakelinux käivitab kõik paigaldatud serverid vaikimisi alglaadimise "</div><div class='add'>+"Mandrivalinux käivitab kõik paigaldatud serverid vaikimisi alglaadimise "</div><div class='ctx'> "ajal.\n"</div><div class='ctx'> "Isegi kui nad olid turvalised ja teadaolevalt probleemivabad ajal,\n"</div><div class='ctx'> "mis valmis distributsioon, võib kergesti juhtuda,\n"</div><div class='del'>-"et pärast Mandrakelinuxi praeguse versiooni valmimist leiti neist "</div><div class='add'>+"et pärast Mandrivalinuxi praeguse versiooni valmimist leiti neist "</div><div class='ctx'> "turvaauke.\n"</div><div class='ctx'> "Kui Te ei tea, mida konkreetne teenus pakub või miks see üldse "</div><div class='ctx'> "paigaldatakse,\n"</div><div class='hunk'>@@ -4273,7 +4273,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4329,7 +4329,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (ehk X Window System) kujutab endast GNU/Linuxi graafilise "</div><div class='ctx'> "kasutajaliidese\n"</div><div class='del'>-"tuuma ja südant, millele toetuvad kõik Mandrakelinuxiga kaasas käivad\n"</div><div class='add'>+"tuuma ja südant, millele toetuvad kõik Mandrivalinuxiga kaasas käivad\n"</div><div class='ctx'> "graafilised töökeskkonnad (KDE, GNOME, AfterStep, WindowMaker jne).\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Siin näidatakse Teile tervet nimekirja parameetreid, mida saab muuta,\n"</div><div class='hunk'>@@ -4452,12 +4452,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4484,7 +4484,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4493,7 +4493,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4513,12 +4513,12 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandrakelinux\n"</div><div class='add'>+"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandrivalinux\n"</div><div class='ctx'> "oma kõvakettal paigaldada. Kui kõvaketas on tühi või mõni muu\n"</div><div class='ctx'> "operatsioonisüsteem seda täielikult kasutab, on vaja see osadeks jagada\n"</div><div class='ctx'> "ehk partitsioneerida.\n"</div><div class='ctx'> "Partitsioneerimine on tegevus, mille käigus tekitatakse kettale loogilised\n"</div><div class='del'>-"piirkonnad Teie uue Mandrakelinuxi süsteemi paigaldamiseks.\n"</div><div class='add'>+"piirkonnad Teie uue Mandrivalinuxi süsteemi paigaldamiseks.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kuna kõvaketta jagamine on pöördumatu protsess, siis peab kogemusteta\n"</div><div class='ctx'> "kasutaja olema iseäranis ettevaatlik! Selle tegevuse lihtsustamiseks ja\n"</div><div class='hunk'>@@ -4548,7 +4548,7 @@ msgstr ""</div><div class='ctx'> "defragmenteerinud. Siiski ei tule kindlasti kahjuks ka andmetest varukoopia\n"</div><div class='ctx'> "valmistamine... See lahendus on soovitatav, kui tahate kasutada ühes "</div><div class='ctx'> "arvutis\n"</div><div class='del'>-"nii Mandrakelinuxit kui Microsoft Windowsit.\n"</div><div class='add'>+"nii Mandrivalinuxit kui Microsoft Windowsit.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Enne selle valiku kasuks otsustamist pidage silmas, et kirjeldatud "</div><div class='ctx'> "protseduuri\n"</div><div class='hunk'>@@ -4558,7 +4558,7 @@ msgstr ""</div><div class='ctx'> "paigaldamiseks.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": kui soovite kustutada kõik andmed ja partitsioonid, mis\n"</div><div class='del'>-"kõvakettal parajasti on, ning asendada need uue Mandrakelinuxi süsteemiga, "</div><div class='add'>+"kõvakettal parajasti on, ning asendada need uue Mandrivalinuxi süsteemiga, "</div><div class='ctx'> "on\n"</div><div class='ctx'> "see õige valik. Aga tasub olla ettevaatlik, sest pärast selle valiku "</div><div class='ctx'> "langetamist\n"</div><div class='hunk'>@@ -4725,7 +4725,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4747,7 +4747,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Klõpsake \"%s\", kui olete vormindamiseks valmis.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Klõpsake \"%s\", kui soovite valida oma uue Mandrakelinuxi süsteemi\n"</div><div class='add'>+"Klõpsake \"%s\", kui soovite valida oma uue Mandrivalinuxi süsteemi\n"</div><div class='ctx'> "paigaldamiseks mõne muu partitsiooni.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klõpsake \"%s\", kui soovite valida partitsioone, millel kontrollitaks\n"</div><div class='hunk'>@@ -4765,7 +4765,7 @@ msgstr "Eelmine"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4777,7 +4777,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"On tõenäoline, et praegu, kui Te paigaldate Mandrakelinuxit, on mõned\n"</div><div class='add'>+"On tõenäoline, et praegu, kui Te paigaldate Mandrivalinuxit, on mõned\n"</div><div class='ctx'> "paketid jõudnud pärast väljalaset juba uuenduskuuri üle elada. Mõnes on ära\n"</div><div class='ctx'> "parandatud paar väiksemat viga, mõnes turvaprobleemid. Et võiksite neist\n"</div><div class='ctx'> "uuendustest tulu lõigata, on Teil nüüd võimalik need Internetist alla "</div><div class='hunk'>@@ -4810,7 +4810,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4823,7 +4823,7 @@ msgstr ""</div><div class='ctx'> "enamasti kasutamise mõnevõrra keerukamaks.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kui Te ei tea, mida valida, jätke kehtima vaikimisi pakutud valik. Hiljem\n"</div><div class='del'>-"saate turvataset muuta Mandrakelinuxi juhtimiskeskuses abivahendiga "</div><div class='add'>+"saate turvataset muuta Mandrivalinuxi juhtimiskeskuses abivahendiga "</div><div class='ctx'> "Draksec.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Väli \"%s\" on mõeldud süsteemi turvalisuse eest vastutava kasutaja\n"</div><div class='hunk'>@@ -4838,7 +4838,7 @@ msgstr "Turvaadministraator"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4908,7 +4908,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Nüüd peate valima partitsiooni(d), kuhu soovite Mandrakelinuxi paigaldada.\n"</div><div class='add'>+"Nüüd peate valima partitsiooni(d), kuhu soovite Mandrivalinuxi paigaldada.\n"</div><div class='ctx'> "Kui need on juba olemas kas GNU/Linuxi varasema paigalduse või mõne muu\n"</div><div class='ctx'> "kettajagamisvahendi tegevuse tulemusena, võite kasutada olemasolevaid\n"</div><div class='ctx'> "partitsioone. Vastasel juhul tuleb need luua.\n"</div><div class='hunk'>@@ -5000,7 +5000,7 @@ msgstr "Tava- ja ekspertrežiimi lülitamine"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5029,7 +5029,7 @@ msgid ""</div><div class='ctx'> "disk or partition is called \"C:\")."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Teie arvuti kõvakettal on rohkem kui üks Microsoft Windowsi partitsioon.\n"</div><div class='del'>-"Palun valige välja see, mille suurust soovite Mandrakelinuxi jaoks muuta.\n"</div><div class='add'>+"Palun valige välja see, mille suurust soovite Mandrivalinuxi jaoks muuta.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Teie abistamiseks on igal partitsioonil näidatud \"Nimi Linuxis\", \"Nimi "</div><div class='ctx'> "Windowsis\" ja \"Mahutavus\".\n"</div><div class='hunk'>@@ -5076,7 +5076,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5085,19 +5085,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Seda sammu on vaja ainult siis, kui masinas leiti varasem\n"</div><div class='ctx'> "GNU/Linuxi partitsioon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX soovib nüüd teada, kas tahate paigaldada uue süsteemi või uuendada\n"</div><div class='del'>-"olemasolevat Mandrakelinuxi süsteemi:\n"</div><div class='add'>+"olemasolevat Mandrivalinuxi süsteemi:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": üldiselt pühib see vana süsteemi täielikult minema. Kui\n"</div><div class='ctx'> "soovite muuta praeguseid partitsioone või failisüsteemi, siis võiks seda "</div><div class='hunk'>@@ -5106,13 +5106,13 @@ msgstr ""</div><div class='ctx'> "ülekirjutamise eest päästa.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": see paigaldamisviis võimaldab uuendada praegu olemasolevasse\n"</div><div class='del'>-"Mandrakelinuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "</div><div class='add'>+"Mandrivalinuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "</div><div class='ctx'> "kasutajate\n"</div><div class='ctx'> "andmeid ei muudeta. Enamik seadistussamme on kasutatavad sarnaselt "</div><div class='ctx'> "tavapärasele\n"</div><div class='ctx'> "paigaldamisele.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Võimalus \"Uuendus\" peaks toimima edukalt Mandrakelinuxi süsteemides\n"</div><div class='add'>+"Võimalus \"Uuendus\" peaks toimima edukalt Mandrivalinuxi süsteemides\n"</div><div class='ctx'> "alates versioonist 8.1. Uuenduse proovimist varasemate versioonide peal\n"</div><div class='ctx'> "me siiski ei soovita."</div><div class='ctx'> </div><div class='hunk'>@@ -5168,7 +5168,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5206,7 +5206,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Mõni sõna UTF-8 (unicode) toetuse kohta. Unicode on uus kodeering, mis\n"</div><div class='ctx'> "peaks hõlmama kõiki keeli. Selle täielik toetus ei ole GNU/Linuxis\n"</div><div class='del'>-"siiski veel täielikult teostatud. Seetõttu lähtub Mandrakelinux selle\n"</div><div class='add'>+"siiski veel täielikult teostatud. Seetõttu lähtub Mandrivalinux selle\n"</div><div class='ctx'> "kasutamisel või mittekasutamisel järgmistest asjaoludest:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Kui valite keele, mis üldreeglina kasutab muud kodeeringut (latin1 \n"</div><div class='hunk'>@@ -5447,7 +5447,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5468,12 +5468,12 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Siin saate valida oma arvuti trükkimissüsteemi. Teised "</div><div class='ctx'> "operatsioonisüsteemid\n"</div><div class='del'>-"võivad Teile pakkuda vaid üht süsteemi, kuid Mandrakelinuxi puhul saate\n"</div><div class='add'>+"võivad Teile pakkuda vaid üht süsteemi, kuid Mandrivalinuxi puhul saate\n"</div><div class='ctx'> "valida tervelt kahe seast.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" - mis tähendab \"trüki kohe\" (\"print, do not queue\") - tuleks "</div><div class='hunk'>@@ -5498,7 +5498,7 @@ msgstr ""</div><div class='ctx'> "trükkimiseks või printeri seadistamiseks.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kui leiate hiljem, et siinkohal langetatud valik polnud vahest kõige parem,\n"</div><div class='del'>-"siis saate seda muuta Mandrakelinuxi juhtimiskeskuses PrinterDrake abil,\n"</div><div class='add'>+"siis saate seda muuta Mandrivalinuxi juhtimiskeskuses PrinterDrake abil,\n"</div><div class='ctx'> "klõpsates seal nupule \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='hunk'>@@ -5620,7 +5620,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5637,7 +5637,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5698,7 +5698,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": kui soovite muuta alglaaduri seadistusi, klõpsake\n"</div><div class='ctx'> "sellele nupule. See on mõeldud siiski vaid kogenud kasutajatele.\n"</div><div class='del'>-"Täpsemat infot leiab käsiraamatust või Mandrakelinuxi juhtimiskeskusest.\n"</div><div class='add'>+"Täpsemat infot leiab käsiraamatust või Mandrivalinuxi juhtimiskeskusest.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": saate täpselt kontrollida, millised teenused Teie\n"</div><div class='ctx'> "süsteemis töötavad. Kui kavatsete kasutada oma masinat serverina, kuluks\n"</div><div class='hunk'>@@ -5759,10 +5759,10 @@ msgstr "Teenused"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Valige kõvaketas, mida soovite puhastada oma uue Mandrakelinuxi\n"</div><div class='add'>+"Valige kõvaketas, mida soovite puhastada oma uue Mandrivalinuxi\n"</div><div class='ctx'> "paigaldamiseks. Ettevaatust, kõik sellel leiduvad andmed hävitatakse\n"</div><div class='ctx'> "ja neid ei saa enam taastada."</div><div class='ctx'> </div><div class='hunk'>@@ -6116,12 +6116,12 @@ msgstr "Vaba ruumi arvutamine Windowsi partitsioonil"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Teie Windowsi partitsioon on fragmenteerunud. Palun tehke arvutile uus "</div><div class='ctx'> "alglaadimine, käivitage Windows ja seejärel utiliit \"defrag\" ning tulge "</div><div class='del'>-"siis Mandrakelinuxi paigaldamise juurde tagasi."</div><div class='add'>+"siis Mandrivalinuxi paigaldamise juurde tagasi."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6237,19 +6237,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6271,7 +6271,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6279,14 +6279,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6296,7 +6296,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6316,10 +6316,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6330,11 +6330,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6350,7 +6350,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Järgnev lõppkasutaja litsents on eksimuste vältimiseks originaalkeeles!\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6358,19 +6358,19 @@ msgstr ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6392,7 +6392,7 @@ msgstr ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6400,14 +6400,14 @@ msgstr ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6417,7 +6417,7 @@ msgstr ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6437,10 +6437,10 @@ msgstr ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6451,11 +6451,11 @@ msgstr ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6471,7 +6471,7 @@ msgstr ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6565,7 +6565,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6573,21 +6573,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Õnnitleme, paigaldamine on edukalt lõpetatud.\n"</div><div class='ctx'> "Võtke palun välja diskett ja/või CD ja vajutage Enter alglaadimiseks.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informatsiooni selle distributsiooni paranduste kohta (Errata) saab\n"</div><div class='del'>-"Mandrakelinuxi koduleheküljelt:\n"</div><div class='add'>+"Mandrivalinuxi koduleheküljelt:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Abi süsteemi edasiseks seadistamiseks saab eelkõige\n"</div><div class='del'>-"Mandrakelinuxi kasutaja käsiraamatust."</div><div class='add'>+"Mandrivalinuxi kasutaja käsiraamatust."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6621,7 +6621,7 @@ msgstr "Järgmine samm: %s\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -7151,7 +7151,7 @@ msgid ""</div><div class='ctx'> "Do you want to install the updates?"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Teil on nüüd võimalus alla laadida uuendatud pakette. Need on välja lastud\n"</div><div class='del'>-"pärast Mandrakelinuxi distributsiooni ilmumist ja võivad sisaldada vigade\n"</div><div class='add'>+"pärast Mandrivalinuxi distributsiooni ilmumist ja võivad sisaldada vigade\n"</div><div class='ctx'> "parandusi või turvauuendusi.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Allalaadimiseks peab Teil olema töötav internetiühendus.\n"</div><div class='hunk'>@@ -7161,9 +7161,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."</div><div class='add'>+"Mandrivalinuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7386,8 +7386,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinuxi paigaldamine %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinuxi paigaldamine %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9973,7 +9973,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14021,11 +14021,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Oma skänneri väljajagamiseks võrgus käivitage Scannerdrake (Mandrakelinuxi "</div><div class='add'>+"Oma skänneri väljajagamiseks võrgus käivitage Scannerdrake (Mandrivalinuxi "</div><div class='ctx'> "juhtimiskeskuses rubriik Riistvara/Skänner).\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -15933,23 +15933,23 @@ msgstr "Peata"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mis on Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mis on Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Tere tulemast &lt;b&gt;Mandrakelinuxisse&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Tere tulemast &lt;b&gt;Mandrivalinuxisse&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux on &lt;b&gt;Linuxi distributsioon&lt;/b&gt;, mis koosneb süsteemi "</div><div class='add'>+"Mandrivalinux on &lt;b&gt;Linuxi distributsioon&lt;/b&gt;, mis koosneb süsteemi "</div><div class='ctx'> "tuumikust ehk &lt;b&gt;operatsioonisüsteemist&lt;/b&gt; (selle aluseks on Linuxi kernel) "</div><div class='ctx'> "ning &lt;b&gt;paljudest rakendustest&lt;/b&gt;, mis rahuldavad ilmselt küll kõik Teie "</div><div class='ctx'> "vajadused."</div><div class='hunk'>@@ -15957,10 +15957,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux on kõige &lt;b&gt;kasutajasõbralikum&lt;/b&gt; Linuxi distributsioon. See "</div><div class='add'>+"Mandrivalinux on kõige &lt;b&gt;kasutajasõbralikum&lt;/b&gt; Linuxi distributsioon. See "</div><div class='ctx'> "on üks maailma &lt;b&gt;kõige kasutatavamaid&lt;/b&gt; distributsioone!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -15976,13 +15976,13 @@ msgstr "Tere tulemast &lt;b&gt;vaba tarkvara maailma&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux toetab kõigiti vaba tarkvara. Ka praegune väljalase on "</div><div class='del'>-"&lt;b&gt;Mandrakesofti arendajate meeskonna&lt;/b&gt; ja Mandrakelinuxi &lt;b&gt;üleilmse "</div><div class='add'>+"Mandrivalinux toetab kõigiti vaba tarkvara. Ka praegune väljalase on "</div><div class='add'>+"&lt;b&gt;Mandrivai arendajate meeskonna&lt;/b&gt; ja Mandrivalinuxi &lt;b&gt;üleilmse "</div><div class='ctx'> "kaasautorite kogukonna&lt;/b&gt; &lt;b&gt;ühise koostöö&lt;/b&gt; vili."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='hunk'>@@ -16003,9 +16003,9 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Suuremat osa distributsiooni kaasatud tarkvara ja kõiki Mandrakelinuxi "</div><div class='add'>+"Suuremat osa distributsiooni kaasatud tarkvara ja kõiki Mandrivalinuxi "</div><div class='ctx'> "abivahendeid levitatakse &lt;b&gt;Üldise Avaliku Litsentsi&lt;/b&gt; (GPL) alusel."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16031,20 +16031,20 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:13</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "&lt;b&gt;Join the Community&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Liituge Mandrakelinuxi kogukonnaga&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Liituge Mandrivalinuxi kogukonnaga&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinuxi kasutajad ja arendajad moodustavad &lt;b&gt;väga suure kogukonna&lt;/"</div><div class='add'>+"Mandrivalinuxi kasutajad ja arendajad moodustavad &lt;b&gt;väga suure kogukonna&lt;/"</div><div class='ctx'> "b&gt;. Selle liikmete tegevusvaldkond on äärmiselt lai, ulatudes vigade "</div><div class='ctx'> "teatamisest kuni uute rakenduste väljatöötamiseni. Kogukonnal on "</div><div class='del'>-"Mandrakelinuxi maailmas lausa &lt;b&gt;võtmeroll&lt;/b&gt;."</div><div class='add'>+"Mandrivalinuxi maailmas lausa &lt;b&gt;võtmeroll&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16066,11 +16066,11 @@ msgstr "&lt;b&gt;Allatõmmatav versioon&lt;/b&gt; (\"Download version\")"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Paigaldate praegu &lt;b&gt;Mandrakelinuxi allatõmmatavat&lt;/b&gt; versiooni. See on "</div><div class='del'>-"vaba versioon, mis Mandrakesofti tahtmist mööda on &lt;b&gt;kättesaadav kõigile&lt;/"</div><div class='add'>+"Paigaldate praegu &lt;b&gt;Mandrivalinuxi allatõmmatavat&lt;/b&gt; versiooni. See on "</div><div class='add'>+"vaba versioon, mis Mandrivai tahtmist mööda on &lt;b&gt;kättesaadav kõigile&lt;/"</div><div class='ctx'> "b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -16103,9 +16103,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Teil puudub ligipääs ka muudesse Mandrakesofti toodetesse &lt;b&gt;lisatud "</div><div class='add'>+"Teil puudub ligipääs ka muudesse Mandrivai toodetesse &lt;b&gt;lisatud "</div><div class='ctx'> "teenustele&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -16115,8 +16115,8 @@ msgstr "&lt;b&gt;Discovery - Teie esimene Linuxi töölaud&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Paigaldate praegu &lt;b&gt;Mandrakelinuxi Discovery&lt;/b&gt; versiooni."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Paigaldate praegu &lt;b&gt;Mandrivalinuxi Discovery&lt;/b&gt; versiooni."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16138,17 +16138,17 @@ msgstr "&lt;b&gt;PowerPack - tipptasemel Linuxi töölaud&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Paigaldate praegu &lt;b&gt;Mandrakelinuxi PowerPack&lt;/b&gt; versiooni."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Paigaldate praegu &lt;b&gt;Mandrivalinuxi PowerPack&lt;/b&gt; versiooni."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack on Mandrakesofti &lt;b&gt;tipptasemega Linuxi töölaua lahendus&lt;/b&gt;. "</div><div class='add'>+"PowerPack on Mandrivai &lt;b&gt;tipptasemega Linuxi töölaua lahendus&lt;/b&gt;. "</div><div class='ctx'> "PowerPack pakub &lt;b&gt;tuhandeid rakendusi&lt;/b&gt; alates kõige populaarsematest "</div><div class='ctx'> "kuni kõige spetsiifilisemateni."</div><div class='ctx'> </div><div class='hunk'>@@ -16159,8 +16159,8 @@ msgstr "&lt;b&gt;PowerPack+ - Linuxi lahendus töölaudadele ja serveritele&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Paigaldate praegu &lt;b&gt;Mandrakelinuxi PowerPack+&lt;/b&gt; versiooni."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Paigaldate praegu &lt;b&gt;Mandrivalinuxi PowerPack+&lt;/b&gt; versiooni."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16177,22 +16177,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesofti tooted&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivai tooted&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; on välja töötanud terve rea &lt;b&gt;Mandrakelinuxi&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; on välja töötanud terve rea &lt;b&gt;Mandrivalinuxi&lt;/b&gt; "</div><div class='ctx'> "tooteid."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux koosseisu kuuluvad järgmised tooted:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux koosseisu kuuluvad järgmised tooted:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16212,73 +16212,73 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt; - Linuxi lahendus töölaudadele ja serveritele."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt; - Mandrakelinuxi lahendus, mis sobib "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt; - Mandrivalinuxi lahendus, mis sobib "</div><div class='ctx'> "kõige paremini Teie 64-bitisele protsessorile."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesofti tooted (kaasaskantavad)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivai tooted (kaasaskantavad)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft on välja töötanud kaks toodet, mis lubavad Teil kasutada "</div><div class='del'>-"Mandrakelinuxit &lt;b&gt;suvalises arvutis&lt;/b&gt;, ilma et peaksite seda tegelikult "</div><div class='add'>+"Mandriva on välja töötanud kaks toodet, mis lubavad Teil kasutada "</div><div class='add'>+"Mandrivalinuxit &lt;b&gt;suvalises arvutis&lt;/b&gt;, ilma et peaksite seda tegelikult "</div><div class='ctx'> "arvutisse paigaldamagi:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt; - Mandrakelinuxi distributsioon, mis töötab täielikult "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt; - Mandrivalinuxi distributsioon, mis töötab täielikult "</div><div class='ctx'> "alglaaditava CD pealt."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt; - Mandrakelinuxi distributsioon, mis on juba "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt; - Mandrivalinuxi distributsioon, mis on juba "</div><div class='ctx'> "paigaldatud ülikompaktsele LaCie välisele kõvakettale."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesofti tooted (professonaalsed lahendused)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivai tooted (professonaalsed lahendused)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Toome siin ära Mandrakesofti tooted, mis peavad rahuldama ka kõige "</div><div class='add'>+"Toome siin ära Mandrivai tooted, mis peavad rahuldama ka kõige "</div><div class='ctx'> "nõudlikumaid &lt;b&gt;professionaalseid vajadusi&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt; - Mandrakelinuxi töölaud firmadele."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt; - Mandrivalinuxi töölaud firmadele."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt; - Mandrakelinuxi serverilahendus."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt; - Mandrivalinuxi serverilahendus."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt; - Mandrakelinuxi turvalahendus."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt; - Mandrivalinuxi turvalahendus."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16322,10 +16322,10 @@ msgstr "&lt;b&gt;Valige meelepärane graafiline töökeskkond&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PowerPack võimaldab teil valida meelepärase &lt;b&gt;graafilise töökeskkonna&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft on selleks vaikimisi valinud &lt;b&gt;KDE&lt;/b&gt;."</div><div class='add'>+"Mandriva on selleks vaikimisi valinud &lt;b&gt;KDE&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16350,10 +16350,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PowerPack+ võimaldab teil valida meelepärase &lt;b&gt;graafilise töökeskkonna&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft on selleks vaikimisi valinud &lt;b&gt;KDE&lt;/b&gt;."</div><div class='add'>+"Mandriva on selleks vaikimisi valinud &lt;b&gt;KDE&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16480,10 +16480,10 @@ msgstr "&lt;b&gt;Ääretu valik rakendusi igaks vajaduseks&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinuxi menüüst leiab &lt;b&gt;hõlpsasti kasutatavad&lt;/b&gt; rakendused "</div><div class='add'>+"Mandrivalinuxi menüüst leiab &lt;b&gt;hõlpsasti kasutatavad&lt;/b&gt; rakendused "</div><div class='ctx'> "&lt;b&gt;igaks vajaduseks&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16746,18 +16746,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinuxi juhtimiskeskus&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinuxi juhtimiskeskus&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakelinuxi juhtimiskeskus&lt;/b&gt; koondab ühtekokku olulised, "</div><div class='del'>-"Mandrakelinuxile spetsiifilised tööriistad, et Te saaksite oma arvutit "</div><div class='add'>+"&lt;b&gt;Mandrivalinuxi juhtimiskeskus&lt;/b&gt; koondab ühtekokku olulised, "</div><div class='add'>+"Mandrivalinuxile spetsiifilised tööriistad, et Te saaksite oma arvutit "</div><div class='ctx'> "lihtsamalt ja mugavamalt seadistada."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16781,15 +16781,15 @@ msgstr "&lt;b&gt;Vaba tarkvara mudel&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nagu programmeerimine üldse, nõuab ka vaba tarkvara arendamiseks &lt;b&gt;aega ja "</div><div class='del'>-"inimesi&lt;/b&gt;. Vaba tarkvara põhimõtete vaimu elushoidmiseks müüb Mandrakesoft "</div><div class='del'>-"oma tooteid ja teenuseid, et &lt;b&gt;aidata arendada Mandrakelinuxit&lt;/b&gt;. Kui ka "</div><div class='del'>-"Teie soovite &lt;b&gt;toetada vaba tarkvara põhimõtteid&lt;/b&gt; ning Mandrakelinuxi "</div><div class='add'>+"inimesi&lt;/b&gt;. Vaba tarkvara põhimõtete vaimu elushoidmiseks müüb Mandriva "</div><div class='add'>+"oma tooteid ja teenuseid, et &lt;b&gt;aidata arendada Mandrivalinuxit&lt;/b&gt;. Kui ka "</div><div class='add'>+"Teie soovite &lt;b&gt;toetada vaba tarkvara põhimõtteid&lt;/b&gt; ning Mandrivalinuxi "</div><div class='ctx'> "arendustegevust, kaaluge &lt;b&gt;palun&lt;/b&gt; mõtet osta mõni meie toode või teenus!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16800,10 +16800,10 @@ msgstr "&lt;b&gt;Internetikauplus&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesofti toodete ja teenustega põhjalikumaks tutvumiseks võite "</div><div class='add'>+"Mandrivai toodete ja teenustega põhjalikumaks tutvumiseks võite "</div><div class='ctx'> "külastada meie &lt;b&gt;e-kaubanduse keskust&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16828,25 +16828,25 @@ msgstr "Astuge juba täna läbi aadressilt &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; on &lt;b&gt;suurepärane kaaslane&lt;/b&gt; Teie Mandrakelinuxi "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; on &lt;b&gt;suurepärane kaaslane&lt;/b&gt; Teie Mandrivalinuxi "</div><div class='ctx'> "tootele."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Saage kasu &lt;b&gt;hinnalistest eelistest&lt;/b&gt;, mida pakub ühinemine "</div><div class='del'>-"Mandrakeclub'iga:"</div><div class='add'>+"Mandriva Club'iga:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16868,39 +16868,39 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Osalemine Mandrakelinuxi &lt;b&gt;kasutajate foorumitel&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Osalemine Mandrivalinuxi &lt;b&gt;kasutajate foorumitel&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Varane ja privilegeeritud ligipääs&lt;/b&gt; juba enne ametlikku väljalaset "</div><div class='del'>-"Mandrakelinuxi &lt;b&gt;ISO-tõmmistele&lt;/b&gt;."</div><div class='add'>+"Mandrivalinuxi &lt;b&gt;ISO-tõmmistele&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; on uus suurepärane teenus, mida Mandrakesoft uhkusega "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; on uus suurepärane teenus, mida Mandriva uhkusega "</div><div class='ctx'> "oma klientidele pakub!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline tähendab mitmeid hinnalisi teenuseid oma Mandrakelinuxi "</div><div class='add'>+"Mandriva Online tähendab mitmeid hinnalisi teenuseid oma Mandrivalinuxi "</div><div class='ctx'> "süsteemi &lt;b&gt;hõlpsaks uuendamiseks&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16926,40 +16926,40 @@ msgstr "\t* Paindlik uuenduste &lt;b&gt;ajastamine&lt;/b&gt;."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Kõigi oma Mandrakelinuxi süsteemide&lt;/b&gt; haldamine ühe konto alt."</div><div class='add'>+"\t* &lt;b&gt;Kõigi oma Mandrivalinuxi süsteemide&lt;/b&gt; haldamine ühe konto alt."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Läheb Teil vaja &lt;b&gt;veidi abi&lt;/b&gt;? Mandrakesofti asjatundjad on valmis seda "</div><div class='add'>+"Läheb Teil vaja &lt;b&gt;veidi abi&lt;/b&gt;? Mandrivai asjatundjad on valmis seda "</div><div class='ctx'> "Teile osutama &lt;b&gt;meie tehnilise toe keskkonnas&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Kvalifitseeritud Mandrakelinuxi ekspertide&lt;/b&gt; abiga võite kokku hoida "</div><div class='add'>+"&lt;b&gt;Kvalifitseeritud Mandrivalinuxi ekspertide&lt;/b&gt; abiga võite kokku hoida "</div><div class='ctx'> "hulganisti aega ja vaeva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Iga Mandrakelinuxiga seotud küsimuse puhul on Teil võimalik osta konkreetne "</div><div class='add'>+"Iga Mandrivalinuxiga seotud küsimuse puhul on Teil võimalik osta konkreetne "</div><div class='ctx'> "tugiteenus meie Internetikaupluses &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17255,8 +17255,8 @@ msgstr "Jälgimisvahendid, protsesside jälgimine, tcpdump, nmap..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesofti nõustajad"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandrivai nõustajad"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17351,8 +17351,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "VÕTMED:\n"</div><div class='ctx'> "  --help            - näitab käesolevat abiteadet.\n"</div><div class='del'>-"  -report           - rakendus peab olema üks Mandrakelinuxi tööriistadest\n"</div><div class='del'>-"  -incident         - rakendus peab olema üks Mandrakelinuxi tööriistadest"</div><div class='add'>+"  -report           - rakendus peab olema üks Mandrivalinuxi tööriistadest\n"</div><div class='add'>+"  -incident         - rakendus peab olema üks Mandrivalinuxi tööriistadest"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17407,7 +17407,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17421,7 +17421,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[VÕTMED]...\n"</div><div class='del'>-"Mandrakelinuxi terminaliserveri seadistaja\n"</div><div class='add'>+"Mandrivalinuxi terminaliserveri seadistaja\n"</div><div class='ctx'> "--enable         : lubab MTSi\n"</div><div class='ctx'> "--disable        : keelab MTSi\n"</div><div class='ctx'> "--start          : käivitab MTSi\n"</div><div class='hunk'>@@ -17479,14 +17479,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[VÕTI]...\n"</div><div class='del'>-"  --no-confirmation      ei küsita esimest kinnitust MandrakeUpdate "</div><div class='add'>+"  --no-confirmation      ei küsita esimest kinnitust Mandriva Update "</div><div class='ctx'> "režiimis\n"</div><div class='ctx'> "  -no-verify-rpm        pakettide signatuure ei kontrollita\n"</div><div class='ctx'> "  --changelog-first      näitab kirjelduse aknas enne failinimekirja "</div><div class='hunk'>@@ -20257,13 +20257,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinuxi vigadest teatamise vahend"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinuxi vigadest teatamise vahend"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinuxi juhtimiskeskus"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinuxi juhtimiskeskus"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20283,8 +20283,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20328,8 +20328,8 @@ msgstr "Seadistamise nõustajad"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Valige Mandrakesofti tööriist:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Valige Mandrivai tööriist:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20754,19 +20754,19 @@ msgstr "Käivitub laadimisel"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Seda liidest ei ole veel seadistatud.\n"</div><div class='del'>-"Käivitage Mandrakelinuxi juhtimiskeskuses nõustaja \"Liidese lisamine\""</div><div class='add'>+"Käivitage Mandrivalinuxi juhtimiskeskuses nõustaja \"Liidese lisamine\""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Internetiühendust ei ole veel seadistatud.\n"</div><div class='del'>-"Käivitage Mandrakelinuxi juhtimiskeskuses nõustaja \"%s\""</div><div class='add'>+"Käivitage Mandrivalinuxi juhtimiskeskuses nõustaja \"%s\""</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20816,8 +20816,8 @@ msgstr "KDM (KDE kuvahaldur)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MkdKDM (Mandrakelinuxi kuvahaldur)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MkdKDM (Mandrivalinuxi kuvahaldur)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21116,7 +21116,7 @@ msgstr "Import"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21125,7 +21125,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Autoriõigus (C) 2001-2002: Mandrakesoft \n"</div><div class='add'>+"Autoriõigus (C) 2001-2002: Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (algversioon)\n"</div><div class='hunk'>@@ -21666,7 +21666,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21702,8 +21702,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinuxi abikeskus"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinuxi abikeskus"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25210,8 +25210,8 @@ msgstr "Muudatus on tehtud, aga selle rakendamiseks tuleb välja logida"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinuxi vahendite logi"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinuxi vahendite logi"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25723,10 +25723,10 @@ msgstr "Ühendus on loodud."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ühenduse loomine ebaõnnestus.\n"</div><div class='del'>-"Kontrollige palun seadistusi Mandrakelinuxi juhtimiskeskuse abil."</div><div class='add'>+"Kontrollige palun seadistusi Mandrivalinuxi juhtimiskeskuse abil."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26615,8 +26615,8 @@ msgstr "Paigaldamine ebaõnnestus!"</div><div class='ctx'> #~ msgid "Save and close"</div><div class='ctx'> #~ msgstr "Salvesta ja sulge"</div><div class='ctx'> </div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Mandrakesofti nõustajad"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Mandrivai nõustajad"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Brauserit ei leitud! Palun paigaldage mõni"</div><div class='head'>diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po<br/>index df63e5093..7c20ba07b 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/eu.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/eu.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/eu.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/eu.po</a></div><div class='hunk'>@@ -69,14 +69,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Badirudi USB gakoak idazkea babesa daukala, baina orain ezin dugu modu\n"</div><div class='ctx'> "seguruan deskonektatu.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klikatu makina berrabiarazteko botoia, desentxufatu, kendu idazketa\n"</div><div class='del'>-"babesa, gakoa berriro konektatu, eta berriro abiarazi Mandrake Move."</div><div class='add'>+"babesa, gakoa berriro konektatu, eta berriro abiarazi Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -94,7 +94,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Zure USB gakoak ez du baliozko Windows (FAT) partiziorik.\n"</div><div class='hunk'>@@ -105,14 +105,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "USB gakorik gabe ere aurrera egin dezakezu - gai izango\n"</div><div class='del'>-"zara Mandrake Move erabiltzeko, Mandrake sistema eragile\n"</div><div class='add'>+"zara Mandriva Move erabiltzeko, Mandrake sistema eragile\n"</div><div class='ctx'> "normal gisa."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -120,11 +120,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ez dugu USB gakorik detektatu zure sisteman. USB gako\n"</div><div class='del'>-"bat konektatzen baduzu, Mandrake Move gai izango da datuak\n"</div><div class='add'>+"bat konektatzen baduzu, Mandriva Move gai izango da datuak\n"</div><div class='ctx'> "zure etxeko direktorioan eta sistema-konfigurazioan gardenki\n"</div><div class='ctx'> "gordetzeko, ordenagailu honetan edo beste batean berriro \n"</div><div class='ctx'> "abiarazten denean. Oharra: gako bat konektatzen baduzu, itxaron\n"</div><div class='hunk'>@@ -132,7 +132,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "USB gakorik gabe ere aurrera egin dezakezu - gai izango\n"</div><div class='del'>-"zara Mandrake Move erabiltzeko, Mandrake sistema eragile\n"</div><div class='add'>+"zara Mandriva Move erabiltzeko, Mandrake sistema eragile\n"</div><div class='ctx'> "normal gisa."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -258,7 +258,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -274,7 +274,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Horren jatorria izan litezke USB gakoko sistema-konfigurazioko\n"</div><div class='ctx'> "fitxategiak hondatuta egotea. Hala bada, fitxategi horiek kendu eta \n"</div><div class='del'>-"Mandrake Move berrabiaraziz konponduko da arazoa. Horretarako,\n"</div><div class='add'>+"Mandriva Move berrabiaraziz konponduko da arazoa. Horretarako,\n"</div><div class='ctx'> "egin klik berrabiarazteko botoian.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1313,11 +1313,11 @@ msgstr "Hizkuntza aukera"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux-ek hainbat hizkuntza onar ditzake. Hautatu\n"</div><div class='add'>+"Mandrivalinux-ek hainbat hizkuntza onar ditzake. Hautatu\n"</div><div class='ctx'> "instalatu nahi dituzun hizkuntzak. Instalazioa osatzean eta\n"</div><div class='ctx'> "sistema berrabiaraztean, erabilgarri egongo dira."</div><div class='ctx'> </div><div class='hunk'>@@ -3738,12 +3738,12 @@ msgstr "gaitu irrati-euskarria"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Aurrera jarraitu aurretik lizentziaren baldintzak arretaz irakurri. \n"</div><div class='del'>-"Mandrakelinux banaketa osoa hartzen du. Baldintza guztiekin ados \n"</div><div class='add'>+"Mandrivalinux banaketa osoa hartzen du. Baldintza guztiekin ados \n"</div><div class='ctx'> "bazaude, hautatu \"%s\" laukia. Onartzen ez badituzu, \"%s\" botoian klik\n"</div><div class='ctx'> "egin eta ordenagailua berrabiaraziko da."</div><div class='ctx'> </div><div class='hunk'>@@ -3929,13 +3929,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux instalazioa zenbait CD-ROMetan banatuta dago. \n"</div><div class='add'>+"Mandrivalinux instalazioa zenbait CD-ROMetan banatuta dago. \n"</div><div class='ctx'> "Hautatutako pakete bat beste CD-ROM batean badago, DrakX-k du\n"</div><div class='ctx'> "uneko CDa egotziko eta behar den CDa sartzeko eskatuko dizu.\n"</div><div class='ctx'> "Eskatzen zaizun CDa ez badaukazu eskura, sakatu \"%s\",\n"</div><div class='hunk'>@@ -3947,11 +3947,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4003,10 +4003,10 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sisteman zein programa instalatu nahi dituzun zehazteko garaia da.\n"</div><div class='del'>-"Mandrakelinux-erako milaka pakete dituzu erabilgarri, eta kudeaketa\n"</div><div class='add'>+"Mandrivalinux-erako milaka pakete dituzu erabilgarri, eta kudeaketa\n"</div><div class='ctx'> "errazteko, antzeko aplikazioen multzotan kokatu dira.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux-ek pakete multzoak lau kategoriatan antolatzen ditu.\n"</div><div class='add'>+"Mandrivalinux-ek pakete multzoak lau kategoriatan antolatzen ditu.\n"</div><div class='ctx'> "Kategoria anitzetako aplikazioak nahastu eta bateratu ditzakezu, honela\n"</div><div class='ctx'> "\"Lanpostua\" instalazio batek \"Zerbitzari\" kategoriako aplikazioak\n"</div><div class='ctx'> "instalatuta izan ditzake.\n"</div><div class='hunk'>@@ -4114,10 +4114,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4149,10 +4149,10 @@ msgstr ""</div><div class='ctx'> "Zerbitzari pakete bat hautatu bada, pakete hori zehazki hautatu duzulako\n"</div><div class='ctx'> "edo pakete-talde bateko zati zelako, zerbitzari horiek instalatu nahi "</div><div class='ctx'> "dituzula\n"</div><div class='del'>-" berresteko eskatuko zaizu. Lehenespenez Mandrakelinux-ek instalatutako\n"</div><div class='add'>+" berresteko eskatuko zaizu. Lehenespenez Mandrivalinux-ek instalatutako\n"</div><div class='ctx'> "edozein zerbitzu abioan automatikoki abiaraziko du. Nahiz eta seguruak\n"</div><div class='ctx'> " diren eta arazo ezagunik ez duten banaketa kaleratzeko garaian, guztiz\n"</div><div class='del'>-" posible da Mandrakelinux bertsio hau amaitu eta gero segurtasun zuloak\n"</div><div class='add'>+" posible da Mandrivalinux bertsio hau amaitu eta gero segurtasun zuloak\n"</div><div class='ctx'> " aurkitu izana. Ez badakizu zerbitzu zehatz batek zer egiten duen edo "</div><div class='ctx'> "zergatik\n"</div><div class='ctx'> " instalatu den, klikatu \"%s\". \"%s \" klikatzeak zerrendatutako "</div><div class='hunk'>@@ -4307,7 +4307,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4362,7 +4362,7 @@ msgid ""</div><div class='ctx'> "not successful in getting the display configured."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (X Window sistema) GNU/Linux-en interfaze grafikoaren bihotza da,\n"</div><div class='del'>-" Mandrakelinux-ekin bildutako ingurune grafiko guztiek (KDE, Gnome,\n"</div><div class='add'>+" Mandrivalinux-ekin bildutako ingurune grafiko guztiek (KDE, Gnome,\n"</div><div class='ctx'> "Afterstep, WindowMaker...) erabiltzen dutena.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Bistaratze grafiko optimoa lortzeko aldatu daitekeen parametro zerrenda\n"</div><div class='hunk'>@@ -4485,12 +4485,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4517,7 +4517,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4526,7 +4526,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4546,11 +4546,11 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Hona iritsita, Mandrakelinux sistema eragilea disko zurrunean non\n"</div><div class='add'>+"Hona iritsita, Mandrivalinux sistema eragilea disko zurrunean non\n"</div><div class='ctx'> "instalatu aukeratu behar duzu. Zure disko zurruna hutsik badago edo\n"</div><div class='ctx'> "lehendik dagoen sistema eragile batek leku erabilgarri guztia betetzen\n"</div><div class='ctx'> "badu, diska zatikatu beharko duzu. Disko zurruna zatikatzea, funtsean,  \n"</div><div class='del'>-"diskoa logikoki zatitzea da, Mandrakelinux sistema berria instalatzeko\n"</div><div class='add'>+"diskoa logikoki zatitzea da, Mandrivalinux sistema berria instalatzeko\n"</div><div class='ctx'> "behar den lekua sortzeko.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Disko zurruna zatikatzeko prozesua normalean itzulbiderik gabea denez\n"</div><div class='hunk'>@@ -4581,7 +4581,7 @@ msgstr ""</div><div class='ctx'> " edo NTFS partizioei neurria aldatu. Neurri aldaketa datu galerarik gabe\n"</div><div class='ctx'> "gauzatu daiteke baldin eta aurretik Windows partizioa desfragmentatu\n"</div><div class='ctx'> " baduzu. Oso gomendagarria da datuen babeskopiak egitea. Aukera hau\n"</div><div class='del'>-" erabiltzea gomendatzen da Mandrakelinux eta Microsoft Windows, biak,\n"</div><div class='add'>+" erabiltzea gomendatzen da Mandrivalinux eta Microsoft Windows, biak,\n"</div><div class='ctx'> " konputagailu berean erabili nahi badituzu.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Aukera hau hautatu aurretik, ulertu ezazu prozedura honen ondoren,\n"</div><div class='hunk'>@@ -4590,7 +4590,7 @@ msgstr ""</div><div class='ctx'> "zure datuak gorde edo software berria instalatzeko.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Disko zurrunean dauden datu eta partizio guztiak ezabatu eta \n"</div><div class='del'>-"Mandrakelinux sistema berriarekin ordeztu nahi badituzu, hautatu aukera\n"</div><div class='add'>+"Mandrivalinux sistema berriarekin ordeztu nahi badituzu, hautatu aukera\n"</div><div class='ctx'> " hau. Kontuz, berretsi ondoren ezingo baituzu eragiketa desegin.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! Aukera hau hautatzen baduzu, diskoko datu guztiak ezabatuko dira. !!\n"</div><div class='hunk'>@@ -4757,7 +4757,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4778,7 +4778,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Klikatu \"%s\" partizioak eratzeko prest zaudenean.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Klikatu \"%s\" Mandrakelinux sistema eragile berria instalatzeko beste "</div><div class='add'>+"Klikatu \"%s\" Mandrivalinux sistema eragile berria instalatzeko beste "</div><div class='ctx'> "partizio\n"</div><div class='ctx'> " bat aukeratu nahi baduzu.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4799,7 +4799,7 @@ msgstr "Aurrekoa"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4811,7 +4811,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux instalatzen duzunerako, litekeena da pakete batzuk\n"</div><div class='add'>+"Mandrivalinux instalatzen duzunerako, litekeena da pakete batzuk\n"</div><div class='ctx'> "hasierako argitalpenetik aldatu izana. Baliteke akatsak zuzendu eta \n"</div><div class='ctx'> "segurtasun arazoak konpondu izatea. Eguneratzeez baliatu ahal izan\n"</div><div class='ctx'> "zaitezen, orain, Internetetik jaitsi ditzakezu. Markatu \"%s\" dabilen "</div><div class='hunk'>@@ -4842,7 +4842,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4855,7 +4855,7 @@ msgstr ""</div><div class='ctx'> "ezartzean, normalean erabilera erraztasuna galtzen da.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Zer aukeratu ez badakizu, hautatu aukera lehenetsia. Gero aldatu \n"</div><div class='del'>-"ahal izango duzu draksec tresnarekin, Mandrakelinux Aginte Gunearen\n"</div><div class='add'>+"ahal izango duzu draksec tresnarekin, Mandrivalinux Aginte Gunearen\n"</div><div class='ctx'> "zati bat.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Bete \"%s\" eremua segurtasun arduradunaren postaE helbidearekin.\n"</div><div class='hunk'>@@ -4872,7 +4872,7 @@ msgstr "Segurtasun-administratzailea"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4942,7 +4942,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Orain, Mandrakelinux sistema instalatzeko zein partizio erabiliko\n"</div><div class='add'>+"Orain, Mandrivalinux sistema instalatzeko zein partizio erabiliko\n"</div><div class='ctx'> "d(ir)en aukeratu behar duzu. Partizioak jadanik definituta badaude,\n"</div><div class='ctx'> "(GNU/Linux-en aurreko instalazio batek edo beste partizio-tresna batek\n"</div><div class='ctx'> "definituta), lehendik dauden partizioak erabil ditzakezu. Bestela, disko \n"</div><div class='hunk'>@@ -5036,7 +5036,7 @@ msgstr "Aldatu modu normalera/aditu modura"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5065,7 +5065,7 @@ msgid ""</div><div class='ctx'> "disk or partition is called \"C:\")."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Microsoft partizio bat baino gehiago aurkitu dira zure disko zurrunean.\n"</div><div class='del'>-"Hautatu zeinen tamaina aldatu nahi duzun, Mandrakelinux sistema\n"</div><div class='add'>+"Hautatu zeinen tamaina aldatu nahi duzun, Mandrivalinux sistema\n"</div><div class='ctx'> "berria instalatu ahal izateko.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Partizioak honela azaltzen dira: \"Linux izena\", \"Windows izena\"\n"</div><div class='hunk'>@@ -5119,7 +5119,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5128,33 +5128,33 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Zure makinan GNU/Linux partizio zahar bat aurkitzen bada bakarrik\n"</div><div class='ctx'> "aktibatzen da urrats hau.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX-k orain jakin behar du instalazio berri bat egin behar duzun edo\n"</div><div class='del'>-"lehendik dagoen Mandrakelinux sistema baten bertsioa berritu nahi duzun:\n"</div><div class='add'>+"lehendik dagoen Mandrivalinux sistema baten bertsioa berritu nahi duzun:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Zatirik handienean, sistema zaharra guztiz ezabatzen du. \n"</div><div class='ctx'> "Disko zurruneko partizio-banaketa aldatu nahi baduzu, edo fitxategi-sistema\n"</div><div class='ctx'> "aldatu, erabili aukera hau. Nolanahi ere, zure partizio-eskemaren arabera,\n"</div><div class='ctx'> "lehendik dauden datu batzuk gainidaztea saihestu dezakezu.\n"</div><div class='ctx'> "\n"</div><div class='del'>-" * \"%s\" instalazio-mota honek unean Mandrakelinux sisteman \n"</div><div class='add'>+" * \"%s\" instalazio-mota honek unean Mandrivalinux sisteman \n"</div><div class='ctx'> "instalatuta dituzun paketeak eguneratzeko aukera ematen du. Uneko \n"</div><div class='ctx'> "partizio-eskema eta erabiltzaile-datuak ez dira aldatzen. Bestelako \n"</div><div class='ctx'> "konfigurazio-urrats gehienak erabilgarri mantentzen dira, instalazio\n"</div><div class='ctx'> "estandarretan bezalatsu.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"``Bertsio-berritu'' aukerak ondo funtzionatu behar luke Mandrakelinux\n"</div><div class='del'>-"sistemaren \"8.1\" bertsioetan edo berriagoetan. Mandrakelinux-en \"8.1\" \n"</div><div class='add'>+"``Bertsio-berritu'' aukerak ondo funtzionatu behar luke Mandrivalinux\n"</div><div class='add'>+"sistemaren \"8.1\" bertsioetan edo berriagoetan. Mandrivalinux-en \"8.1\" \n"</div><div class='ctx'> "baino bertsio zaharragoetan ez da gomendatzen Bertsio-berritzea."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -5217,7 +5217,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5259,7 +5259,7 @@ msgstr ""</div><div class='ctx'> "UTF-8 (unicode) euskarriari buruz: Unicode karaktere kodeketa berri bat da,\n"</div><div class='ctx'> "existitzen diren hizkuntza guztiak hartu nahi dituena. Hala ere, "</div><div class='ctx'> "berarentzako\n"</div><div class='del'>-"erabateko euskarria oraindik garatzen ari da GNU/Linux-en, Mandrakelinux-en\n"</div><div class='add'>+"erabateko euskarria oraindik garatzen ari da GNU/Linux-en, Mandrivalinux-en\n"</div><div class='ctx'> "UTF-8 erabilera erabiltzailearen hautaketen araberakoa da:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Jatorrizko kodeketa ahaltsua duen hizkuntza bat aukeratzen baduzu \n"</div><div class='hunk'>@@ -5511,7 +5511,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5532,11 +5532,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Inprimatzeko sistema bat hautatzeko unea da orain.Eeste sistema eragile \n"</div><div class='del'>-"batzuk bakarra eskainiko dizute, baina Mandrakelinux-ek bi eskaintzen ditu.\n"</div><div class='add'>+"batzuk bakarra eskainiko dizute, baina Mandrivalinux-ek bi eskaintzen ditu.\n"</div><div class='ctx'> "Inprimaketa sistema bakoitza egokiago da konfigurazio mota batzuetarako.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- ``print, do not queue'' esapidearen akronimoa da, eta aukera\n"</div><div class='hunk'>@@ -5557,7 +5557,7 @@ msgstr ""</div><div class='ctx'> "hautatzeko eta inprimagailua kudeatzeko interfaze grafikoak ditu.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Hautapena orain egiten baduzu, eta beranduago ohartzen bazara zure\n"</div><div class='del'>-" inprimaketa sistema ez zaizula guztoko Mandrakelinux Aginte Guneko\n"</div><div class='add'>+" inprimaketa sistema ez zaizula guztoko Mandrivalinux Aginte Guneko\n"</div><div class='ctx'> " PrintDrake exekutatuz eta \"%s\" botoian klik eginez alda zenezake."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='hunk'>@@ -5679,7 +5679,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5696,7 +5696,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5764,7 +5764,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": abio zamatzailearen konfigurazioa aldatu nahi baduzu, klikatu\n"</div><div class='ctx'> "botoi hontan. Erabiltzaile aurreratuek bakarrik erabili behar lukete. Jo\n"</div><div class='del'>-"inprimatutako dokumentaziora edo Mandrakelinux Aginte Guneko\n"</div><div class='add'>+"inprimatutako dokumentaziora edo Mandrivalinux Aginte Guneko\n"</div><div class='ctx'> " abio-zamatzailearen konfigurazioari buruzko lerroko laguntzara.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": sarrera honen bitartez zehatz doitu dezakezu zure makinan\n"</div><div class='hunk'>@@ -5831,10 +5831,10 @@ msgstr "Zerbitzuak"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Hautatu Mandrakelinux partizio berria instalatu ahal izateko ezabatu nahi\n"</div><div class='add'>+"Hautatu Mandrivalinux partizio berria instalatu ahal izateko ezabatu nahi\n"</div><div class='ctx'> "duzun disko zurruna. Kontuz ibili, unitate horretako datu guztiak galdu\n"</div><div class='ctx'> "egingo dira eta ezin izango dira berreskuratu!"</div><div class='ctx'> </div><div class='hunk'>@@ -6191,11 +6191,11 @@ msgstr "Windows-en partizioaren tamaina kalkulatzen"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6310,19 +6310,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6344,7 +6344,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6352,14 +6352,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6369,7 +6369,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6389,10 +6389,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6403,11 +6403,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6423,14 +6423,14 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sarrera\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux banaketako sistema eragileari eta erabilgarri dauden osagaiei"</div><div class='add'>+"Mandrivalinux banaketako sistema eragileari eta erabilgarri dauden osagaiei"</div><div class='ctx'> "\"Software-produktuak\"\n"</div><div class='ctx'> "deituko zaie aurrerantzean. Software-produktuetan sartzen dira, besteak \n"</div><div class='del'>-"beste, Mandrakelinux banaketako sistema eragileari eta osagaiei "</div><div class='add'>+"beste, Mandrivalinux banaketako sistema eragileari eta osagaiei "</div><div class='ctx'> "dagozkienprogramak, \n"</div><div class='ctx'> "metodoak, arauak eta dokumentazioa.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6438,7 +6438,7 @@ msgstr ""</div><div class='ctx'> "1. Lizentzia-kontratua\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Irakurri arretaz dokumentu hau. Software produktuei buruz zuk eta "</div><div class='del'>-"Mandrakesoft S.A.k adostutako lizentzia-kontratu bat da.\n"</div><div class='add'>+"Mandriva S.A.k adostutako lizentzia-kontratu bat da.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Software-produktuak instalatu, bikoiztu edo era batean edo bestean erabiliz, "</div><div class='ctx'> "esplizituki \n"</div><div class='hunk'>@@ -6461,7 +6461,7 @@ msgstr ""</div><div class='ctx'> "Software-produktuak eta erantsitako dokumentuak \"dauden-daudenean\"ematen "</div><div class='ctx'> "dira, bermerik gabe, \n"</div><div class='ctx'> "legeak onartzen duen neurrian.\n"</div><div class='del'>-"Mandrakesoft S.A.k ez du, ezein kasutan eta legeak onartzen duen neurrian "</div><div class='add'>+"Mandriva S.A.k ez du, ezein kasutan eta legeak onartzen duen neurrian "</div><div class='ctx'> "erantzukizunik izango,\n"</div><div class='ctx'> "Software-produktuen erabileraren edo erabiltzeko ezgaitasunaren ondorioz "</div><div class='ctx'> "sortutako kalte berezi, ustekabeko \n"</div><div class='hunk'>@@ -6469,17 +6469,17 @@ msgstr ""</div><div class='ctx'> "epai baten ondorioz ordaindu \n"</div><div class='ctx'> "beharreko kuotak eta zigorrak edo beste edozein ondoriozko galera barne, "</div><div class='ctx'> "mugarik gabe), \n"</div><div class='del'>-"Mandrakesoft S.A. jakinaren gainean egon arren halako kalteak gerta \n"</div><div class='add'>+"Mandriva S.A. jakinaren gainean egon arren halako kalteak gerta \n"</div><div class='ctx'> "litezkeela.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "HERRIALDE BATZUETAN SOFTWARE DEBEKATUA EDUKITZEARI EDO ERABILTZEARI "</div><div class='ctx'> "LOTUTAKOERANTZUKIZUN MUGATUA\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Legeak onartzen duen neurrian, Mandrakesoft S.Ak. edo bere banatzaileek, ez "</div><div class='add'>+"Legeak onartzen duen neurrian, Mandriva S.Ak. edo bere banatzaileek, ez "</div><div class='ctx'> "dute, ezein kasutan, \n"</div><div class='ctx'> "erantzukizunik izango herrialde batzuetan, bertako legeek debekatutako edo "</div><div class='ctx'> "mugatutako software-osagaiak edo\n"</div><div class='del'>-"Mandrakelinux-en guneetatik deskargatutako software-osagaiak eduki eta "</div><div class='add'>+"Mandrivalinux-en guneetatik deskargatutako software-osagaiak eduki eta "</div><div class='ctx'> "erabiltzearen ondorioz \n"</div><div class='ctx'> "sortutako kalte berezi ustekabeko, zuzeneko edo zeharkakoengatik (lana "</div><div class='ctx'> "galtzea, lana etetea \n"</div><div class='hunk'>@@ -6504,9 +6504,9 @@ msgstr ""</div><div class='ctx'> "arretaz osagai horren lizentzia-kontratuko baldintzak.  Osagaiaren "</div><div class='ctx'> "lizentziari \n"</div><div class='ctx'> "buruzko galdera oro osagaiaren egileari egin beharko zaio, eta ez "</div><div class='del'>-"Mandrakesoft-i.\n"</div><div class='del'>-"Mandrakesoft S.A.k garatutako programak GPL Lizentziak eaenduak dira. "</div><div class='del'>-"Mandrakesoft S.A.k\n"</div><div class='add'>+"Mandriva-i.\n"</div><div class='add'>+"Mandriva S.A.k garatutako programak GPL Lizentziak eaenduak dira. "</div><div class='add'>+"Mandriva S.A.k\n"</div><div class='ctx'> "idatzitako dokumentazioa lizentzia zehatz baten araberakoa da. Xehetasun "</div><div class='ctx'> "gehiago nahi izanez gero \n"</div><div class='ctx'> "jo dokumentaziora.\n"</div><div class='hunk'>@@ -6518,10 +6518,10 @@ msgstr ""</div><div class='ctx'> "eta software-programei \n"</div><div class='ctx'> "aplikatzen zaizkien jabetza intelektualaren eta copyriht-aren legeen babesa "</div><div class='ctx'> "dute.\n"</div><div class='del'>-"Mandrakesoft S.A.k eskubidea du Software-produktuak bere osotasunean edo "</div><div class='add'>+"Mandriva S.A.k eskubidea du Software-produktuak bere osotasunean edo "</div><div class='ctx'> "zatika aldatzeko, \n"</div><div class='ctx'> "edozein bide erabiliz eta helburu guztietarako.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" eta asoziatutako logotipoak Mandrakesoft S.A."</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" eta asoziatutako logotipoak Mandriva S.A."</div><div class='ctx'> "ren marka erregistratuak dira.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6537,7 +6537,7 @@ msgstr ""</div><div class='ctx'> "konpontzea hobesten da. Azken baliabide gisa, \n"</div><div class='ctx'> "Parisko edo Frantziako epaitegietara eramango da gatazka.\n"</div><div class='ctx'> "Dokumentu honi buruzko edozein zalantza argitzeko, jarri harremanetan\n"</div><div class='del'>-"Mandrakesoft S.A.rekin.  \n"</div><div class='add'>+"Mandriva S.A.rekin.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6631,7 +6631,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6639,20 +6639,20 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Zorionak, instalazioa burutu da.\n"</div><div class='ctx'> "Atera abioko diskoa eta sakatu itzulera-tekla berrabiarazteko.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux-en bertsio honetarako erabilgarri dauden konponbideen \n"</div><div class='add'>+"Mandrivalinux-en bertsio honetarako erabilgarri dauden konponbideen \n"</div><div class='ctx'> "informaziorako, kontsultatu Erratak helbide honetan:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Zure sistema konfiguratzeko informazioa Mandrakelinux-en Erabiltzailearen\n"</div><div class='add'>+"Zure sistema konfiguratzeko informazioa Mandrivalinux-en Erabiltzailearen\n"</div><div class='ctx'> "Gida Ofizialeko instalatu ondorengo azalpenei buruzko kapituluan duzu."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6688,11 +6688,11 @@ msgstr "`%s'. urratsean sartzen\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Sistemak baliabide gutxi ditu. Arazoak izan ditzakezu Mandrakelinux \n"</div><div class='add'>+"Sistemak baliabide gutxi ditu. Arazoak izan ditzakezu Mandrivalinux \n"</div><div class='ctx'> "instalatzeko. Horrela bada, testu-instalazioa egiten saia zaitezke. \n"</div><div class='ctx'> "Horretarako, sakatu `F1' CD-ROMetik abiaraztean, eta idatzi `text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7232,9 +7232,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux web gunearekin konektatzen, ispilu erabilgarrien zerrenda "</div><div class='add'>+"Mandrivalinux web gunearekin konektatzen, ispilu erabilgarrien zerrenda "</div><div class='ctx'> "lortzeko..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7459,8 +7459,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux %s instalazioa"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux %s instalazioa"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10048,13 +10048,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall konfiguratzailea\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux makinarako suebaki pertsonal bat konfiguratzen du.\n"</div><div class='add'>+"Mandrivalinux makinarako suebaki pertsonal bat konfiguratzen du.\n"</div><div class='ctx'> "Suebaki-soluzio ahaltsua eskuratu ahal izateko, kontsultatu\n"</div><div class='ctx'> "MandrakeSecurity suebaki banaketa espezializatua."</div><div class='ctx'> </div><div class='hunk'>@@ -14128,11 +14128,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Exekutatu Scandrake (Hardwarea/Eskanerra Mandrakelinux-en Aginte Gunean) "</div><div class='add'>+"Exekutatu Scandrake (Hardwarea/Eskanerra Mandrivalinux-en Aginte Gunean) "</div><div class='ctx'> "zure eskanerra sarean partekatzeko\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -16085,33 +16085,33 @@ msgstr "Gelditu"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Zer da Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Zer da Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Ongi etorri &lt;b&gt;Mandrakelinux&lt;/b&gt;-era!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Ongi etorri &lt;b&gt;Mandrivalinux&lt;/b&gt;-era!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux &lt;b&gt;Linux banaketa&lt;/b&gt; bat da sistemaren bihotza duena, "</div><div class='add'>+"Mandrivalinux &lt;b&gt;Linux banaketa&lt;/b&gt; bat da sistemaren bihotza duena, "</div><div class='ctx'> "&lt;b&gt;sistema eragilea&lt;/b&gt; deitua (Linux nukleoan oinarritua) &lt;b&gt;aplikazio pila "</div><div class='ctx'> "batekin&lt;/b&gt; batera, izan ditzakezun behar guztiak hasetuko dituena."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux gaur egun Linux banaketa &lt;b&gt;lagunkoiena&lt;/b&gt; da. Gainera "</div><div class='add'>+"Mandrivalinux gaur egun Linux banaketa &lt;b&gt;lagunkoiena&lt;/b&gt; da. Gainera "</div><div class='ctx'> "munduan zehar &lt;b&gt;gehien erabilitakonux&lt;/b&gt; banaketen an artean dago!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16127,14 +16127,14 @@ msgstr "Ongi etorri &lt;b&gt;Iturburu Irekiaren mundura&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux iturburu irekiko ereduari herabat atsekitzen zaio. Honek esan "</div><div class='del'>-"nahi du bertsio berri hau &lt;b&gt;Mandrakesoft-eko garatzaile taldearen&lt;/b&gt; eta "</div><div class='del'>-"Mandrakelinux-en &lt;b&gt;mundu zabaleko&lt;/b&gt; komunitatearen arteko "</div><div class='add'>+"Mandrivalinux iturburu irekiko ereduari herabat atsekitzen zaio. Honek esan "</div><div class='add'>+"nahi du bertsio berri hau &lt;b&gt;Mandriva-eko garatzaile taldearen&lt;/b&gt; eta "</div><div class='add'>+"Mandrivalinux-en &lt;b&gt;mundu zabaleko&lt;/b&gt; komunitatearen arteko "</div><div class='ctx'> "&lt;b&gt;lankidetzaren&lt;/b&gt; emaitza dela."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='hunk'>@@ -16155,9 +16155,9 @@ msgstr "&lt;b&gt;GPLa&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Banaketa honetan sartutako software gehiena eta Mandrakelinux tresna guztiak "</div><div class='add'>+"Banaketa honetan sartutako software gehiena eta Mandrivalinux tresna guztiak "</div><div class='ctx'> "&lt;b&gt;Lizentzia Publiko Orokorra&lt;/b&gt;ren babesean lizentziatuta daude."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16183,20 +16183,20 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:13</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "&lt;b&gt;Join the Community&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Elkartu Mandrakelinux komunitatera&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Elkartu Mandrivalinux komunitatera&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux-ek erabitzaile eta garatzaile &lt;b&gt;komunitate handienetako&lt;/b&gt; "</div><div class='add'>+"Mandrivalinux-ek erabitzaile eta garatzaile &lt;b&gt;komunitate handienetako&lt;/b&gt; "</div><div class='ctx'> "bat dauka. Horrelako komunitate baten eginkizuna oso zabala da, akatsak "</div><div class='ctx'> "jakinaraztetik aplikazio berrien garapenera. Komunitateak &lt;b&gt;funtsezko "</div><div class='del'>-"eginkizuna&lt;/b&gt; betetzen du Mandrakelinux munduan."</div><div class='add'>+"eginkizuna&lt;/b&gt; betetzen du Mandrivalinux munduan."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16217,10 +16217,10 @@ msgstr "&lt;b&gt;Deskargatzeko bertsioa&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Orain &lt;b&gt;Mandrakelinux Download&lt;/b&gt; instalatzen ari zara. Hau Mandrakesoftek "</div><div class='add'>+"Orain &lt;b&gt;Mandrivalinux Download&lt;/b&gt; instalatzen ari zara. Hau Mandrivaek "</div><div class='ctx'> "&lt;b&gt;guztientzako eskuragarri&lt;/b&gt; mantendu nahi duen doako bertsioa da."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -16252,9 +16252,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Beste Mandrakesoft produktuetan &lt;b&gt;ematen diren zerbitzuetara&lt;/b&gt; ere ezingo "</div><div class='add'>+"Beste Mandriva produktuetan &lt;b&gt;ematen diren zerbitzuetara&lt;/b&gt; ere ezingo "</div><div class='ctx'> "duzu sarbiderik eduki."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -16264,8 +16264,8 @@ msgstr "&lt;b&gt;Discovery, Zure Lehenengo Linux Idaztegia&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Orain &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt; instalatzen ari zara."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Orain &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt; instalatzen ari zara."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16287,17 +16287,17 @@ msgstr "&lt;b&gt;PowerPack, Linux Idaztegia Gorena&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt; instalatzen ari zara."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt; instalatzen ari zara."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack Mandrakesoft-en &lt;b&gt;lehen mailako idaztegi&lt;/b&gt; produktua da. "</div><div class='add'>+"PowerPack Mandriva-en &lt;b&gt;lehen mailako idaztegi&lt;/b&gt; produktua da. "</div><div class='ctx'> "PowerPack-ek &lt;b&gt;milaka aplikazio&lt;/b&gt; dakartza - guztia ospetsuenetatik "</div><div class='ctx'> "aurreratuenetara."</div><div class='ctx'> </div><div class='hunk'>@@ -16308,8 +16308,8 @@ msgstr "&lt;b&gt;PowerPack+, Idaztegi eta Zerbitzarietarako Linux Soluzioa&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt; instalatzen ari zara."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt; instalatzen ari zara."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16325,21 +16325,21 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft Produktuak&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Produktuak&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt;ek &lt;b&gt;Mandrakelinux&lt;/b&gt; produktu eremu zabala garatudu."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt;ek &lt;b&gt;Mandrivalinux&lt;/b&gt; produktu eremu zabala garatudu."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux produktuak dira:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux produktuak dira:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16359,72 +16359,72 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, Idaztegi eta Zerbitzarietarako Linux Soluzioa."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux x86-64-rako&lt;/b&gt;, zure 64-biteko prozesatzaileari onena "</div><div class='del'>-"ateratzeko Mandrakelinux soluzioa."</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux x86-64-rako&lt;/b&gt;, zure 64-biteko prozesatzaileari onena "</div><div class='add'>+"ateratzeko Mandrivalinux soluzioa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft Produktuak (Nomada Produktuak)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Produktuak (Nomada Produktuak)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft-ek bi produktu garatu ditu Mandrakelinux &lt;b&gt;edozein "</div><div class='add'>+"Mandriva-ek bi produktu garatu ditu Mandrivalinux &lt;b&gt;edozein "</div><div class='ctx'> "konputagailutan&lt;/b&gt; erabili ahal izateko berau instalatu beharrik gabe:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Move&lt;/b&gt;, osorik CD-ROM abiarazle batetik exekutatzen den "</div><div class='del'>-"Mandrakelinux banaketa bat."</div><div class='add'>+"Mandrivalinux banaketa bat."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, “LaCie Mobile Hard Drive” ultra-konpaktoan aurre-"</div><div class='del'>-"instalatutako Mandrakelinux banaketa bat."</div><div class='add'>+"instalatutako Mandrivalinux banaketa bat."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft Produktuak (Soluzio Profesionalak)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Produktuak (Soluzio Profesionalak)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Azpian daude &lt;b&gt;behar profesionalei&lt;/b&gt; erantzuteko diseinatutako "</div><div class='del'>-"Mandrakesoft produktuak:"</div><div class='add'>+"Mandriva produktuak:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Enpresentzako Mandrakelinux Idaztegia."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Enpresentzako Mandrivalinux Idaztegia."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrakelinux Zerbitzari Soluzioa."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrivalinux Zerbitzari Soluzioa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrakelinux Segurtasun Soluzioa."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrivalinux Segurtasun Soluzioa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16468,10 +16468,10 @@ msgstr "&lt;b&gt;Hautatu zure Idaztegi Ingurune Gogokoena&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PowerPack-ekin &lt;b&gt;idaztegi ingurune grafikoaren&lt;/b&gt; aukera izango duzu. "</div><div class='del'>-"Mandrakesoft-ek &lt;b&gt;KDE&lt;b&gt; aukeratu du lehetsi gisa."</div><div class='add'>+"Mandriva-ek &lt;b&gt;KDE&lt;b&gt; aukeratu du lehetsi gisa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16495,10 +16495,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PowerPack+-ekin &lt;b&gt;idaztegi ingurune grafikoaren&lt;/b&gt; aukera izango duzu. "</div><div class='del'>-"Mandrakesoft-ek &lt;b&gt;KDE&lt;b&gt; aukeratu du lehetsi gisa."</div><div class='add'>+"Mandriva-ek &lt;b&gt;KDE&lt;b&gt; aukeratu du lehetsi gisa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16626,10 +16626,10 @@ msgstr "&lt;b&gt;Gozatu ezazu Aplikazio Eremu Zabala&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux menuan zure eginbehar guztientzako aplikazio erabilerrazak "</div><div class='add'>+"Mandrivalinux menuan zure eginbehar guztientzako aplikazio erabilerrazak "</div><div class='ctx'> "aurkituko dituzu:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16899,18 +16899,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux kontrol-zentroa&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux kontrol-zentroa&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakelinux Aginte Gunea&lt;/b&gt; zure konputagailuaren konfigurazioa "</div><div class='del'>-"errazteko diseinatutako Mandrakelinux-en ezinbesteko utilitate espezifikoen "</div><div class='add'>+"&lt;b&gt;Mandrivalinux Aginte Gunea&lt;/b&gt; zure konputagailuaren konfigurazioa "</div><div class='add'>+"errazteko diseinatutako Mandrivalinux-en ezinbesteko utilitate espezifikoen "</div><div class='ctx'> "bilduma bat da."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16934,16 +16934,16 @@ msgstr "&lt;b&gt;Iturburu Irekidun Eredua&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Konputagailu programaketa guztiak bezala, iturburu irekiko softwareak "</div><div class='ctx'> "&lt;b&gt;denbora eta jendea&lt;/b&gt; behar du garapenerako. Iturburu irekiko filosofia "</div><div class='del'>-"errespetatzeko asmoz, Mandrakesoft-ek balio erantsidun produktu eta "</div><div class='del'>-"zerbitzuak saltzen ditu &lt;b&gt;Mandrakelinux hobetzen jarraitzeko&lt;/b&gt;. "</div><div class='del'>-"&lt;b&gt;Iturburu irekiko filosofiari&lt;/b&gt; eta Mandrakelinux-en garapenari laguntza "</div><div class='add'>+"errespetatzeko asmoz, Mandriva-ek balio erantsidun produktu eta "</div><div class='add'>+"zerbitzuak saltzen ditu &lt;b&gt;Mandrivalinux hobetzen jarraitzeko&lt;/b&gt;. "</div><div class='add'>+"&lt;b&gt;Iturburu irekiko filosofiari&lt;/b&gt; eta Mandrivalinux-en garapenari laguntza "</div><div class='ctx'> "eman nahi badiezu, &lt;b&gt;mesedez&lt;/b&gt; gogoan hartu gure produktu edo "</div><div class='ctx'> "zerbitzuetako baten erosketa!"</div><div class='ctx'> </div><div class='hunk'>@@ -16955,10 +16955,10 @@ msgstr "&lt;b&gt;Lerroko Denda&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft produktu eta zerbitzuei buruz gehiago ikasteko, gure &lt;b&gt;e-"</div><div class='add'>+"Mandriva produktu eta zerbitzuei buruz gehiago ikasteko, gure &lt;b&gt;e-"</div><div class='ctx'> "commece plataforma&lt;/b&gt; bisitatu dezakezu."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16984,23 +16984,23 @@ msgstr "Joan gaur bertan &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; gunera"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; zure Mandrakelinux produktuen &lt;b&gt;lagunperfektua&lt;/b&gt; da..."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; zure Mandrivalinux produktuen &lt;b&gt;lagunperfektua&lt;/b&gt; da..."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Baliatu Mandrakeclub-eko kide eginez eskuratuko dituzun onurez, hala nola:"</div><div class='add'>+"Baliatu Mandriva Club-eko kide eginez eskuratuko dituzun onurez, hala nola:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17022,40 +17022,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Parte-hartzea Mandrakelinux &lt;b&gt;erabiltzaile foruetan&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Parte-hartzea Mandrivalinux &lt;b&gt;erabiltzaile foruetan&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* Askapen publikoaren aurretik &lt;b&gt;sarbide goiztiar eta pribilegiatua&lt;/b&gt;, "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO irudietara&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO irudietara&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; Mandrakesoft bere bezeroei erabil dezaten eskaintzeaz "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; Mandriva bere bezeroei erabil dezaten eskaintzeaz "</div><div class='ctx'> "harro dagoen premium zerbitzu berria da!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline-k zerbitzu baliogarrien aukera zabala eskaintzen du zure "</div><div class='del'>-"Mandrakelinux sistema &lt;b&gt;erraz eguneratzeko&lt;/b&gt;:"</div><div class='add'>+"Mandriva Online-k zerbitzu baliogarrien aukera zabala eskaintzen du zure "</div><div class='add'>+"Mandrivalinux sistema &lt;b&gt;erraz eguneratzeko&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17081,40 +17081,40 @@ msgstr "\t* Eguneraketa &lt;b&gt;programazio&lt;/b&gt; malgua."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Zure &lt;b&gt;Mandrakelinux sistema guztien&lt;/b&gt; kudeaketa kontu bakarrarekin."</div><div class='add'>+"\t* Zure &lt;b&gt;Mandrivalinux sistema guztien&lt;/b&gt; kudeaketa kontu bakarrarekin."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Laguntza&lt;/b&gt; behar duzu? Mandrakesoft-en aditu teknikoak aurkituko dituzu "</div><div class='add'>+"&lt;b&gt;Laguntza&lt;/b&gt; behar duzu? Mandriva-en aditu teknikoak aurkituko dituzu "</div><div class='ctx'> "www.mandrakeexpert.com &lt;b&gt;gure euskarri teknikoaren plataforman&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakelinux aditu gaituen&lt;/b&gt; laguntzari esker, denbora asko aurreztuko "</div><div class='add'>+"&lt;b&gt;Mandrivalinux aditu gaituen&lt;/b&gt; laguntzari esker, denbora asko aurreztuko "</div><div class='ctx'> "duzu."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux-ekin zerikusia duten galderak erantzuteko, &lt;b&gt;store."</div><div class='add'>+"Mandrivalinux-ekin zerikusia duten galderak erantzuteko, &lt;b&gt;store."</div><div class='ctx'> "mandrakesoft.com&lt;/b&gt;-en euskarri gertakariak erosteko aukera daukazu."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17414,8 +17414,8 @@ msgstr "Gainbegiraketa tresnak, prozesuen kotabilitatea, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft Morroiak"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva Morroiak"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17568,7 +17568,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17639,14 +17639,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='del'>-"  --no-confirmation      ez eskatu berrespenik MandrakeUpdate moduan\n"</div><div class='add'>+"  --no-confirmation      ez eskatu berrespenik Mandriva Update moduan\n"</div><div class='ctx'> "  --no-verify-rpm        ez egiaztatu paketeen sinadurak\n"</div><div class='ctx'> "  --changelog-first      bistaratu changelog fitxategi-zerrendaren aurretik "</div><div class='ctx'> "azalpenen leihoan\n"</div><div class='hunk'>@@ -20444,13 +20444,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux-en programa-erroreen berri emateko tresna"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux-en programa-erroreen berri emateko tresna"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux-en kontrol-zentroa"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux-en kontrol-zentroa"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20470,8 +20470,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20515,8 +20515,8 @@ msgstr "Konfigurazio-morroiak"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Aukeratu Mandrakesoft Tresna:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Aukeratu Mandriva Tresna:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20943,20 +20943,20 @@ msgstr "Abioan abiaraztekoa"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Interfaze hau ez da oraindik konfiguratu.\n"</div><div class='del'>-"Exekutatu Mandrakelinux kontrol-zentroko \"Gehitu interfaze bat\" "</div><div class='add'>+"Exekutatu Mandrivalinux kontrol-zentroko \"Gehitu interfaze bat\" "</div><div class='ctx'> "laguntzailea"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ez daukazu konfiguratutako Internet loturarik.\n"</div><div class='del'>-"Exekutatu Mandrakelinux Aginte Guneko \"%s\" morroia"</div><div class='add'>+"Exekutatu Mandrivalinux Aginte Guneko \"%s\" morroia"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21006,8 +21006,8 @@ msgstr "KDM (KDE konexioen kudeatzailea)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux konexioen kudeatzailea)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux konexioen kudeatzailea)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21306,7 +21306,7 @@ msgstr "Inportatu"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21315,7 +21315,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (jatorrizko bertsioa)\n"</div><div class='hunk'>@@ -21860,14 +21860,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Software librea da, eta birbana daiteke GNU GPL lizentziaren baldintzak "</div><div class='ctx'> "betetzen badira.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21895,8 +21895,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux Laguntza Gunea"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux Laguntza Gunea"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25428,8 +25428,8 @@ msgstr "Aldaketa egin da, baina, eragina izan dezan, saioa amaitu behar duzu"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux Tresnen Erregistroak"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux Tresnen Erregistroak"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25942,7 +25942,7 @@ msgstr "Konexioa osatu da."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Konexioak huts egin du.\n"</div><div class='ctx'> "Egiaztatu zure konfigurazioa Mandrake-ren kontrol-zentroan."</div><div class='head'>diff --git a/perl-install/share/po/fa.po b/perl-install/share/po/fa.po<br/>index 0cd56213d..4cacbf188 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/fa.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/fa.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/fa.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/fa.po</a></div><div class='hunk'>@@ -66,7 +66,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "کلید USB بنظر می‌رسد که حفاظت نگارش را بکار گرفته باشد، ولی اکنون نمی‌توانیم\n"</div><div class='ctx'> "آن را بسلامتی خارج کنیم.\n"</div><div class='hunk'>@@ -74,7 +74,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "دکمه را برای آغازگری مجدد کلیک کنید، آن را خارج کرده، حفاظت نگارش را "</div><div class='ctx'> "بردارید،\n"</div><div class='del'>-"کلید را دوباره وصل کرده، و Mandrake Move را دوباره راه‌اندازی کنید."</div><div class='add'>+"کلید را دوباره وصل کرده، و Mandriva Move را دوباره راه‌اندازی کنید."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -92,7 +92,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "کلید USB شما هیچ قسمت‌بندی معتبر (FAT) ویندوز ندارد.\n"</div><div class='hunk'>@@ -103,14 +103,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "شما می‌توانید بدون یک کلید USB نیز پیشروی کنید - هنوز\n"</div><div class='del'>-"قادر خواهید بود از Mandrake Move مانند یک سیستم عامل\n"</div><div class='add'>+"قادر خواهید بود از Mandriva Move مانند یک سیستم عامل\n"</div><div class='ctx'> "ماندرایک زنده‌ی عادی استفاده کنید."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -118,7 +118,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ما هیچ کلید USB را بر سیستم‌تان شناسائی نکردیم. اگر شما\n"</div><div class='hunk'>@@ -255,7 +255,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1308,7 +1308,7 @@ msgstr "گزینش زبان"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3730,7 +3730,7 @@ msgstr "بکار انداختن پشتیبانی رادیو"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3915,7 +3915,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3931,11 +3931,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4100,10 +4100,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4291,7 +4291,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4466,12 +4466,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4498,7 +4498,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4507,7 +4507,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4725,7 +4725,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4765,7 +4765,7 @@ msgstr "پیشین"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4806,7 +4806,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4835,7 +4835,7 @@ msgstr "مدیر امنیت"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4992,7 +4992,7 @@ msgstr "تعویض بین حالت عادی/کارشناسی"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5071,7 +5071,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5080,13 +5080,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "این گام فقط در صورتی که یک قسمت‌بندی قدیمی لینوکس/گنو بر ماشین شما پیدا شود\n"</div><div class='ctx'> "فعال می‌گردد. \n"</div><div class='hunk'>@@ -5161,7 +5161,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5446,7 +5446,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5467,7 +5467,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "اکنون زمان آن رسیده است که سیستم چاپ را بر روی رایانه خود انتخاب کنید. "</div><div class='hunk'>@@ -5620,7 +5620,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5637,7 +5637,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5767,7 +5767,7 @@ msgstr "سرویس‌ها"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "دستگاه دیسکی را که می‌خواهید برای نصب قسمت‌بندی جدید لینوکس ماندرایک\n"</div><div class='hunk'>@@ -6122,7 +6122,7 @@ msgstr "حساب کردن اندازه‌ی قسمت‌بندی ویندوز"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "قسمت‌بندی ویندوز شما خیلی درهم ریخته است. لطفا رایانه‌ی خود را با ویندوز "</div><div class='hunk'>@@ -6244,19 +6244,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6278,7 +6278,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6286,14 +6286,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6303,7 +6303,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6323,10 +6323,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6337,11 +6337,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6357,7 +6357,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "معرفی\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6370,7 +6370,7 @@ msgstr ""</div><div class='ctx'> "۱. توافق‌نامه‌ی مجوز\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "لطفاً این نوشتار را با دقت بخوانید. این نوشتار یک توافق‌نامه‌ی مجوز بین شما و \n"</div><div class='del'>-"شرکت Mandrakesoft S.A می‌باشد که شامل محصولات نرم‌افزاری می‌شود.\n"</div><div class='add'>+"شرکت Mandriva S.A می‌باشد که شامل محصولات نرم‌افزاری می‌شود.\n"</div><div class='ctx'> "با نصب کردن، تکثیر یا استفاده از محصولات نرم‌افزاری به هر طریق، شما شروط\n"</div><div class='ctx'> "این مجوز را صریحاُ پذیرفته و قبول کرده‌اید. اگر موافق با هر قسمت از مجوز "</div><div class='ctx'> "نیستید،\n"</div><div class='hunk'>@@ -6385,18 +6385,18 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "محصولات نرم‌افزاری و نوشتار همراه بطور \"همینطوری\"، بدون هیچ ضمانتی\n"</div><div class='ctx'> "و تا جایی که قانون اجازه می‌دهد، عرضه شده‌اند.\n"</div><div class='del'>-"شرکت Mandrakesoft S.A. در هیچ شرایطی و تا جایی که قانون اجازه می‌دهد،\n"</div><div class='add'>+"شرکت Mandriva S.A. در هیچ شرایطی و تا جایی که قانون اجازه می‌دهد،\n"</div><div class='ctx'> "مسئول هر اتفاق مخصوص، هر خرابی مستقیم یا غیر مستقیم (شامل خرابی‌های نامحدود\n"</div><div class='ctx'> "برای از دست دادن شغل، اشکالات شغلی، ضرر مالی و جریمه‌های از طرف یک دادگاه\n"</div><div class='ctx'> "یا هر ضرر متعاقب دیگر) در پی‌ استفاده یا ناتوانی در استفاده از محصولات "</div><div class='ctx'> "نرم‌افزاری،\n"</div><div class='del'>-"حتی اگر Mandrakesoft S.A.از احتمال یا پیش‌آمد چنین خرابی‌هایی مطلع شده باشد\n"</div><div class='add'>+"حتی اگر Mandriva S.A.از احتمال یا پیش‌آمد چنین خرابی‌هایی مطلع شده باشد\n"</div><div class='ctx'> "نخواهد بود.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "مسئولیت محدود مربوط به داشتن یا استفاده از نرم‌افزار ممنوعه در بعضی از "</div><div class='ctx'> "کشورها\n"</div><div class='ctx'> "\n"</div><div class='del'>-"شرکت Mandrakesoft S.A. یا توزیع کنندگان آن در هیچ شرایطی و تا جایی که قانون "</div><div class='add'>+"شرکت Mandriva S.A. یا توزیع کنندگان آن در هیچ شرایطی و تا جایی که قانون "</div><div class='ctx'> "اجازه می‌دهد،\n"</div><div class='ctx'> "مسئول هر اتفاق مخصوص، هر خرابی مستقیم یا غیر مستقیم (شامل خرابی‌های نامحدود\n"</div><div class='ctx'> "برای از دست دادن شغل، اشکالات شغلی، ضرر مالی و جریمه‌های از طرف یک دادگاه\n"</div><div class='hunk'>@@ -6423,7 +6423,7 @@ msgstr ""</div><div class='ctx'> "مربوط به مجوز \n"</div><div class='ctx'> "نرم‌افزار بایستی به نویسنده‌ی آن نرم‌افزار ونه به ماندرایک فرستاده شوند. "</div><div class='ctx'> "برنامه‌های تهیه شده بوسیله \n"</div><div class='del'>-"ماندرایک توسط مجوز GPL اداره می‌شوند. نوشتارهای نوشته شده توسط Mandrakesoft S."</div><div class='add'>+"ماندرایک توسط مجوز GPL اداره می‌شوند. نوشتارهای نوشته شده توسط Mandriva S."</div><div class='ctx'> "A. تحت \n"</div><div class='ctx'> "مجوز مخصوص اداره می‌شوند. لطفاً به این نوشتارها برای توضیحات بیشتر مراجعه "</div><div class='ctx'> "کنید.\n"</div><div class='hunk'>@@ -6433,10 +6433,10 @@ msgstr ""</div><div class='ctx'> "تمام حقوق برنامه‌های محصولات نرم‌افزاری به نویسندگان هر یک از آنها تعلق داشته "</div><div class='ctx'> "و بوسیله \n"</div><div class='ctx'> "مالکیت نبوغی و قوانین حق امتیاز برنامه‌های نرم‌افزاری حفاظت می‌شوند. \n"</div><div class='del'>-"شرکت Mandrakesoft S.A.حقوق امتیازی خود را برای تغییر یا وفق دادن محصولات "</div><div class='add'>+"شرکت Mandriva S.A.حقوق امتیازی خود را برای تغییر یا وفق دادن محصولات "</div><div class='ctx'> "نرم‌افزاری \n"</div><div class='ctx'> "بطور کامل یا قسمت‌هایی از آنها، در هر صورت و برای هر منظور محفوظ می‌دارد. \n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" و علائم مربوطه آرم‌های بازرگانی Mandrakesoft "</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" و علائم مربوطه آرم‌های بازرگانی Mandriva "</div><div class='ctx'> "S.A. می باشند.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6450,7 +6450,7 @@ msgstr ""</div><div class='ctx'> "شروط این مجوز توسط قوانین کشور فرانسه تصویب و اجرا می‌شوند. \n"</div><div class='ctx'> "هر اختلافی در شروط این مجوز ترجیحاً توسط دادگاه حل خواهد گردید. در آخرین \n"</div><div class='ctx'> "مرحله، اختلاف به دادسرای قانون پاریس - فرانسه ارجاع داده خواهد شد. \n"</div><div class='del'>-"برای هر سؤالی درباره این نوشتار لطفاً با Mandrakesoft S.A. تماس بگیرید.\n"</div><div class='add'>+"برای هر سؤالی درباره این نوشتار لطفاً با Mandriva S.A. تماس بگیرید.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6536,7 +6536,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6544,7 +6544,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "تبریک میگوییم، نصب تکمیل شده است.\n"</div><div class='ctx'> "رسانه‌ی آغازگر را برداشته و برگشت را برای آغازگری مجدد فشار دهید.\n"</div><div class='hunk'>@@ -6593,7 +6593,7 @@ msgstr "ورود به مرحله‌ی `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -7137,7 +7137,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "در حال تماس گرفتن با وب‌گاه لینوکس ماندرایک برای دریافت لیست پایگاه‌های "</div><div class='ctx'> "آینه‌های موجود..."</div><div class='hunk'>@@ -7362,7 +7362,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr "نصب لینوکس ماندرایک %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -9949,7 +9949,7 @@ msgstr "بیت‌تورنت"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13981,7 +13981,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15900,18 +15900,18 @@ msgstr "ایست"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;لینوکس ماندرایک چیست؟&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "به &lt;b&gt;ماندرایک&lt;/b&gt; خوش آمدید!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15923,7 +15923,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "لینوکس ماندرایک &lt;b&gt;کاربر دوستانه‌ترین&lt;/b&gt; پخش لینوکس امروز است.  لینوکس "</div><div class='hunk'>@@ -15942,9 +15942,9 @@ msgstr "به &lt;b&gt;دنیای منبع باز&lt;/b&gt; خوش آمدید!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "لینوکس ماندرایک به مدل منبع باز متعهد است. این بدین معنی است که این توزیع "</div><div class='hunk'>@@ -15968,7 +15968,7 @@ msgstr "&lt;b&gt;The GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "بسیاری از نرم افزارهای ضمیمه در این پخش و همه ابزار لینوکس ماندرایک تحت مجوز "</div><div class='ctx'> "&lt;b&gt;General Public License&lt;/b&gt; هستند."</div><div class='hunk'>@@ -16001,10 +16001,10 @@ msgstr "&lt;b&gt;به جامعه بپیوندید&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "لینوکس ماندرایک یکی از &lt;b&gt;بزرگترین جوامع&lt;/b&gt; کاربران و توسعه دهندگان است. "</div><div class='ctx'> "نقش چنین جامعه‌ای بسیار پهناور، از گزارش اشکال تا توسعه برنامه های جدید است. "</div><div class='hunk'>@@ -16029,8 +16029,8 @@ msgstr "&lt;b&gt;نسخه‌ی بارگیری&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "شما اکنون در حال نصب &lt;b&gt;لینوکس ماندرایک نسخه بارگیری&lt;/b&gt; هستید. این نسخه "</div><div class='ctx'> "آزاد نرم افزار ماندرایک است که در &lt;b&gt;دسترس همگان&lt;/b&gt; قرار میگیرد."</div><div class='hunk'>@@ -16064,7 +16064,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "شما دستیابی به &lt;b&gt;خدمات ضمیمه&lt;/b&gt; در محصولات دیگر نرم افزار ماندرایک نیز "</div><div class='ctx'> "نخواهید داشت."</div><div class='hunk'>@@ -16076,7 +16076,7 @@ msgstr "&lt;b&gt;اکتشاف, اولین رومیزی لینوکس خود&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr "شما اکنون در حال نصب &lt;b&gt;لینوکس ماندرایک اکتشافی&lt;/b&gt; هستید."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -16098,13 +16098,13 @@ msgstr "&lt;b&gt;بسته قدرتی، رومیزی لینوکس نهایی&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr "شما اکنون در حال نصب &lt;b&gt;بسته قدرتی لینوکس ماندرایک&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16118,7 +16118,7 @@ msgstr "&lt;b&gt;بسته قدرتی+، راه حل لینوکس برای رومیزی</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr "شما اکنون در حال نصب &lt;b&gt;بسته قدرتی+ لینوکس ماندرایک&lt;/b&gt; هستید."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -16135,13 +16135,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;محصولات نرم افزار ماندرایک&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "&lt;b&gt;نرم افزار ماندرایک&lt;/b&gt; گستره پهناوری از محصولات &lt;b&gt;لینوکس ماندرایک&lt;/b&gt; را "</div><div class='hunk'>@@ -16149,7 +16149,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr "محصولات لینوکس ماندرایک عبارتند از:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -16170,20 +16170,20 @@ msgstr "\t* &lt;b&gt;بسته قدرتی+&lt;/b&gt;, راه حل لینوکس برای رو�</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;لینوکس ماندرایک x86-64&lt;/b&gt;, راه حل لینوکس ماندرایک برای پردازه ۶۴-بیت."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;محصولات نرم افزار ماندرایک (محصولات بدوی)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "نرم افزار ماندرایک دو محصول را که به شما اجازه میدهد تا از لینوکس ماندرایک "</div><div class='hunk'>@@ -16193,7 +16193,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;انتقال&lt;/b&gt;, پخش لینوکس ماندرایک که کاملا از یک سی دی قابل آغازگری "</div><div class='hunk'>@@ -16202,7 +16202,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, پخش لینوکس ماندرایکی که بر دیسک همراه بسیار کوچک "</div><div class='hunk'>@@ -16210,13 +16210,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;محصولات نرم افزار ماندرایک (راه حلهای حرفه ای)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "در زیر محصولات نرم افزار ماندرایک که برای &lt;b&gt;نیازهای حرفه‌ای&lt;/b&gt; طراحی شده‌اند "</div><div class='hunk'>@@ -16224,17 +16224,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr "\t* &lt;b&gt;رومیزی چندشرکتی&lt;/b&gt;, رومیزی لینوکس ماندرایک برای شرکتها."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr "\t* &lt;b&gt;کارگزار چندشرکتی&lt;/b&gt;, راه حل کارگزاری لینوکس ماندرایک.."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr "\t* &lt;b&gt;دیوار آتش چند-شبکه‌ای&lt;/b&gt;, راه حل امنیتی لینوکس ماندرایک."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -16278,7 +16278,7 @@ msgstr "&lt;b&gt;محیط رومیزی محبوبتان را انتخاب کنید!&lt;/b</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "با بسته قدرتی، شما گزینه &lt;b&gt;محیط رومیزی گرافیکی&lt;/b&gt; را دارید. نرم افزار "</div><div class='ctx'> "ماندرایک &lt;b&gt;کدئی&lt;/b&gt; را مانند یک پیش‌فرض انتخاب کرده است."</div><div class='hunk'>@@ -16305,7 +16305,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "با بسته قدرتی+ شما گزینه &lt;b&gt;محیط رومیزی گرافیکی&lt;/b&gt; را دارید. نرم افزار "</div><div class='ctx'> "ماندرایک &lt;b&gt;کدئی&lt;/b&gt; را مانند پیش‌فرض انتخاب کرده است."</div><div class='hunk'>@@ -16431,7 +16431,7 @@ msgstr "&lt;b&gt;از گستره‌ی پهناوری از برنامه‌های کار</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "در منوی لینوکس ماندرایک برای &lt;b&gt;همه کارهایتان&lt;/b&gt; برنامه های &lt;b&gt;آسان&lt;/b&gt; "</div><div class='hunk'>@@ -16687,14 +16687,14 @@ msgstr "\t* &lt;b&gt;Postfix&lt;/b&gt; و &lt;b&gt;Sendmail&lt;/b&gt;: کارگزاران قدرتمند</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;مرکز کنترل ماندرایک&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "&lt;b&gt;مرکز کنترل لینوکس ماندرایک&lt;b&gt; مجموعه اساسی از وسایل مخصوص لینوکس ماندرایک "</div><div class='hunk'>@@ -16721,9 +16721,9 @@ msgstr "&lt;b&gt;مدل منبع باز&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "مانند هر برنامه ریزی رایانه‌ای، نرم افزار منبع باز &lt;b&gt; به زمان و مردم &lt;/b&gt; "</div><div class='hunk'>@@ -16740,7 +16740,7 @@ msgstr "&lt;b&gt;فروشگاه اینترنتی&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "برای یادگیری درباره محصولات و خدمات نرم افزار ماندرایک میتوانید از &lt;b&gt;پایگاه "</div><div class='hunk'>@@ -16767,13 +16767,13 @@ msgstr "امروز به &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; سری بزنید"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "&lt;b&gt;باشگاه ماندرایک&lt;/b&gt; کاملترین &lt;b&gt;همراه&lt;/b&gt; برای محصول لینوکس ماندرایک است.."</div><div class='hunk'>@@ -16781,7 +16781,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "با پیوستن به باشگاه ماندرایک از خدمات، محصولات و &lt;b&gt;منافع با ارزش&lt;/b&gt; بهره "</div><div class='ctx'> "ببرید، مانند:"</div><div class='hunk'>@@ -16805,27 +16805,27 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr "\t* شرکت کردن در &lt;b&gt;انجمنهای کاربری&lt;/b&gt; لینوکس ماندرایک."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;دستیابی زودتر و مخصوص&lt;/b&gt;، قبل از پخش عمومی، به &lt;b&gt;تصاویر ISO&lt;/b&gt; "</div><div class='ctx'> "لینوکس ماندرایک."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ماندرایک بر اینترنت&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "&lt;b&gt;ماندرایک در اینترنت&lt;/b&gt; سرویس اولیه‌ای جدیدی است که نرم افزار ماندرایک "</div><div class='hunk'>@@ -16834,8 +16834,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ماندرایک در انیترنت گستره‌ی پهناوری از خدمات باارزش را برای &lt;b&gt;بروزسازی آسان&lt;/"</div><div class='ctx'> "b&gt; سیستمهای لینوکس ماندرایکتان عرضه میدارد:"</div><div class='hunk'>@@ -16862,18 +16862,18 @@ msgstr "\t* بروزسازیهای متغیر &lt;b&gt;زمان بندی شده&lt;/b&gt;."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr "\t* سازماندهی &lt;b&gt;همگی سیستمهای لینوکس ماندرایکتان&lt;/b&gt; با یک حساب."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "آیا نیاز به &lt;b&gt;دستیار&lt;/b&gt; دارید؟ کارشناسان فنی نرم افزار ماندرایک را در "</div><div class='hunk'>@@ -16882,7 +16882,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "با سپاس از کمک &lt;b&gt;کارشناسان لینوکس ماندرایک&lt;/b&gt;، زمان زیادی را ذخیره خواهید "</div><div class='hunk'>@@ -16891,7 +16891,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "برای هر پرسش مربوط به لینوکس ماندرایک، شما امکان خرید پشتیبانی را در "</div><div class='hunk'>@@ -17188,7 +17188,7 @@ msgstr "ابزار پایشگری، پروسه های حسابداری، tcpdump</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "جادوگران نرم افزار ماندرایک"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -17338,7 +17338,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17408,7 +17408,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -20186,12 +20186,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "ابزار گزارش اشکال لینوکس ماندرایک"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "مرکز کنترل ماندرایک"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -20212,7 +20212,7 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr "ماندرایک بر اینترنت"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -20257,7 +20257,7 @@ msgstr "جادوگرهای پیکربندی"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr "ابزار نرم‌افزار ماندرایک را انتخاب کنید:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -20683,7 +20683,7 @@ msgstr "راه‌اندازی شده در آغازگری"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "این واسط هنوز پیکربندی نشده است.\n"</div><div class='ctx'> "دستیار \"افزودن واسطی\" را از مرکز کنترل ماندرایک اجرا کنید"</div><div class='hunk'>@@ -20692,7 +20692,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "شما هیچ اتصال اینترنتی پیکربندی شده ندارید.\n"</div><div class='ctx'> "دستیار \"%s\" را از مرکز کنترل لینوکس ماندرایک اجرا کنید"</div><div class='hunk'>@@ -20745,7 +20745,7 @@ msgstr "KDM (مدیر نمایش کدئی)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr "MdkKDM (مدیر نمایش لینوکس ماندرایک)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -21045,7 +21045,7 @@ msgstr "واردات"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21054,7 +21054,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21597,14 +21597,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "این یک نرم‌افزار آزاد بوده و ممکن است تحت شروط GNU GPL انتشار مجدد گردد.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "طرز استفاده: \n"</div><div class='hunk'>@@ -21633,7 +21633,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "مرکز راهنمای لینوکس ماندرایک"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -25151,7 +25151,7 @@ msgstr "تغییر انجام شده است، ولی برای مؤثر واقع</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "ثبتهای ابزارهای لینوکس ماندرایک"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -25667,7 +25667,7 @@ msgstr "اتصال برقرار شد."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "اتصال شکست خورد.\n"</div><div class='ctx'> "پیکربندی خود را در مرکز کنترل ماندرایک تصدیق کنید."</div><div class='hunk'>@@ -26552,7 +26552,7 @@ msgstr "نصب شکست خورد"</div><div class='ctx'> #~ msgstr "شما هیچ قلمی را انتخاب نکرده‌اید"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='ctx'> #~ msgstr "جادوگران نرم افزار ماندرایک"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='head'>diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po<br/>index 53c328293..1d9f5df1a 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/fi.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/fi.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/fi.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/fi.po</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> # DrakX-fi - Finnish Translation</div><div class='ctx'> #</div><div class='ctx'> # Copyright (C) 2002,2003, 2004, 2005 Free Software Foundation, Inc.</div><div class='del'>-# Copyright (C) 2002 Mandrakesoft</div><div class='add'>+# Copyright (C) 2002 Mandriva</div><div class='ctx'> # Matias Griese &lt;mahagr@utu.fi&gt;, 2001.</div><div class='ctx'> # Taisto Kuikka &lt;69319@batman.jypoly.fi&gt;, 2003,2004.</div><div class='ctx'> # Esa Linna &lt;denzo@mbnet.fi&gt;, 2004.</div><div class='hunk'>@@ -70,14 +70,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB-avaimessa vaikuttaa olevan kirjoitussuoja päällä, mutta sitä ei\n"</div><div class='ctx'> "voi nyt turvallisesti irrottaa.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Käynnistä koneesi uudelleen, irrota USB-avain, poista kirjoitussuoja,\n"</div><div class='del'>-"kytke USB-avain takaisin ja käynnistä Mandrake Move uudelleen."</div><div class='add'>+"kytke USB-avain takaisin ja käynnistä Mandriva Move uudelleen."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB-avaimessasi ei ole yhtään kunnollista Windows- (FAT)\n"</div><div class='hunk'>@@ -106,14 +106,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Voit myös jatkaa ilman USB-avainta - voit silti käyttää\n"</div><div class='del'>-"Mandrake Move -järjestelmää normaalin Mandrakelinux\n"</div><div class='add'>+"Mandriva Move -järjestelmää normaalin Mandrivalinux\n"</div><div class='ctx'> "-käyttöjärjestelmän tapaan."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -121,11 +121,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Yhtäkään USB-avainta ei tunnistettu koneessasi. Mikäli\n"</div><div class='del'>-"kytket USB-avaimen nyt, Mandrake Move voi tallentaa\n"</div><div class='add'>+"kytket USB-avaimen nyt, Mandriva Move voi tallentaa\n"</div><div class='ctx'> "kotihakemistossasi olevat tiedot ja järjestelmäasetukset\n"</div><div class='ctx'> "seuraavaa käynnistystä varten joko tässä tai jossain toisessa\n"</div><div class='ctx'> "koneessa. HUOM: jos kytket avaimen nyt, odota muutamia\n"</div><div class='hunk'>@@ -133,7 +133,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Voit myös jatkaa ilman USB-avainta - voit silti käyttää\n"</div><div class='del'>-"Mandrake Move -järjestelmää normaalin Mandrakelinux\n"</div><div class='add'>+"Mandriva Move -järjestelmää normaalin Mandrivalinux\n"</div><div class='ctx'> "-käyttöjärjestelmän tapaan."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -258,7 +258,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -274,7 +274,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Tämä saattaa johtua viottuneista järjestelmän asetustiedostoista\n"</div><div class='ctx'> "USB-avaimessa, siinä tapauksessa poista ne ja käynnistä kone\n"</div><div class='del'>-"uudelleen, jolloin Mandrake Move korjaa ongelman. Tehdäksesi\n"</div><div class='add'>+"uudelleen, jolloin Mandriva Move korjaa ongelman. Tehdäksesi\n"</div><div class='ctx'> "tämän klikkaa vastaavaa nappia.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1314,11 +1314,11 @@ msgstr "Kielivalinta"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux tukee useita kieliä. Valitse kielet jotka\n"</div><div class='add'>+"Mandrivalinux tukee useita kieliä. Valitse kielet jotka\n"</div><div class='ctx'> "haluat asentaa. Ne ovat käytettävissä asennuksen jälkeen\n"</div><div class='ctx'> "kun olet käynnistänyt koneesi uudelleen."</div><div class='ctx'> </div><div class='hunk'>@@ -3741,12 +3741,12 @@ msgstr "ota radio-tuki käyttöön"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ennen jatkamista sinun pitäisi lukea huolellisesti lisenssin ehdot.\n"</div><div class='del'>-"Lisenssi kattaa koko Mandrakelinux jakelun. Jos hyväksyt kaikki\n"</div><div class='add'>+"Lisenssi kattaa koko Mandrivalinux jakelun. Jos hyväksyt kaikki\n"</div><div class='ctx'> "ehdot, valitse \"%s\" valinta. Jos et hyväksy ehtoja, painamalla \n"</div><div class='ctx'> "\"%s\" painiketta tietokoneesi käynnistyy uudestaan."</div><div class='ctx'> </div><div class='hunk'>@@ -3922,13 +3922,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinuxin asennus koostuu useasta CD-ROM-levystä. DrakX tietää,\n"</div><div class='add'>+"Mandrivalinuxin asennus koostuu useasta CD-ROM-levystä. DrakX tietää,\n"</div><div class='ctx'> "onko valittu paketti toisella CD:llä ja osaa syöttää nykyisen levyn ulos\n"</div><div class='ctx'> "ja pyytää sinua asettamaan oikean levyn tarvittaessa. Jos sinulla ei ole\n"</div><div class='ctx'> "kyseistä CD-levyä käytettävissä, klikkaa vain \"%s\", ja kyseiset paketit\n"</div><div class='hunk'>@@ -3938,11 +3938,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3994,12 +3994,12 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nyt on aika valita mitä ohjelmia haluat asentaa järjestelmääsi. Tarjolla\n"</div><div class='del'>-"on tuhansia paketteja Mandrakelinux jakelussa, ja pakettien\n"</div><div class='add'>+"on tuhansia paketteja Mandrivalinux jakelussa, ja pakettien\n"</div><div class='ctx'> "hallinnan helpottamiseksi ne on koottu samanlaisten ohjelmistojen\n"</div><div class='ctx'> "ryhmiin.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Paketit on ryhmitelty ryhmiin koneesi käyttötarkoituksen mukaisesti.\n"</div><div class='del'>-"Mandrakelinux sisältää neljä eri ennakkoon määriteltyä asennustapaa.\n"</div><div class='add'>+"Mandrivalinux sisältää neljä eri ennakkoon määriteltyä asennustapaa.\n"</div><div class='ctx'> "Voit verrata asennustapoja pakettiryhmiin. Voit tietysti asentaa paketteja\n"</div><div class='ctx'> "eri ryhmistä niin halutessasi, joten ``Työasema''-asennus voi sisältää\n"</div><div class='ctx'> "ohjelmia esimerkiksi ``Kehitysympäristö''-ryhmästä.\n"</div><div class='hunk'>@@ -4108,10 +4108,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4141,7 +4141,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Jos palvelinpaketti on valittu, joko tarkoituksella tai koska se kuului\n"</div><div class='ctx'> "johonkin valitsemaasi ryhmään, sinulta pyydetään vahvistusta,\n"</div><div class='del'>-"haluatko varmasti asentaa palvelimen. Oletuksena Mandrakelinux\n"</div><div class='add'>+"haluatko varmasti asentaa palvelimen. Oletuksena Mandrivalinux\n"</div><div class='ctx'> "käynnistää jokaisen asennetun palvelin koneen käynnistyksen\n"</div><div class='ctx'> "yhteydessä. Vaikka ne ovat turvallisia eikä niillä ole tunnettuja\n"</div><div class='ctx'> "ongelmia jakelun julkaisuajankohtana, niistä voi löytyä turvallisuus-\n"</div><div class='hunk'>@@ -4295,7 +4295,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4351,7 +4351,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (eli X Ikkunointijärjestelmä) on GNU/Linuxin graafisen käyttöliittymän\n"</div><div class='ctx'> "sydän jota kaikki graafiset ympäristöt (KDE, Gnome, AfterStep,\n"</div><div class='del'>-"WindowMaker jne.), jotka seuraavat Mandrakelinuxin mukana,\n"</div><div class='add'>+"WindowMaker jne.), jotka seuraavat Mandrivalinuxin mukana,\n"</div><div class='ctx'> "käyttävät alustanaan.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Sinulle näytetään lista eri parametreista joita voit asettaa saadaksesi\n"</div><div class='hunk'>@@ -4462,12 +4462,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4494,7 +4494,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4503,7 +4503,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4523,11 +4523,11 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Nyt sinun pitää valita miten haluat asentaa Mandrakelinux käyttö-\n"</div><div class='add'>+"Nyt sinun pitää valita miten haluat asentaa Mandrivalinux käyttö-\n"</div><div class='ctx'> "järjestelmän kiintolevyllesi. Jos kiintolevysi on tyhjä, tai nykyinen\n"</div><div class='ctx'> "käyttöjärjestelmäsi käyttää siltä kaiken vapaan tilan, sinun pitää osioida\n"</div><div class='ctx'> "se. Käytännössä osiointi tarkoittaa kiintolevyn loogista jakamista\n"</div><div class='del'>-"osiin tehdäksesi tilaa Mandrakelinux-järjestelmän asennukselle.\n"</div><div class='add'>+"osiin tehdäksesi tilaa Mandrivalinux-järjestelmän asennukselle.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Koska osiointiprosessin muutoksia ei yleensä voi peruuttaa, ja se voi\n"</div><div class='ctx'> "johtaa tietojen häviämiseen jos toinen käyttöjärjestelmä on jo asennettuna,\n"</div><div class='hunk'>@@ -4553,7 +4553,7 @@ msgstr ""</div><div class='ctx'> "koon muuttaminen voidaan tehdä ilman tietojen hävittämistä, kunhan olet\n"</div><div class='ctx'> "eheyttänyt sen ja se käyttää FAT-tiedostojärjestelmää. Tietojen varmistus\n"</div><div class='ctx'> "on kuitenkin suotavaa. Tämä vaihtoehto on suositeltu jos haluat käyttää\n"</div><div class='del'>-"Mandrakelinuxia ja Microsoft Windowsia samassa koneessa.\n"</div><div class='add'>+"Mandrivalinuxia ja Microsoft Windowsia samassa koneessa.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Ennen kuin valitset tämän vaihtoehdon, sinun pitää ymmärtää että tämän\n"</div><div class='ctx'> "toimenpiteen jälkeen Windows-osiosi on pienempi kuin tällä hetkellä.\n"</div><div class='hunk'>@@ -4561,7 +4561,7 @@ msgstr ""</div><div class='ctx'> "tallentaa tietojasi tai asentaa uusia ohjelmia.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": valitse tämä jos haluat poistaa kaikki tiedot\n"</div><div class='del'>-"ja osiot ja asentaa Mandrakelinux -järjestelmäsi niiden tilalle. Ole\n"</div><div class='add'>+"ja osiot ja asentaa Mandrivalinux -järjestelmäsi niiden tilalle. Ole\n"</div><div class='ctx'> "varovainen tämän valinnan kanssa, koska et pysty peruuttamaan\n"</div><div class='ctx'> "valintaasi kun olet hyväksynyt tämän toimenpiteen.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4723,7 +4723,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4745,7 +4745,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Valitse \"%s\" kun olet valmis alustamaan osiot.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Valitse \"%s\", jos haluat valita toisen osion Mandrakelinuxin\n"</div><div class='add'>+"Valitse \"%s\", jos haluat valita toisen osion Mandrivalinuxin\n"</div><div class='ctx'> "asentamiseen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Valitse \"%s\", jos haluat valita osiot, jotka tarkistetaan\n"</div><div class='hunk'>@@ -4763,7 +4763,7 @@ msgstr "Edellinen"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4775,7 +4775,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Tässä vaiheessa, kun asennat Mandrakelinuxia, on todennäköistä että\n"</div><div class='add'>+"Tässä vaiheessa, kun asennat Mandrivalinuxia, on todennäköistä että\n"</div><div class='ctx'> "jotkut paketit on päivitetty alkujulkaisun jälkeen. Joitakin virheitä voi "</div><div class='ctx'> "olla\n"</div><div class='ctx'> "korjattu ja turvallisuusaukkoja paikattu. Hyödyntääksesi näitä päivityksiä,\n"</div><div class='hunk'>@@ -4804,7 +4804,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4833,7 +4833,7 @@ msgstr "Tietoturvan ylläpitäjä:"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4903,7 +4903,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Tässä vaiheessa sinun pitää määrittää mitkä osiot käytetään Mandrakelinux\n"</div><div class='add'>+"Tässä vaiheessa sinun pitää määrittää mitkä osiot käytetään Mandrivalinux\n"</div><div class='ctx'> "-järjestelmäsi asennuksessa. Jos osioita on jo määritelty, joko\n"</div><div class='ctx'> "edellisestä GNU/Linux-asennuksesta tai jonkun toisen osiointityökalun\n"</div><div class='ctx'> "tekeminä, niin voit käyttää olemassa olevia osioita. Muussa tapauksissa\n"</div><div class='hunk'>@@ -4990,7 +4990,7 @@ msgstr "Vaihda vakio-/asiantuntijatilan välillä"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5020,7 +5020,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Useampi kuin yksi Microsoft-osio on löydetty kiintolevyltäsi. Ole hyvä\n"</div><div class='ctx'> "ja valitse osio jonka kokoa haluat muuttaa asentaaksesi uuden\n"</div><div class='del'>-"Mandrakelinux -käyttöjärjestelmäsi.\n"</div><div class='add'>+"Mandrivalinux -käyttöjärjestelmäsi.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Jokainen osio on lueteltu seuraavasti: \"Linux nimi\", Windows nimi\", \"Koko"</div><div class='ctx'> "\".\n"</div><div class='hunk'>@@ -5069,7 +5069,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5078,19 +5078,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tämä vaihe asennuksesta näytetään ainoastaan jos vanha GNU/Linux-\n"</div><div class='ctx'> "osio on löydetty koneestasi.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX haluaa nyt tietää, haluatko suorittaa uuden asennuksen vai vanhan\n"</div><div class='del'>-"Mandrakelinux -järjestelmän päivityksen:\n"</div><div class='add'>+"Mandrivalinux -järjestelmän päivityksen:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": oletuksena tämä tapa poistaa vanhan asennuksen. Jos haluat\n"</div><div class='ctx'> "muuttaa miten kiintolevysi on osioitu tai vaihtaa tiedostojärjestelmää, "</div><div class='hunk'>@@ -5099,11 +5099,11 @@ msgstr ""</div><div class='ctx'> "ehkä valita niin ettei kaikkia tietojasi hävitetä.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": tämä vaihtoehto sallii sinun päivittää paketteja\n"</div><div class='del'>-"nykyisessä Mandrakelinux -järjestelmässäsi. Nykyistä osiointiasi\n"</div><div class='add'>+"nykyisessä Mandrivalinux -järjestelmässäsi. Nykyistä osiointiasi\n"</div><div class='ctx'> "eikä käyttäjien tietoja muuteta. Suurin osa muista asennuksen\n"</div><div class='ctx'> "vaiheista on käytössäsi niin kuin ne ovat vakioasennuksessa.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"``Päivitä''-ominaisuuden pitäisi toimia Mandrakelinux\n"</div><div class='add'>+"``Päivitä''-ominaisuuden pitäisi toimia Mandrivalinux\n"</div><div class='ctx'> "-järjestelmän versiosta \"8.1\" eteenpäin. Vanhemman version\n"</div><div class='ctx'> "kuin \"8.1\" päivittämistä ei suositella."</div><div class='ctx'> </div><div class='hunk'>@@ -5164,7 +5164,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5206,7 +5206,7 @@ msgstr ""</div><div class='ctx'> "Tietoja UTF-8 (unicode) tuesta: Unicode on uusi kirjasinten \n"</div><div class='ctx'> "määrittelytapa joka on määrä kattaa kaikki olemassa olevat kielet.\n"</div><div class='ctx'> "Huomaa etttä täysi tuki GNU/Linuxissa on viellä työn alla. Tästä syystä\n"</div><div class='del'>-"Mandrakelinuxin UTF-8 käyttö riippuu käyttäjän valinnasta:\n"</div><div class='add'>+"Mandrivalinuxin UTF-8 käyttö riippuu käyttäjän valinnasta:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Jos valitset kielen jossa on vahva \"vanhanaikainen\" kirjasinmäärittely\n"</div><div class='ctx'> "(latin1 kielet, Venäjä, Japani, Kiina, Korea, Thai, Kreikka, Turkki, suurin "</div><div class='hunk'>@@ -5438,7 +5438,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5459,12 +5459,12 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nyt on aika valita tulostusjärjestelmä tietokoneellesi. Muut "</div><div class='ctx'> "käyttöjärjestelmät\n"</div><div class='del'>-"saattavat tarjota sinulle yhden järjestelmän, mutta Mandrakelinux tarjoaa\n"</div><div class='add'>+"saattavat tarjota sinulle yhden järjestelmän, mutta Mandrivalinux tarjoaa\n"</div><div class='ctx'> "kaksi. Kukin tulostusjärjestelmä sopii parhaiten tietyille asetuksille.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " *  \"%s\" -- joka tarkoittaa ``tulosta, älä jonota'' (print, do not "</div><div class='hunk'>@@ -5607,7 +5607,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5624,7 +5624,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5671,7 +5671,7 @@ msgstr ""</div><div class='ctx'> "Jos tämä ei sovi sinulle, paina \"%s\" muuttaaksesi asetuksia.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": jos haluat asettaa Internet- tai paikallisverkkoasetuksesi,\n"</div><div class='del'>-"voit tehdä sen nyt. Katso ohjekirjasta, tai käytä Mandrakelinux\n"</div><div class='add'>+"voit tehdä sen nyt. Katso ohjekirjasta, tai käytä Mandrivalinux\n"</div><div class='ctx'> "Ohjauskeskus asennuksen jälkeen hyödyntääksesi sisäiset ohjeet.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": sallii sinua asettamaan HTTP ja FTP välityspalvelimia jos\n"</div><div class='hunk'>@@ -5747,10 +5747,10 @@ msgstr "Palvelut"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Valitse kiintolevy, jonka haluat tyhjentää uudelle Mandrakelinux\n"</div><div class='add'>+"Valitse kiintolevy, jonka haluat tyhjentää uudelle Mandrivalinux\n"</div><div class='ctx'> "-asennusosiolle. Ole varovainen, koska kaikki asemalla oleva tieto\n"</div><div class='ctx'> "tuhoutuu eikä ole enää palautettavissa!"</div><div class='ctx'> </div><div class='hunk'>@@ -6104,11 +6104,11 @@ msgstr "Lasken Windows-osion kokoa"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Windows-osiosi on liian pirstoutunut, käynnistä koneesi uudelleen, mene "</div><div class='del'>-"Windowsiin ja aja \"Levyn eheytys\" ensin, ja aloita Mandrakelinuxin asennus "</div><div class='add'>+"Windowsiin ja aja \"Levyn eheytys\" ensin, ja aloita Mandrivalinuxin asennus "</div><div class='ctx'> "uudestaan sen jälkeen."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6228,19 +6228,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6262,7 +6262,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6270,14 +6270,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6287,7 +6287,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6307,10 +6307,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6321,11 +6321,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6341,19 +6341,19 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Johdanto\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"HUOM!! Tämä on vapaasti suomennettu teksti Mandrakelinux -jakelun\n"</div><div class='add'>+"HUOM!! Tämä on vapaasti suomennettu teksti Mandrivalinux -jakelun\n"</div><div class='ctx'> "lisenssiehdoista. Alkuperäinen teksti löytyy tämän sivun lopusta.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Käyttöjärjestelmään ja muihin Mandrakelinux jakelun eri osiin viitataan\n"</div><div class='add'>+"Käyttöjärjestelmään ja muihin Mandrivalinux jakelun eri osiin viitataan\n"</div><div class='ctx'> "tästä eteenpäin nimellä \"Ohjelmisto\". Ohjelmisto sisältää, mutta ei "</div><div class='ctx'> "rajoitu\n"</div><div class='ctx'> "ainoastaan niihin, pakettien yhdistelmät, menetelmät, säännöt ja\n"</div><div class='del'>-"dokumentaation jotka kuuluvat käyttöjärjestelmään sekä Mandrakelinux\n"</div><div class='add'>+"dokumentaation jotka kuuluvat käyttöjärjestelmään sekä Mandrivalinux\n"</div><div class='ctx'> "-jakeluun kuuluvat komponentit.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6362,7 +6362,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ole hyvä ja lue tämä dokumentti huolellisesti. Tämä dokumentti on Lisenssi-\n"</div><div class='del'>-"sopimus sinun ja Mandrakesoft S.A.:n välillä ja koskee Ohjelmistoa.\n"</div><div class='add'>+"sopimus sinun ja Mandriva S.A.:n välillä ja koskee Ohjelmistoa.\n"</div><div class='ctx'> "Asentamalla, kopioimalla tai käyttämällä Ohjelmistoa millä tavalla tahansa,\n"</div><div class='ctx'> "annat nimenomaisen hyväksynnän ja suostut noudattamaan tämän Lisenssin\n"</div><div class='ctx'> "sääntöjä ja ehtoja. Jos et suostu johonkin osaan tästä Lisenssistä,\n"</div><div class='hunk'>@@ -6382,14 +6382,14 @@ msgstr ""</div><div class='ctx'> "ilman\n"</div><div class='ctx'> "mitään takuita, voimassa olevan lain rajojen sisällä. Sikäli kuin takuuta "</div><div class='ctx'> "ei\n"</div><div class='del'>-"voimassa olevan lain mukaan voi kiistää tai rajoittaa, Mandrakesoft S.A. ei\n"</div><div class='add'>+"voimassa olevan lain mukaan voi kiistää tai rajoittaa, Mandriva S.A. ei\n"</div><div class='ctx'> "missään nimessä ole vastuussa erikoisista, odottamattomista, välittömistä "</div><div class='ctx'> "tai\n"</div><div class='ctx'> "välillisistä vahingoista (sisältäen ilman rajoituksia vahingot menetetystä\n"</div><div class='ctx'> "työstä, työn keskeytyksestä, taloudellisesta tappiosta, laillisista\n"</div><div class='ctx'> "kustannuksista ja sakoista johtuen tuomioistuimen päätöksestä, tai minkä\n"</div><div class='ctx'> "tahansa muun merkittävän tappion takia) jotka syntyvät käytöstä tai\n"</div><div class='del'>-"kyvyttömyydestä käyttää Ohjelmistoa, vaikka Mandrakesoft S.A.:lle olisi\n"</div><div class='add'>+"kyvyttömyydestä käyttää Ohjelmistoa, vaikka Mandriva S.A.:lle olisi\n"</div><div class='ctx'> " tiedotettu tällaisen vahingon mahdollisuuden tai tapahtuman "</div><div class='ctx'> "olemassaolosta.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6400,7 +6400,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Sikäli kuin takuuta ei voimassa olevan lain mukaan voi kiistää tai "</div><div class='ctx'> "rajoittaa,\n"</div><div class='del'>-"Mandrakesoft S.A. tai sen jakelijat eivät missään nimessä ole vastuussa\n"</div><div class='add'>+"Mandriva S.A. tai sen jakelijat eivät missään nimessä ole vastuussa\n"</div><div class='ctx'> "erikoisista, odottamattomista, välittömistä tai välillisistä vahingoista\n"</div><div class='ctx'> "(sisältäen ilman rajoituksia vahingot menetetystä työstä, työn "</div><div class='ctx'> "keskeytyksestä,\n"</div><div class='hunk'>@@ -6409,7 +6409,7 @@ msgstr ""</div><div class='ctx'> "takia)\n"</div><div class='ctx'> "jotka johtuvat ohjelmistokomponenttien hallussapidosta tai käytöstä tai\n"</div><div class='ctx'> "jotka johtuvat ohjelmistokomponenttien lataamisesta joltakin "</div><div class='del'>-"Mandrakelinuxin\n"</div><div class='add'>+"Mandrivalinuxin\n"</div><div class='ctx'> "sivustolta, jotka ovat kiellettyjä tai rajoitettuja joissakin maissa\n"</div><div class='ctx'> "paikallisen lain voimalla.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6431,8 +6431,8 @@ msgstr ""</div><div class='ctx'> "koskevat. Ole hyvä ja lue jokaisen komponentin lisenssin ehdot ja säännöt\n"</div><div class='ctx'> "ennen kuin käytät sitä. Jokainen kysymys koskien komponentin lisenssiä "</div><div class='ctx'> "tulisi\n"</div><div class='del'>-"ohjata komponentin tekijälle Mandrakesoftin sijasta. Mandrakesoft S.A.:n\n"</div><div class='del'>-"tekemiin ohjelmiin sovelletaan GPL-lisenssiä. Mandrakesoft S.A.:n tekemiin\n"</div><div class='add'>+"ohjata komponentin tekijälle Mandrivain sijasta. Mandrakesoft S.A.:n\n"</div><div class='add'>+"tekemiin ohjelmiin sovelletaan GPL-lisenssiä. Mandriva S.A.:n tekemiin\n"</div><div class='ctx'> "dokumentaatioihin sovelletaan erillistä lisenssiä. Lue dokumentaatiota\n"</div><div class='ctx'> "saadaksesi lisää tietoa.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6443,11 +6443,11 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Kaikki oikeudet Ohjelmiston komponentteihin kuuluvat niiden tekijöille,\n"</div><div class='ctx'> "ja ne ovat suojattuja älyllisten omaisuuksien- ja kopiointisuojalailla,\n"</div><div class='del'>-"jotka koskevat ohjelmistoja. Mandrakesoft S.A. pidättää oikeuden muokata\n"</div><div class='add'>+"jotka koskevat ohjelmistoja. Mandriva S.A. pidättää oikeuden muokata\n"</div><div class='ctx'> "tai sovittaa Ohjelmistoa, joko kokonaan tai osittain, kaikilla tavoilla\n"</div><div class='ctx'> "jokaiseen tarpeeseen.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" ja kaikki niihin liittyvät logot ovat\n"</div><div class='del'>-"Mandrakesoft S.A.:n rekisteröityjä tavaramerkkejä.\n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" ja kaikki niihin liittyvät logot ovat\n"</div><div class='add'>+"Mandriva S.A.:n rekisteröityjä tavaramerkkejä.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6466,7 +6466,7 @@ msgstr ""</div><div class='ctx'> "ratkaistavaksi Pariisissa, Ranskassa.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Jos teillä on kysymyksiä tästä sopimuksesta, olkaa hyvä ja ottakaa yhteyttä\n"</div><div class='del'>-"Mandrakesoft S.A.:iin.\n"</div><div class='add'>+"Mandriva S.A.:iin.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6483,14 +6483,14 @@ msgstr ""</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6512,7 +6512,7 @@ msgstr ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6520,14 +6520,14 @@ msgstr ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6537,7 +6537,7 @@ msgstr ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6557,10 +6557,10 @@ msgstr ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6571,11 +6571,11 @@ msgstr ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6591,7 +6591,7 @@ msgstr ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6693,7 +6693,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6701,20 +6701,20 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Onnittelut, asennus on valmis.\n"</div><div class='ctx'> "Poista käynnistyslevyke ja paina Enter käynnistääksesi koneesi uudelleen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Löydät tähän Mandrakelinuxin versioon saatavilla olevat korjaukset ja\n"</div><div class='add'>+"Löydät tähän Mandrivalinuxin versioon saatavilla olevat korjaukset ja\n"</div><div class='ctx'> "korjattujen virheiden listan osoitteesta:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Järjestelmän asettamisesta saat tietoja virallisen Mandrakelinuxin\n"</div><div class='add'>+"Järjestelmän asettamisesta saat tietoja virallisen Mandrivalinuxin\n"</div><div class='ctx'> "käyttäjäoppaan jälkiasennuskappaleesta."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6749,11 +6749,11 @@ msgstr "Siirryn vaiheeseen `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Järjestelmäsi resurssit ovat lopussa. Voit kohdata ongelmia Mandrakelinuxia\n"</div><div class='add'>+"Järjestelmäsi resurssit ovat lopussa. Voit kohdata ongelmia Mandrivalinuxia\n"</div><div class='ctx'> "asentaessasi. Jos näin tapahtuu, voit kokeilla tekstipohjaista asennusta.\n"</div><div class='ctx'> "Tehdäksesi niin paina `F1' kun käynnistät asennusohjelmaa CD-ROM:lta.\n"</div><div class='ctx'> "Tämän jälkeen kirjoita `text'."</div><div class='hunk'>@@ -7301,9 +7301,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Otetaan yhteys Mandrakelinuxin sivustolle peilipalvelinlistan saamiseksi..."</div><div class='add'>+"Otetaan yhteys Mandrivalinuxin sivustolle peilipalvelinlistan saamiseksi..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7528,8 +7528,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux asennus %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux asennus %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10116,13 +10116,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall asetustyökalu\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Tämä asettaa henkilökohtaisen palomuurin tähän Mandrakelinux koneeseen.\n"</div><div class='add'>+"Tämä asettaa henkilökohtaisen palomuurin tähän Mandrivalinux koneeseen.\n"</div><div class='ctx'> "Jos haluat vahvan omistetun palomuuriratkaisun, tutustu räätälöityyn\n"</div><div class='ctx'> "MandrakeSecurity Firewall -jakeluun."</div><div class='ctx'> </div><div class='hunk'>@@ -14174,11 +14174,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Suorita Scannerdrake (Laitteisto/Kuvanlukija Mandrakelinux "</div><div class='add'>+"Suorita Scannerdrake (Laitteisto/Kuvanlukija Mandrivalinux "</div><div class='ctx'> "ohjauskeskuksessa) jaaksesi kuvalnukijasi verkkoon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -16123,23 +16123,23 @@ msgstr "Pysäytä"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mitä Mandrakelinux on?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mitä Mandrivalinux on?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Tervetuloa &lt;b&gt;Mandrakelinux&lt;/b&gt;iin!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Tervetuloa &lt;b&gt;Mandrivalinux&lt;/b&gt;iin!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux on &lt;b&gt;Linuxjakelu&lt;/b&gt; joka yhdistää järjestelmän ydintä, niin "</div><div class='add'>+"Mandrivalinux on &lt;b&gt;Linuxjakelu&lt;/b&gt; joka yhdistää järjestelmän ydintä, niin "</div><div class='ctx'> "kutsuttu &lt;b&gt;käyttöjärjestelmä&lt;/b&gt; (perustuu Linux ytimeen), ja &lt;b&gt;suuren "</div><div class='ctx'> "sovellusmäärään&lt;/b&gt; kokonaisuuteen joka kattaa kaikki tarpeet joita tulee "</div><div class='ctx'> "mieleen."</div><div class='hunk'>@@ -16147,10 +16147,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux on &lt;b&gt;käyttäjäystävällisin&lt;/b&gt; Linux-jakelu tänään. Se on myös "</div><div class='add'>+"Mandrivalinux on &lt;b&gt;käyttäjäystävällisin&lt;/b&gt; Linux-jakelu tänään. Se on myös "</div><div class='ctx'> "&lt;b&gt;eräs käytetyimmistä&lt;/b&gt; Linux-jakeluista ympäri maailman!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16166,13 +16166,13 @@ msgstr "Tervetuloa &lt;b&gt;Avoimen Lähdekoodin maailmaan&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux on sitoutunut Open Source (vapaa lähdekoodi) -malliin. Tämä "</div><div class='del'>-"tarkoittaa että tämä uusi julkaisu on tulosta &lt;b&gt;Mandrakesoftin "</div><div class='add'>+"Mandrivalinux on sitoutunut Open Source (vapaa lähdekoodi) -malliin. Tämä "</div><div class='add'>+"tarkoittaa että tämä uusi julkaisu on tulosta &lt;b&gt;Mandrivain "</div><div class='ctx'> "kehittäjätiimin&lt;/b&gt; ja &lt;b&gt;maailmanlaajuisen vapaaehtoisten avustajien "</div><div class='ctx'> "yhteisön&lt;/b&gt; välisestä &lt;b&gt;yhteistyöstä&lt;/b&gt;."</div><div class='ctx'> </div><div class='hunk'>@@ -16194,9 +16194,9 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Suurin osa jakelussa olevista ohjelmista ja kaikki Mandrakelinux työkalut "</div><div class='add'>+"Suurin osa jakelussa olevista ohjelmista ja kaikki Mandrivalinux työkalut "</div><div class='ctx'> "ovat julkistettu &lt;b&gt;GPL&lt;/b&gt; lisenssin ehtojen mukaisesti."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16222,19 +16222,19 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:13</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "&lt;b&gt;Join the Community&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Liity Mandrakelinux yhteisöön!&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Liity Mandrivalinux yhteisöön!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinuxilla on yksi &lt;b&gt;suurimmista yhteisöstä&lt;/b&gt; käyttäjiä ja "</div><div class='add'>+"Mandrivalinuxilla on yksi &lt;b&gt;suurimmista yhteisöstä&lt;/b&gt; käyttäjiä ja "</div><div class='ctx'> "kehittäjiä. Tämän yhteisön rooli on erittäin laaja, virheiden etsijöistä "</div><div class='del'>-"uusiin ohjemien kehittäjiin. Yhteisö  on &lt;b&gt;avainasemassa&lt;/b&gt; Mandrakelinux "</div><div class='add'>+"uusiin ohjemien kehittäjiin. Yhteisö  on &lt;b&gt;avainasemassa&lt;/b&gt; Mandrivalinux "</div><div class='ctx'> "maailmassa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -16256,11 +16256,11 @@ msgstr "&lt;b&gt;Download Versio&lt;/b&gt;."</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Olet nyt asentamassa &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Tämä on ilmainen versio "</div><div class='del'>-"joka Mandrakesoft haluaa pitää &lt;b&gt;kaikkien käytettävissä&lt;/b&gt;."</div><div class='add'>+"Olet nyt asentamassa &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Tämä on ilmainen versio "</div><div class='add'>+"joka Mandriva haluaa pitää &lt;b&gt;kaikkien käytettävissä&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16290,10 +16290,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sinulla ei ole pääsyä &lt;b&gt;lisäpalveluihin&lt;/b&gt; joita ovat mukana muissa "</div><div class='del'>-"Mandrakesoft tuotteissa."</div><div class='add'>+"Mandriva tuotteissa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16302,8 +16302,8 @@ msgstr "&lt;b&gt;Discovery, Ensimmäinen Linux työpöytäsi&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Olet nyt asentamassa &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Olet nyt asentamassa &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16325,17 +16325,17 @@ msgstr "&lt;b&gt;PowerPack, Tehokäyttäjän Linux työpöytä&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Olet nyt asentamassa &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Olet nyt asentamassa &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack on Mandrakesoftin &lt;b&gt;hienoin työpöytä-Linux&lt;/b&gt;. Sen lisäksi että "</div><div class='add'>+"PowerPack on Mandrivain &lt;b&gt;hienoin työpöytä-Linux&lt;/b&gt;. Sen lisäksi että "</div><div class='ctx'> "se on helppokäyttöisin ja käyttäjäystävällisin Linux-jakelu, PowerPack "</div><div class='ctx'> "sisältää &lt;b&gt;tuhansia sovelluksia&lt;/b&gt; - kaikkea suosituimmista teknisimpiin "</div><div class='ctx'> "sovelluksiin."</div><div class='hunk'>@@ -16347,8 +16347,8 @@ msgstr "&lt;b&gt;PowerPack+, Linux Ratkaisu Työpöydälle ja Palvelimille&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Olet nyt asentamassa &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Olet nyt asentamassa &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16364,22 +16364,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft tuotteita&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva tuotteita&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; on luonut laajan valkoiman &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; on luonut laajan valkoiman &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "tuotteita."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux tuotteet ovat:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux tuotteet ovat:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16399,72 +16399,72 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, Linux Ratkaisu Työpöydälle ja Palvelimille."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux x86-64&lt;/b&gt;, Mandrakelinuxin ratkaisu 64 bittisen "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux x86-64&lt;/b&gt;, Mandrivalinuxin ratkaisu 64 bittisen "</div><div class='ctx'> "prosessorin hyödyntämiselle."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft tuotteita (Nomad tuotteita)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva tuotteita (Nomad tuotteita)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft on luonut kaksi tuotetta joka salli sinua käyttämään "</div><div class='del'>-"Mandrakelinux &lt;b&gt;missä koneessa tahansa&lt;/b&gt; ilman tarvetta asentaa sitä:"</div><div class='add'>+"Mandriva on luonut kaksi tuotetta joka salli sinua käyttämään "</div><div class='add'>+"Mandrivalinux &lt;b&gt;missä koneessa tahansa&lt;/b&gt; ilman tarvetta asentaa sitä:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, Mandrakelinux jakelu joka toimii suoraan käynnistettävästä "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, Mandrivalinux jakelu joka toimii suoraan käynnistettävästä "</div><div class='ctx'> "CD-levystä."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, Mandrakelinux jakelu joka on esiasennettu ultra-"</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, Mandrivalinux jakelu joka on esiasennettu ultra-"</div><div class='ctx'> "kompaktiin “LaCie Mobile Hard Drive” levylle."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft tuotteita (Ammattimaiset ratkaisut)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva tuotteita (Ammattimaiset ratkaisut)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Alla on Mandrakesoft tuotteita suunniteltu vastaamaan &lt;b&gt;ammattillisin "</div><div class='add'>+"Alla on Mandriva tuotteita suunniteltu vastaamaan &lt;b&gt;ammattillisin "</div><div class='ctx'> "tarpeisiin&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrakelinux työpöytä yrityksille."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrivalinux työpöytä yrityksille."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrakelinux Palvelinratkaisu."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrivalinux Palvelinratkaisu."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrakelinux turvallisuusratkaisu."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrivalinux turvallisuusratkaisu."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16507,10 +16507,10 @@ msgstr "&lt;b&gt;Valitse graafinen suosikki työpöytäympäristösi!&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Käyttämällä Powerpack, sinulla on valinnanvaraa &lt;b&gt;grafisissa "</div><div class='del'>-"käyttölittymissä&lt;/b&gt;. Mandrakesoft on valinnut &lt;/b&gt;KDE&lt;/b&gt; oletukseksi."</div><div class='add'>+"käyttölittymissä&lt;/b&gt;. Mandriva on valinnut &lt;/b&gt;KDE&lt;/b&gt; oletukseksi."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16535,10 +16535,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Käyttämällä Powerpack+, sinulla on valinnanvaraa &lt;b&gt;grafisissa "</div><div class='del'>-"käyttölittymissä&lt;/b&gt;. Mandrakesoft on valinnut &lt;/b&gt;KDE&lt;/b&gt; oletukseksi."</div><div class='add'>+"käyttölittymissä&lt;/b&gt;. Mandriva on valinnut &lt;/b&gt;KDE&lt;/b&gt; oletukseksi."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16661,10 +16661,10 @@ msgstr "&lt;b&gt;Nauti laajasta ohjelmien valikoimasta&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux valikosta löydät &lt;b&gt;helppokäyttöiset&lt;/b&gt; sovellukset "</div><div class='add'>+"Mandrivalinux valikosta löydät &lt;b&gt;helppokäyttöiset&lt;/b&gt; sovellukset "</div><div class='ctx'> "&lt;b&gt;kaikkiin tehtäviin&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16930,17 +16930,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Ohjauskeskus&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Ohjauskeskus&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakelinux Ohjauskeskus&lt;/b&gt; on oleellinen kokoelma Mandrakelinux-"</div><div class='add'>+"&lt;b&gt;Mandrivalinux Ohjauskeskus&lt;/b&gt; on oleellinen kokoelma Mandrivalinux-"</div><div class='ctx'> "sidonnaisia työkaluja helpottamaan tietokoneesi asetusten muokkaamista."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16965,16 +16965,16 @@ msgstr "&lt;b&gt;Avoin Lähdekoodi malli&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Kuten kaikki ohjelmointityöt. avoimen lädekoodin ohjelmat &lt;b&gt;vaatii aikaa ja "</div><div class='ctx'> "ihmisiä&lt;/b&gt; kehitykseen. Kunnioittaakseen avoimen lädekoodin filosofiaa, "</div><div class='del'>-"Mandrakesoft myy lisäarvotuotteita ja palveluja jotta &lt;b&gt;Mandrakelinuxin "</div><div class='add'>+"Mandriva myy lisäarvotuotteita ja palveluja jotta &lt;b&gt;Mandrivalinuxin "</div><div class='ctx'> "kehitys voi jatkua&lt;/b&gt;. Jos haluat &lt;b&gt;tukea avoimen lädekoodin filosofiaa&lt;/"</div><div class='del'>-"b&gt;, ja Mandrakelinuxin tuotteiden kehitystä, &lt;b&gt;ole hyvä&lt;/b&gt; ja mieti jos "</div><div class='add'>+"b&gt;, ja Mandrivalinuxin tuotteiden kehitystä, &lt;b&gt;ole hyvä&lt;/b&gt; ja mieti jos "</div><div class='ctx'> "haluat ostaa jonkun meidän tuotteista tai palveluista!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16985,10 +16985,10 @@ msgstr "&lt;b&gt;Online kauppa&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Tutustuaaksesi kaikkiin Mandrakesoftin tuotteisiin ja palveluihin, voit "</div><div class='add'>+"Tutustuaaksesi kaikkiin Mandrivain tuotteisiin ja palveluihin, voit "</div><div class='ctx'> "vierailla meidän &lt;b&gt;e-commerce alustassa&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -17014,23 +17014,23 @@ msgstr "Käy jo tänään osoitteessa &lt;b&gt;www.mandrakestore.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; on &lt;b&gt;täydellinen kumppani&lt;/b&gt; Mandrakelinux tuotellesi."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; on &lt;b&gt;täydellinen kumppani&lt;/b&gt; Mandrivalinux tuotellesi."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Hyödynnä &lt;b&gt;arvokkaista etuista&lt;/b&gt; liittymällä Mandrakeclubiin, kuten:"</div><div class='add'>+"Hyödynnä &lt;b&gt;arvokkaista etuista&lt;/b&gt; liittymällä Mandriva Clubiin, kuten:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17051,39 +17051,39 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Osallistu Mandrakelinux &lt;b&gt;käyttäjien keskusteluihin&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Osallistu Mandrivalinux &lt;b&gt;käyttäjien keskusteluihin&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Aikainen ja etuoikeutettu pääsy&lt;/b&gt;, ennen julkinen levitys, "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO tiedostoille&lt;/b&gt;.."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO tiedostoille&lt;/b&gt;.."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; on uusi erikoispalvelu joka Mandrakesoft ylpeänä "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; on uusi erikoispalvelu joka Mandriva ylpeänä "</div><div class='ctx'> "esittää asiakkailleen!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline tarjoaa laajan valikoiman hyödyllisiä palveluja Mandrakelinux "</div><div class='add'>+"Mandriva Online tarjoaa laajan valikoiman hyödyllisiä palveluja Mandrivalinux "</div><div class='ctx'> "järjestelmiäsi &lt;b&gt;helposti päivittämiseen&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -17108,39 +17108,39 @@ msgstr "\t* Joustavaa &lt;b&gt;ajastettu&lt;/b&gt; päivitys."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Kaikki Mandrakelinux järjestelmiäsi&lt;/b&gt; hallinta yhdellä tilillä."</div><div class='add'>+"\t* &lt;b&gt;Kaikki Mandrivalinux järjestelmiäsi&lt;/b&gt; hallinta yhdellä tilillä."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Tarvitetko &lt;b&gt;apua?&lt;/b&gt; Tapaa Mandrakesoftin tekniset asiantuntijat "</div><div class='add'>+"Tarvitetko &lt;b&gt;apua?&lt;/b&gt; Tapaa Mandrivain tekniset asiantuntijat "</div><div class='ctx'> "&lt;b&gt;meidän teknisessä tukialustassa&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kiitos &lt;b&gt;pätevistä Mandrakelinux asiantuntijoista&lt;/b&gt;, säästät paljon aikaa."</div><div class='add'>+"Kiitos &lt;b&gt;pätevistä Mandrivalinux asiantuntijoista&lt;/b&gt;, säästät paljon aikaa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mille Mandrakelinuxia koskevia kysymyksille tahansa voit ostaa aputapahtuman "</div><div class='add'>+"Mille Mandrivalinuxia koskevia kysymyksille tahansa voit ostaa aputapahtuman "</div><div class='ctx'> "osoitteessa &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17440,8 +17440,8 @@ msgstr "Valvontatyökalut, prosessihallinta, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft Velhoja"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva Velhoja"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17538,9 +17538,9 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "OPTIOT:\n"</div><div class='ctx'> "  --help            - tulosta tämä viesti.\n"</div><div class='del'>-"  --report          - ohjelman pitäisi olla yksi Mandrakelinuxin "</div><div class='add'>+"  --report          - ohjelman pitäisi olla yksi Mandrivalinuxin "</div><div class='ctx'> "työkaluista\n"</div><div class='del'>-"  --incident        - ohjelman pitäisi olla yksi Mandrakelinuxin työkaluista"</div><div class='add'>+"  --incident        - ohjelman pitäisi olla yksi Mandrivalinuxin työkaluista"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17594,7 +17594,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17608,7 +17608,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTIOT]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server asetustyökalu\n"</div><div class='add'>+"Mandrivalinux Terminal Server asetustyökalu\n"</div><div class='ctx'> "--enable      : ota MTS käyttöön.\n"</div><div class='ctx'> "--disable     : poista MTS käytöstä.\n"</div><div class='ctx'> "--start       : käynnistä MTS\n"</div><div class='hunk'>@@ -17663,14 +17663,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTIO]...\n"</div><div class='del'>-" --no-confirmation   älä pyydä varmistusta MandrakeUpdate tilassa.\n"</div><div class='add'>+" --no-confirmation   älä pyydä varmistusta Mandriva Update tilassa.\n"</div><div class='ctx'> " --no-verify-rpm     älä tarkista pakettien allekirjoitusta\n"</div><div class='ctx'> " --changelog-first   näytä muutosloki ennen tiedostolistausta "</div><div class='ctx'> "kuvausikkunassa\n"</div><div class='hunk'>@@ -20474,13 +20474,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux virheenraportointityökalu"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux virheenraportointityökalu"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Ohjauskeskus"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Ohjauskeskus"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20500,8 +20500,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20545,8 +20545,8 @@ msgstr "Asetusvelhot"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Valitse Mandrakesoft työkalu:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Valitse Mandriva työkalu:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20973,19 +20973,19 @@ msgstr "Käynnistetty koneen käynnistämisen yhteydessä"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tätä liitäntää ei ole vielä asetettu.\n"</div><div class='del'>-"Suorita Mandrakelinux Ohjauskeskuksesta \"Lisää liitäntä\"."</div><div class='add'>+"Suorita Mandrivalinux Ohjauskeskuksesta \"Lisää liitäntä\"."</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tätä liitäntää ei ole vielä asetettu.\n"</div><div class='del'>-"Suorita Mandrakelinux Ohjauskeskuksesta \"%s\"."</div><div class='add'>+"Suorita Mandrivalinux Ohjauskeskuksesta \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21035,8 +21035,8 @@ msgstr "KDM (KDE Näytönhallinta)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDDM (Mandrakelinux Näytönhallinta)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDDM (Mandrivalinux Näytönhallinta)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21338,7 +21338,7 @@ msgstr "Tuo"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21347,7 +21347,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (alkuperäinen versio)\n"</div><div class='hunk'>@@ -21897,14 +21897,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Tämä on vapaa ohjelmisto ja voit levittää sitä GNU GPL -lisenssin "</div><div class='ctx'> "mukaisesti.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21932,8 +21932,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux Apukeskus"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux Apukeskus"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25446,8 +25446,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux työkalujen lokit"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux työkalujen lokit"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25961,10 +25961,10 @@ msgstr "Yhteys valmis."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Yhteys epäonnistui.\n"</div><div class='del'>-"Tarkista asetukset Mandrakelinux Ohjauskeskuksessa."</div><div class='add'>+"Tarkista asetukset Mandrivalinux Ohjauskeskuksessa."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26870,8 +26870,8 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ msgstr "Tallenna ja Sulje"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Mandrakesoft Velhoja"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Mandriva Velhoja"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Ei selainta käytettävissä! Ole hyvä ja asenna jokin"</div><div class='hunk'>@@ -27014,13 +27014,13 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ msgstr "Virhe avattaessa %s kirjoitusta varten: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Tämä on HardDrake, Mandrakelinuxin laitteistonasetustyökalu.\n"</div><div class='add'>+#~ "Tämä on HardDrake, Mandrivalinuxin laitteistonasetustyökalu.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Versio:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Tekijä:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -27346,7 +27346,7 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ "You will now set up your Internet/network connection. If you wish to\n"</div><div class='ctx'> #~ "connect your computer to the Internet or to a local network, click \"%s"</div><div class='ctx'> #~ "\".\n"</div><div class='del'>-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"</div><div class='add'>+#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"</div><div class='ctx'> #~ "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"</div><div class='ctx'> #~ "configure the network, or to do it later, in which case clicking the \"%s"</div><div class='ctx'> #~ "\"\n"</div><div class='hunk'>@@ -27367,7 +27367,7 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ "modems\n"</div><div class='ctx'> #~ "that require additional software to work compared to Normal modems. Some "</div><div class='ctx'> #~ "of\n"</div><div class='del'>-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"</div><div class='add'>+#~ "those modems actually work under Mandrivalinux, some others do not. You\n"</div><div class='ctx'> #~ "can consult the list of supported modems at LinModems.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You can consult the ``Starter Guide'' chapter about Internet connections\n"</div><div class='hunk'>@@ -27377,7 +27377,7 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Sinulla on nyt mahdollisuus asettaa Internet-/verkkoyhteytesi. Jos\n"</div><div class='ctx'> #~ "haluat yhdistää tietokoneesi Internetiin tai lähiverkkoon, valitse\n"</div><div class='del'>-#~ "\"%s\". Mandrakelinux yrittää tunnistaa verkkolaitteet ja\n"</div><div class='add'>+#~ "\"%s\". Mandrivalinux yrittää tunnistaa verkkolaitteet ja\n"</div><div class='ctx'> #~ "modeemit automaattisesti. Jos tämä tunnistus epäonnistuu, poista\n"</div><div class='ctx'> #~ "valinta kohdasta \"%s\" seuraavalla kerralla.\n"</div><div class='ctx'> #~ "Voit myös jättää verkon asettamisen tekemättä, tai tehdä sen\n"</div><div class='hunk'>@@ -27397,7 +27397,7 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ "Winmodeemiyhteyksistä: Winmodeemit ovat erityisiä integroituja\n"</div><div class='ctx'> #~ "halpamallimodeemeja (tai softamodeemeja) jotka vaativat lisäohjelmia\n"</div><div class='ctx'> #~ "toimiakseen verrattuna tavallisiin modeemeihin. Jotkin softamodeemit\n"</div><div class='del'>-#~ "todellakin toimivat Mandrakelinuxin kanssa, toiset eivät. Voit\n"</div><div class='add'>+#~ "todellakin toimivat Mandrivalinuxin kanssa, toiset eivät. Voit\n"</div><div class='ctx'> #~ "tarkistaa tuetut modeemit LinModems-sivustolta\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Voit katsoa ``Starter Guidesta'' Internetyhteyksiä koskevia tietoja\n"</div><div class='hunk'>@@ -27438,7 +27438,7 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ "checking this box.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"</div><div class='del'>-#~ "\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"</div><div class='add'>+#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"</div><div class='ctx'> #~ "system! Be sure you know what you are doing before changing any of the\n"</div><div class='ctx'> #~ "options. !!\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -27475,7 +27475,7 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "!! Huom! Jos jätät käynnistyslataajan asentamatta (valitsemalla\n"</div><div class='ctx'> #~ "\"%s\"), sinun pitää varmistaa, että sinulla on keino käynnistää\n"</div><div class='del'>-#~ "Mandrakelinux -järjestelmäsi! Varmista myös, että tiedät mitä olet\n"</div><div class='add'>+#~ "Mandrivalinux -järjestelmäsi! Varmista myös, että tiedät mitä olet\n"</div><div class='ctx'> #~ "tekemässä ennen kuin muutat näitä asetuksia !!\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "\"%s\"-painike tässä valikossa mahdollistaa useat\n"</div><div class='hunk'>@@ -27789,16 +27789,16 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ "Tulostimen \"%s\" poistaminen Star Office/OpenOffice.org/GIMP käytöstä "</div><div class='ctx'> #~ "epäonnistui."</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Congratulations for choosing Mandrakelinux!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Onnittelut Mandrakelinuxin valinnasta!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Congratulations for choosing Mandrivalinux!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Onnittelut Mandrivalinuxin valinnasta!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux operating system and its many applications is the "</div><div class='del'>-#~ "result of collaborative efforts between Mandrakesoft developers and "</div><div class='del'>-#~ "Mandrakelinux contributors throughout the world."</div><div class='add'>+#~ "Your new Mandrivalinux operating system and its many applications is the "</div><div class='add'>+#~ "result of collaborative efforts between Mandriva developers and "</div><div class='add'>+#~ "Mandrivalinux contributors throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinux käyttöjärjestelmäsi ja sen monet sovellukset ovat tulosta "</div><div class='del'>-#~ "yhteistyöstä Mandrakesoftin kehittäjien sekä Mandrakelinuxin kehityksessä "</div><div class='add'>+#~ "Mandrivalinux käyttöjärjestelmäsi ja sen monet sovellukset ovat tulosta "</div><div class='add'>+#~ "yhteistyöstä Mandrivain kehittäjien sekä Mandrivalinuxin kehityksessä "</div><div class='ctx'> #~ "avustaneiden välillä ympäri maailman."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27882,12 +27882,12 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ msgstr "\t- Täydet oikeudet kaupallisiin sovelluksiin"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "\t- Special download mirror list exclusively for Mandrakeclub Members"</div><div class='del'>-#~ msgstr "\t- Erityinen Mandrakeclubin jäsenille tarkoitettu palvelinlista"</div><div class='add'>+#~ "\t- Special download mirror list exclusively for Mandriva Club Members"</div><div class='add'>+#~ msgstr "\t- Erityinen Mandriva Clubin jäsenille tarkoitettu palvelinlista"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t- Voting for software to put in Mandrakelinux"</div><div class='add'>+#~ msgid "\t- Voting for software to put in Mandrivalinux"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t- Äänestysmahdollisuus Mandrakelinuxin mukana toimitettavista ohjelmista"</div><div class='add'>+#~ "\t- Äänestysmahdollisuus Mandrivalinuxin mukana toimitettavista ohjelmista"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t- Plus much more"</div><div class='ctx'> #~ msgstr "\t- Ja paljon muuta"</div><div class='hunk'>@@ -27923,23 +27923,23 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ "mandrake-linux.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "</div><div class='add'>+#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "</div><div class='ctx'> #~ "the latest versions of the most popular Open Source applications."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinuxin mukana tulee kuuluisat työpöytäympäristöt KDE ja GNOME "</div><div class='add'>+#~ "Mandrivalinuxin mukana tulee kuuluisat työpöytäympäristöt KDE ja GNOME "</div><div class='ctx'> #~ "sekä uusimmat versiot suosituimmista Avoimen Lähdekoodin sovelluksista."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "</div><div class='add'>+#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "</div><div class='ctx'> #~ "to install and easy to use Linux distribution."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinux tunnetaan laajalti käyttäjäystävällisimpänä ja "</div><div class='add'>+#~ "Mandrivalinux tunnetaan laajalti käyttäjäystävällisimpänä ja "</div><div class='ctx'> #~ "helppokäyttöisimpänä Linux-jakeluna."</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t- Find out Mandrakelinux on a bootable CD with &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='add'>+#~ msgid "\t- Find out Mandrivalinux on a bootable CD with &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "\t- Tutustu &lt;b&gt;Mandrakemove&lt;/b&gt;-jakeluun, CD:ltä toimivaan "</div><div class='del'>-#~ "Mandrakelinuxiin"</div><div class='add'>+#~ "Mandrivalinuxiin"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "</div><div class='hunk'>@@ -27986,11 +27986,11 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "&lt;b&gt;MandrakeClustering&lt;/b&gt;: the power and speed of a Linux cluster "</div><div class='ctx'> #~ "combined with the stability and easy-of-use of the world-famous "</div><div class='del'>-#~ "Mandrakelinux distribution. A unique blend for incomparable HPC "</div><div class='add'>+#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "</div><div class='ctx'> #~ "performance."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "&lt;b&gt;MandrakeClustering&lt;/b&gt;: Linux-clusterin tehokkuus ja nopeus "</div><div class='del'>-#~ "yhdistettynä maailmankuuluun Mandrakelinux-jakelun vakauteen ja "</div><div class='add'>+#~ "yhdistettynä maailmankuuluun Mandrivalinux-jakelun vakauteen ja "</div><div class='ctx'> #~ "helppokäyttöisyyteen. Ainutlaatuinen yhdistelmä verratonta HPC tehoa."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -28002,8 +28002,8 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ "tavallisesta ammattilaistukeen, 1-50 tapahtumaan, valitse se joka "</div><div class='ctx'> #~ "parhaiten täyttää tarpeesi!"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Become a Mandrakeclub member!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Tule Mandrakeclubin jäseneksi!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Become a Mandriva Club member!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Tule Mandriva Clubin jäseneksi!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Do you require assistance?&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Tarvitsetko apua?&lt;/b&gt;"</div><div class='hunk'>@@ -28018,28 +28018,28 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ "näytönohjainkorttien (kuten ATI® ja NVIDIA®) kanssa."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux distribution and its many applications are the "</div><div class='del'>-#~ "result of collaborative efforts between Mandrakesoft developers and "</div><div class='del'>-#~ "Mandrakelinux contributors throughout the world."</div><div class='add'>+#~ "Your new Mandrivalinux distribution and its many applications are the "</div><div class='add'>+#~ "result of collaborative efforts between Mandriva developers and "</div><div class='add'>+#~ "Mandrivalinux contributors throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Uusi Mandrakelinux-jakelusi ja sen mukana tulevat sovellukset ovat "</div><div class='del'>-#~ "Mandrakesoftin kehittäjien ja ympäri maailman Mandrakelinuxin "</div><div class='add'>+#~ "Uusi Mandrivalinux-jakelusi ja sen mukana tulevat sovellukset ovat "</div><div class='add'>+#~ "Mandrivain kehittäjien ja ympäri maailman Mandrivalinuxin "</div><div class='ctx'> #~ "kehityksessä avustaneiden välisen yhteistyön tulosta."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;PowerPack+&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;PowerPack+&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "It is the only Mandrakelinux product that includes the groupware solution."</div><div class='add'>+#~ "It is the only Mandrivalinux product that includes the groupware solution."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Se on ainoa Mandrakelinux tuote johon sisältyy ryhmätyöohjelmistoratkaisu."</div><div class='add'>+#~ "Se on ainoa Mandrivalinux tuote johon sisältyy ryhmätyöohjelmistoratkaisu."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "When you log into your Mandrakelinux system for the first time, you can "</div><div class='add'>+#~ "When you log into your Mandrivalinux system for the first time, you can "</div><div class='ctx'> #~ "choose between several popular graphical desktops environments, "</div><div class='ctx'> #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Kun kirjaudut sisään Mandrakelinux-järjestelmääsi ensimmäistä kertaa voit "</div><div class='add'>+#~ "Kun kirjaudut sisään Mandrivalinux-järjestelmääsi ensimmäistä kertaa voit "</div><div class='ctx'> #~ "valita graafisen työpöytäympäristön jota haluat käyttää useista "</div><div class='ctx'> #~ "suosituista vaihtoehdoista: KDE, GNOME, WindowMaker, IceWM jne."</div><div class='ctx'> </div><div class='hunk'>@@ -28096,12 +28096,12 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ msgstr "\t- Ja monia muita"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux distribution is the result of collaborative "</div><div class='del'>-#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "</div><div class='add'>+#~ "Your new Mandrivalinux distribution is the result of collaborative "</div><div class='add'>+#~ "efforts between Mandriva developers and Mandrivalinux contributors "</div><div class='ctx'> #~ "throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Uusi Mandrakelinux-jakelusi on Mandrakesoftin kehittäjien ja ympäri "</div><div class='del'>-#~ "maailman Mandrakelinuxin kehityksessä avustaneiden välisen yhteistyön "</div><div class='add'>+#~ "Uusi Mandrivalinux-jakelusi on Mandrivain kehittäjien ja ympäri "</div><div class='add'>+#~ "maailman Mandrivalinuxin kehityksessä avustaneiden välisen yhteistyön "</div><div class='ctx'> #~ "tulosta."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -28153,10 +28153,10 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ "työkaluja helpottamaan tietokoneesi konfigurointia."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='add'>+#~ "Find all Mandriva products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='ctx'> #~ "our full service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Tutustu kaikkiin Mandrakesoftin tuotteisiin ja palveluihin "</div><div class='add'>+#~ "Tutustu kaikkiin Mandrivain tuotteisiin ja palveluihin "</div><div class='ctx'> #~ "&lt;b&gt;MandrakeStoressa&lt;/b&gt; -- täyden palvelun sähköisessä kaupassa."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "Become a &lt;b&gt;MandrakeClub&lt;/b&gt; member!"</div><div class='hunk'>@@ -28179,26 +28179,26 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ "\t- Erikoistarjouksia tuotteista ja palveluista jotka on tarjolla "</div><div class='ctx'> #~ "MandrakeStoressa"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t- Find out Mandrakelinux on a bootable CD with &lt;b&gt;MandrakeMove&lt;/b&gt;"</div><div class='add'>+#~ msgid "\t- Find out Mandrivalinux on a bootable CD with &lt;b&gt;Mandriva Move&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t- Tutustu &lt;b&gt;MandrakeMove&lt;/b&gt; jakeluun, CD:ltä toimivaan "</div><div class='del'>-#~ "Mandrakelinuxiin"</div><div class='add'>+#~ "\t- Tutustu &lt;b&gt;Mandriva Move&lt;/b&gt; jakeluun, CD:ltä toimivaan "</div><div class='add'>+#~ "Mandrivalinuxiin"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products at &lt;b&gt;MandrakeStore&lt;/b&gt; -- our full "</div><div class='add'>+#~ "Find all Mandriva products at &lt;b&gt;MandrakeStore&lt;/b&gt; -- our full "</div><div class='ctx'> #~ "service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Tutustu kaikkiin Mandrakesoftin tuotteisiin &lt;b&gt;MandrakeStoressa&lt;/b&gt; - "</div><div class='add'>+#~ "Tutustu kaikkiin Mandrivain tuotteisiin &lt;b&gt;MandrakeStoressa&lt;/b&gt; - "</div><div class='ctx'> #~ "täyden palvelun sähköisessä kaupassa."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Become a MandrakeClub member!&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Tule MandrakeClubin jäseneksi!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "</div><div class='add'>+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "</div><div class='ctx'> #~ "tasks:"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinux valikoista löydät helppokäyttöiset sovellukset kaikkiin "</div><div class='add'>+#~ "Mandrivalinux valikoista löydät helppokäyttöiset sovellukset kaikkiin "</div><div class='ctx'> #~ "tehtäviin:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -28239,8 +28239,8 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> #~ msgid "Mandrake Control Center"</div><div class='ctx'> #~ msgstr "Mandraken Ohjauskeskus"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "This interface has not been configured yet.\n"</div><div class='hunk'>@@ -28362,9 +28362,9 @@ msgstr "Asennus epäonnistui"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Take advantage of valuable benefits, products and services by joining "</div><div class='del'>-#~ "Mandrake Club, such as:"</div><div class='add'>+#~ "Mandriva Club, such as:"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Liittymällä Mandrake Clubiin saat käyttöösi arvokkaat edut, tuotteet ja "</div><div class='add'>+#~ "Liittymällä Mandriva Clubiin saat käyttöösi arvokkaat edut, tuotteet ja "</div><div class='ctx'> #~ "palvelut, kuten:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "TCP/IP"</div><div class='head'>diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po<br/>index b1f700c9f..0e46ae012 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/fr.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/fr.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/fr.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/fr.po</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> # translation of DrakX-fr.po to Français</div><div class='ctx'> # translation of DrakX-fr.po to french</div><div class='del'>-# Translation file of Mandrakelinux graphic install</div><div class='del'>-# Copyright (C) 1999 Mandrakesoft</div><div class='add'>+# Translation file of Mandrivalinux graphic install</div><div class='add'>+# Copyright (C) 1999 Mandriva</div><div class='ctx'> #</div><div class='ctx'> # Veuillez ne pas mettre à jour ce fichier à moins d'être</div><div class='ctx'> # certain tant de vos traductions que de votre grammaire et</div><div class='hunk'>@@ -136,7 +136,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "La clé USB semble être protégée en écriture, mais nous\n"</div><div class='ctx'> "ne pouvons pas la déconnecter de manière sûre maintenant.\n"</div><div class='hunk'>@@ -144,7 +144,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Cliquez le bouton pour redémarrer l'ordinateur,\n"</div><div class='ctx'> "déconnectez la clé, enlevez la protection en écriture,\n"</div><div class='del'>-"connectez la clé à nouveau, et relancez Mandrake Move."</div><div class='add'>+"connectez la clé à nouveau, et relancez Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -162,7 +162,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Votre clé USB n'a aucune partition Windows (FAT) valide.\n"</div><div class='hunk'>@@ -174,14 +174,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Vous pouvez aussi continuer sans clé USB - vous pourrez\n"</div><div class='del'>-"toujours utiliser Mandrake Move comme un système\n"</div><div class='del'>-"d'exploitation Mandrakelinux sur CD-ROM."</div><div class='add'>+"toujours utiliser Mandriva Move comme un système\n"</div><div class='add'>+"d'exploitation Mandrivalinux sur CD-ROM."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -189,11 +189,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Aucune clé USB n'a été détectée sur votre système. Si vous\n"</div><div class='del'>-"connectez une clé USB maintenant, Mandrake Move pourra\n"</div><div class='add'>+"connectez une clé USB maintenant, Mandriva Move pourra\n"</div><div class='ctx'> "sauvegarder automatiquement les données de votre dossier\n"</div><div class='ctx'> "personnel et les configurations système, pour le prochain\n"</div><div class='ctx'> "démarrage de votre ordinateur ou bien sur un autre\n"</div><div class='hunk'>@@ -203,8 +203,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Vous pouvez aussi continuer sans clé USB - vous pourrez\n"</div><div class='del'>-"toujours utiliser Mandrake Move comme un système\n"</div><div class='del'>-"d'exploitation Mandrakelinux sur CD-ROM."</div><div class='add'>+"toujours utiliser Mandriva Move comme un système\n"</div><div class='add'>+"d'exploitation Mandrivalinux sur CD-ROM."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -332,7 +332,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -348,7 +348,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Cela peut provenir de fichiers de configuration système corrompus\n"</div><div class='ctx'> "sur la clé USB, dans ce cas les supprimer et ensuite redémarrer\n"</div><div class='del'>-"MandrakeMove résoudrait le problème. Pour faire cela, cliquez\n"</div><div class='add'>+"Mandriva Move résoudrait le problème. Pour faire cela, cliquez\n"</div><div class='ctx'> "sur le bouton correspondant.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1400,7 +1400,7 @@ msgstr "Choix de la langue"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3857,13 +3857,13 @@ msgstr "activer le support de la radio"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Avant d'aller plus loin, il est fortement recommandé de lire attentivement\n"</div><div class='ctx'> "les termes et conditions d'utilisation de la licence. Celle-ci régit\n"</div><div class='del'>-"l'ensemble de la distribution Mandrakelinux. Si vous en acceptez tous les\n"</div><div class='add'>+"l'ensemble de la distribution Mandrivalinux. Si vous en acceptez tous les\n"</div><div class='ctx'> "termes, cochez la case « %s », sinon, cliquez sur le bouton « %s » pour\n"</div><div class='ctx'> "redémarrer votre ordinateur."</div><div class='ctx'> </div><div class='hunk'>@@ -4046,13 +4046,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Les paquetages requis à l'installation de Mandrakelinux sont distribués sur\n"</div><div class='add'>+"Les paquetages requis à l'installation de Mandrivalinux sont distribués sur\n"</div><div class='ctx'> "plusieurs CD-ROM. Si un paquetage requis se trouve sur un autre CD-ROM,\n"</div><div class='ctx'> "DrakX éjectera celui présent dans le lecteur et vous demandera d'insérer le\n"</div><div class='ctx'> "CD-ROM approprié. Si vous ne possédez pas le CD demandé, cliquez tout\n"</div><div class='hunk'>@@ -4065,11 +4065,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4121,11 +4121,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "C'est maintenant le moment de choisir les paquetages qui seront installés\n"</div><div class='del'>-"sur votre système. Sachez que Mandrakelinux contient plusieurs milliers de\n"</div><div class='add'>+"sur votre système. Sachez que Mandrivalinux contient plusieurs milliers de\n"</div><div class='ctx'> "paquetages à installer, et ces paquetages ont été rangés par groupes chacun\n"</div><div class='ctx'> "correspondant à un usage particulier de l'ordinateur.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux range ces groupes en quatre catégories. Vous pouvez mélanger\n"</div><div class='add'>+"Mandrivalinux range ces groupes en quatre catégories. Vous pouvez mélanger\n"</div><div class='ctx'> "des groupes de plusieurs catégories de sorte qu'« une station de travail »\n"</div><div class='ctx'> "peut toujours proposer des applications pour la catégorie « Serveur ».\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4232,10 +4232,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4265,7 +4265,7 @@ msgstr ""</div><div class='ctx'> "apparaît à droite.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Si un paquetage serveur a été sélectionné, vous devrez confirmer que\n"</div><div class='del'>-"vous voulez vraiment que celui-ci soit installé. Sous Mandrakelinux , par\n"</div><div class='add'>+"vous voulez vraiment que celui-ci soit installé. Sous Mandrivalinux , par\n"</div><div class='ctx'> "défaut, tous les services installés sont lancés au démarrage. Malgré tous\n"</div><div class='ctx'> "les efforts investis pour vous livrer une distribution Linux sécurisée, il\n"</div><div class='ctx'> "est possible que certaines failles de sécurité affectent les serveurs\n"</div><div class='hunk'>@@ -4426,7 +4426,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4482,7 +4482,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (pour le système X Window) est le coeur de votre interface graphique sous\n"</div><div class='ctx'> "GNU/Linux. Tous les environnements graphiques (KDE, GNOME, WindowMaker\n"</div><div class='del'>-"etc.) présents sur Mandrakelinux dépendent de X.\n"</div><div class='add'>+"etc.) présents sur Mandrivalinux dépendent de X.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Il vous sera présenté une liste de divers paramètres à changer pour obtenir\n"</div><div class='ctx'> "un affichage optimal :\n"</div><div class='hunk'>@@ -4611,12 +4611,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4643,7 +4643,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4652,7 +4652,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4673,7 +4673,7 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Cette étape vous permet de déterminer précisément l'emplacement de votre\n"</div><div class='del'>-"installation de Mandrakelinux. Si votre disque est vide ou utilisé par un\n"</div><div class='add'>+"installation de Mandrivalinux. Si votre disque est vide ou utilisé par un\n"</div><div class='ctx'> "autre système d'exploitation, vous devrez repartitionner votre disque.\n"</div><div class='ctx'> "Partitionner un disque désigne l'opération consistant à le diviser\n"</div><div class='ctx'> "précisément afin de créer un espace pour votre installation.\n"</div><div class='hunk'>@@ -4704,7 +4704,7 @@ msgstr ""</div><div class='ctx'> "Le redimensionnement peut être effectué sans pertes de données, à condition\n"</div><div class='ctx'> "que vous ayez préalablement défragmenté la partition Windows. Une\n"</div><div class='ctx'> "sauvegarde de vos données ne fera pas de mal non plus. Cette solution est\n"</div><div class='del'>-"recommandée pour faire cohabiter Mandrakelinux et Microsoft Windows sur le\n"</div><div class='add'>+"recommandée pour faire cohabiter Mandrivalinux et Microsoft Windows sur le\n"</div><div class='ctx'> "même ordinateur.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Avant de choisir cette option, il faut comprendre qu'après cette\n"</div><div class='hunk'>@@ -4714,7 +4714,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * « %s » : si vous voulez effacer toutes les données et les applications\n"</div><div class='ctx'> "installées sur votre système et les remplacer par votre nouveau système\n"</div><div class='del'>-"Mandrakelinux, choisissez cette option. Soyez prudent, car ce choix est\n"</div><div class='add'>+"Mandrivalinux, choisissez cette option. Soyez prudent, car ce choix est\n"</div><div class='ctx'> "irréversible et permanent. Il vous sera impossible de retrouver vos données\n"</div><div class='ctx'> "effacées.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4804,7 +4804,7 @@ msgid ""</div><div class='ctx'> "\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"</div><div class='ctx'> "/dev/fd0\"."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Votre installation de Mandrakelinux est maintenant terminée et votre\n"</div><div class='add'>+"Votre installation de Mandrivalinux est maintenant terminée et votre\n"</div><div class='ctx'> "système est prêt à être utilisé. Cliquez sur « %s » pour le redémarrer.\n"</div><div class='ctx'> "N'oubliez pas de retirer la source d'installation(CD-ROM ou disquette).\n"</div><div class='ctx'> "La première chose que vous verrez alors, après que l'ordinateur ait \n"</div><div class='hunk'>@@ -4878,7 +4878,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4898,7 +4898,7 @@ msgstr ""</div><div class='ctx'> "Cliquez sur « %s » lorsque vous êtes prêt à formater les partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cliquez sur « %s » pour choisir une autre partition où installer votre\n"</div><div class='del'>-"nouveau système d'exploitation Mandrakelinux.\n"</div><div class='add'>+"nouveau système d'exploitation Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cliquez sur « %s » si vous désirez sélectionner des partitions pour une\n"</div><div class='ctx'> "vérification des secteurs défectueux (« Bad Blocks »)."</div><div class='hunk'>@@ -4917,7 +4917,7 @@ msgstr "Précédent"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4929,7 +4929,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Au moment où vous installez Mandrakelinux, il est possible que certains\n"</div><div class='add'>+"Au moment où vous installez Mandrivalinux, il est possible que certains\n"</div><div class='ctx'> "paquetages aient été mis à jour depuis la sortie du produit. Des bogues ont\n"</div><div class='ctx'> "pu être corrigés, et des problèmes de sécurité résolus. Pour vous permettre\n"</div><div class='ctx'> "de bénéficier de ces mises à jour, il vous est maintenant proposé de les\n"</div><div class='hunk'>@@ -4958,7 +4958,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4973,7 +4973,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Si vous ne savez pas quel niveau choisir, gardez la sélection par défaut.\n"</div><div class='ctx'> "Vous pourrez le modifier ultérieurement avec l'outil draksec, qui se trouve\n"</div><div class='del'>-"dans le Centre de Contrôle Mandrakelinux\n"</div><div class='add'>+"dans le Centre de Contrôle Mandrivalinux\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Remplissez le champ « %s » avec l'adresse électronique de l'utilisateur qui\n"</div><div class='ctx'> "sera responsable de la sécurité. Les messages de sécurité lui seront\n"</div><div class='hunk'>@@ -4988,7 +4988,7 @@ msgstr "Administrateur sécurité"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -5059,7 +5059,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "À cette étape, vous devez sélectionner quelle partition sera utilisée pour\n"</div><div class='del'>-"votre système Mandrakelinux. Si votre disque est déjà partitionné, soit par\n"</div><div class='add'>+"votre système Mandrivalinux. Si votre disque est déjà partitionné, soit par\n"</div><div class='ctx'> "une autre installation GNU/Linux ou par un autre outil de partitionnement,\n"</div><div class='ctx'> "vous pourrez les utiliser. Sinon, les partitions devront être créées.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5151,7 +5151,7 @@ msgstr "Basculer entre les modes expert et normal"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5181,7 +5181,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Plus d'une partition Windows a été détectée sur votre disque dur. Veuillez\n"</div><div class='ctx'> "choisir celle que vous choisissez pour votre nouvelle installation de\n"</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Chaque partition est identifiée comme suit : « Nom Linux », « Nom "</div><div class='ctx'> "Windows »,\n"</div><div class='hunk'>@@ -5234,7 +5234,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5243,20 +5243,20 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Cette étape ne s'affichera que si une partition GNU/Linux a été détectée\n"</div><div class='ctx'> "sur votre disque dur.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX doit maintenant savoir si vous désirez lancer une « Installation » ou "</div><div class='ctx'> "une\n"</div><div class='del'>-"« Mise à jour » d'un système Mandrakelinux déjà installé :\n"</div><div class='add'>+"« Mise à jour » d'un système Mandrivalinux déjà installé :\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * « %s » : remplace l'ancien système. Cependant, selon votre table de\n"</div><div class='ctx'> "partition, vous pourrez éviter l'effacement de vos données existantes\n"</div><div class='hunk'>@@ -5265,13 +5265,13 @@ msgstr ""</div><div class='ctx'> "vous devriez utiliser cette option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * « %s » : cette classe d'installation vous permet de mettre à jour\n"</div><div class='del'>-"seulement les paquetages qui composent votre système Mandrakelinux. Elle\n"</div><div class='add'>+"seulement les paquetages qui composent votre système Mandrivalinux. Elle\n"</div><div class='ctx'> "conserve les partitions existantes, ainsi que la configuration des\n"</div><div class='ctx'> "utilisateurs. La plupart des autres étapes d'une installation classique\n"</div><div class='ctx'> "sont accessibles.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "La mise à jour devrait fonctionner correctement pour les systèmes\n"</div><div class='del'>-"Mandrakelinux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"</div><div class='add'>+"Mandrivalinux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"</div><div class='ctx'> "jour sur les versions antérieures à « 8.1 » n'est pas recommandé."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -5331,7 +5331,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5374,7 +5374,7 @@ msgstr ""</div><div class='ctx'> "À propos de l'encodage UTF-8 (unicode) : Unicode est un nouveau système\n"</div><div class='ctx'> "d'encodage des caractères censé couvrir tous les langues existantes.\n"</div><div class='ctx'> "Cependant son intégration dans GNU/Linux est encore imparfaite. Pour cette\n"</div><div class='del'>-"raison, Mandrakelinux l'utilisera ou non selon les critères suivants :\n"</div><div class='add'>+"raison, Mandrivalinux l'utilisera ou non selon les critères suivants :\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Si vous choisissez une langue avec un encodage ayant une longue histoire\n"</div><div class='ctx'> "(langues associées à « latin1 », Russe, Japonais, Chinois, Coréen, Thaï,\n"</div><div class='hunk'>@@ -5623,7 +5623,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5644,12 +5644,12 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Maintenant, il faut choisir un système d'impression pour votre ordinateur. "</div><div class='ctx'> "D'autres\n"</div><div class='del'>-"systèmes d'exploitation en offrent un, mais Mandrakelinux en propose deux. "</div><div class='add'>+"systèmes d'exploitation en offrent un, mais Mandrivalinux en propose deux. "</div><div class='ctx'> "Chaque système\n"</div><div class='ctx'> "d'impression convient le mieux à un type différent de configuration.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5677,7 +5677,7 @@ msgstr ""</div><div class='ctx'> "Si vous choisissez votre système d'impression maintenant et que par la suite "</div><div class='ctx'> "vous n'en êtes pas content, vous pourrez le changer\n"</div><div class='ctx'> "ultérieurement en lançant PrinterDrake depuis le Centre de contrôle\n"</div><div class='del'>-"Mandrakelinux en cliquant sur le bouton « %s »."</div><div class='add'>+"Mandrivalinux en cliquant sur le bouton « %s »."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5800,7 +5800,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5817,7 +5817,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5868,7 +5868,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * « %s » : si vous souhaitez configurer votre accès Internet ou réseau\n"</div><div class='ctx'> "local dès maintenant. Lisez la documentation fournie ou exécutez\n"</div><div class='del'>-"le Centre de Contrôle Mandrakelinux après l'installation pour avoir droit à "</div><div class='add'>+"le Centre de Contrôle Mandrivalinux après l'installation pour avoir droit à "</div><div class='ctx'> "une\n"</div><div class='ctx'> "aide complète en ligne.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5886,7 +5886,7 @@ msgstr ""</div><div class='ctx'> " * « %s » : si vous souhaitez changer la configuration par défaut de votre\n"</div><div class='ctx'> "chargeur de démarrage. À réserver aux utilisateurs expérimentés. Lisez la\n"</div><div class='ctx'> "documentation fournie ou l'aide en ligne sur la configuration de chargeur\n"</div><div class='del'>-"de démarrage présente dans le Centre de Contrôle Mandrakelinux.\n"</div><div class='add'>+"de démarrage présente dans le Centre de Contrôle Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * « %s » : vous pourrez ici contrôler finement les services disponibles\n"</div><div class='ctx'> "sur votre machine. Si vous envisagez de monter un serveur, c'est une bonne\n"</div><div class='hunk'>@@ -5949,7 +5949,7 @@ msgstr "Services"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Choisissez le disque dur à effacer pour installer votre partition\n"</div><div class='hunk'>@@ -6312,12 +6312,12 @@ msgstr "Calcul de l'espace libre sur la partition Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Votre partition FAT est trop fragmentée. Redémarrez sous Windows\n"</div><div class='ctx'> "et lancez le programme de défragmentation « defrag »,\n"</div><div class='del'>-"puis relancez l'installation de Mandrakelinux."</div><div class='add'>+"puis relancez l'installation de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6440,19 +6440,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6474,7 +6474,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6482,14 +6482,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6499,7 +6499,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6519,10 +6519,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6533,11 +6533,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6553,23 +6553,23 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Le système d'exploitation et les divers composants disponibles dans la \n"</div><div class='del'>-"distribution Mandrakelinux sont ci-après dénommés les « Logiciels ».\n"</div><div class='add'>+"distribution Mandrivalinux sont ci-après dénommés les « Logiciels ».\n"</div><div class='ctx'> "Les Logiciels comprennent notamment, mais de façon non limitative,\n"</div><div class='ctx'> "l'ensemble des programmes, procédés, règles et documentations \n"</div><div class='ctx'> "relatifs au système d'exploitation et aux divers composants de la \n"</div><div class='del'>-"distribution Mandrakelinux.\n"</div><div class='add'>+"distribution Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Licence\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Veuillez lire attentivement le présent document. Ce document constitue \n"</div><div class='ctx'> "un contrat de licence entre vous (personne physique ou personne morale) et \n"</div><div class='del'>-"Mandrakesoft S.A. portant sur les Logiciels.\n"</div><div class='add'>+"Mandriva S.A. portant sur les Logiciels.\n"</div><div class='ctx'> "Le fait d'installer, de reproduire ou d'utiliser les Logiciels de quelque \n"</div><div class='ctx'> "manière que ce soit indique que vous reconnaissez avoir préalablement eu \n"</div><div class='ctx'> "connaissance et que vous acceptez de vous conformer aux termes et "</div><div class='hunk'>@@ -6584,14 +6584,14 @@ msgstr ""</div><div class='ctx'> "et \n"</div><div class='ctx'> "toute copie de tous programmes et de toutes documentations qui constituent \n"</div><div class='ctx'> "le système d'exploitation et les divers composants disponibles dans la \n"</div><div class='del'>-"distribution Mandrakelinux.\n"</div><div class='add'>+"distribution Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "2. Garantie et limitations de garantie\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Les Logiciels et la documentation qui les accompagne sont fournis en "</div><div class='ctx'> "l'état \n"</div><div class='del'>-"et sans aucune garantie. Mandrakesoft S.A. décline toute responsabilité \n"</div><div class='add'>+"et sans aucune garantie. Mandriva S.A. décline toute responsabilité \n"</div><div class='ctx'> "découlant d'un dommage direct, spécial, indirect ou accessoire, de quelque \n"</div><div class='ctx'> "nature que ce soit, en relation avec l'utilisation des Logiciels, "</div><div class='ctx'> "notamment \n"</div><div class='hunk'>@@ -6599,13 +6599,13 @@ msgstr ""</div><div class='ctx'> "bénéfices, interruptions d'activité, pertes d'informations commerciales ou \n"</div><div class='ctx'> "autres pertes pécuniaires, ainsi que des éventuelles condamnations et \n"</div><div class='ctx'> "indemnités devant être versées par suite d'une décision de justice, et ce \n"</div><div class='del'>-"même si Mandrakesoft S.A. a été informée de la survenue ou de \n"</div><div class='add'>+"même si Mandriva S.A. a été informée de la survenue ou de \n"</div><div class='ctx'> "l'éventualité de tels dommages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "AVERTISSEMENT QUANT À LA DÉTENTION OU L'UTILISATION DE LOGICIELS \n"</div><div class='ctx'> "PROHIBÉS DANS CERTAINS PAYS \n"</div><div class='ctx'> "\n"</div><div class='del'>-"En aucun cas, ni Mandrakesoft S.A. ni ses fournisseurs ne pourront être \n"</div><div class='add'>+"En aucun cas, ni Mandriva S.A. ni ses fournisseurs ne pourront être \n"</div><div class='ctx'> "tenus responsables à raison d'un préjudice spécial, direct, indirect ou \n"</div><div class='ctx'> "accessoire, de quelque nature que ce soit (notamment et de façon non \n"</div><div class='ctx'> "limitative les pertes de bénéfices, interruptions d'activité, pertes \n"</div><div class='hunk'>@@ -6613,7 +6613,7 @@ msgstr ""</div><div class='ctx'> "des éventuelles condamnations et indemnités devant être versées par suite \n"</div><div class='ctx'> "d'une décision de justice) qui ferait suite à l'utilisation, la détention \n"</div><div class='ctx'> "ou au simple téléchargement depuis l'un des sites de téléchargement de \n"</div><div class='del'>-"Mandrakelinux de logiciels prohibés par la législation à laquelle vous \n"</div><div class='add'>+"Mandrivalinux de logiciels prohibés par la législation à laquelle vous \n"</div><div class='ctx'> "êtes soumis. Cet avertissement concerne notamment certains logiciels de \n"</div><div class='ctx'> "cryptographie fournis avec les Logiciels.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6629,9 +6629,9 @@ msgstr ""</div><div class='ctx'> "régissent. Veuillez lire et agréer les termes et conditions des licences \n"</div><div class='ctx'> "accompagnant chacun d'entre eux avant de les utiliser. Toute question \n"</div><div class='ctx'> "concernant la licence d'un Logiciel est à soumettre à l'auteur (ou à ses\n"</div><div class='del'>-"représentants) du Logiciel et non à Mandrakesoft. \n"</div><div class='del'>-"Les programmes conçus par Mandrakesoft sont régis par la licence GPL. \n"</div><div class='del'>-"La documentation rédigée par Mandrakesoft fait l'objet d'une licence \n"</div><div class='add'>+"représentants) du Logiciel et non à Mandriva. \n"</div><div class='add'>+"Les programmes conçus par Mandriva sont régis par la licence GPL. \n"</div><div class='add'>+"La documentation rédigée par Mandriva fait l'objet d'une licence \n"</div><div class='ctx'> "spécifique. Veuillez vous référez à la documentation pour obtenir plus \n"</div><div class='ctx'> "de précisions.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6642,8 +6642,8 @@ msgstr ""</div><div class='ctx'> "propriété exclusive de leurs auteurs respectifs et sont protégés au titre \n"</div><div class='ctx'> "des droits de propriété intellectuelle et de copyright applicables aux "</div><div class='ctx'> "Logiciels.\n"</div><div class='del'>-"Les marques « Mandrake » et « Mandrakelinux » ainsi que les \n"</div><div class='del'>-"logotypes associés sont déposés par Mandrakesoft S.A. \n"</div><div class='add'>+"Les marques « Mandriva » et « Mandrivalinux » ainsi que les \n"</div><div class='add'>+"logotypes associés sont déposés par Mandriva S.A. \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Dispositions diverses\n"</div><div class='hunk'>@@ -6654,9 +6654,9 @@ msgstr ""</div><div class='ctx'> "dispositions, qui recevront leurs pleins effets. Le contrat de licence \n"</div><div class='ctx'> "est soumis à la Loi française. Toute contestation relative aux présentes \n"</div><div class='ctx'> "dispositions sera réglée préalablement par voie amiable. A défaut d'accord\n"</div><div class='del'>-"avec Mandrakesoft S.A., les tribunaux compétents de Paris seront saisis du \n"</div><div class='add'>+"avec Mandriva S.A., les tribunaux compétents de Paris seront saisis du \n"</div><div class='ctx'> "litige. Pour toute question relative au présent document, veuillez \n"</div><div class='del'>-"contacter Mandrakesoft S.A.\n"</div><div class='add'>+"contacter Mandriva S.A.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6753,7 +6753,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6761,21 +6761,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Félicitations, l'installation est terminée.\n"</div><div class='ctx'> "Enlevez la disquette ou le CD-ROM d'amorçage et appuyez sur « Entrée ».\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Pour toutes informations sur les corrections disponibles pour cette version "</div><div class='del'>-"de Mandrakelinux, consultez les Errata disponibles depuis :\n"</div><div class='add'>+"de Mandrivalinux, consultez les Errata disponibles depuis :\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Des informations sur la configuration de votre système sont \n"</div><div class='del'>-"disponibles dans le Guide de l'Utilisateur de Mandrakelinux."</div><div class='add'>+"disponibles dans le Guide de l'Utilisateur de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6811,12 +6811,12 @@ msgstr "Démarrage de l'étape « %s »\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Votre ordinateur possède peu de mémoire. Vous aurez peut-être quelques\n"</div><div class='del'>-"problèmes pour installer Mandrakelinux. Si cela se produit, vous pouvez\n"</div><div class='add'>+"problèmes pour installer Mandrivalinux. Si cela se produit, vous pouvez\n"</div><div class='ctx'> "essayer de procéder à une installation en mode texte. Pour cela, appuyez\n"</div><div class='ctx'> "sur la touche « F1 » après l'amorçage sur CD-ROM puis entrez « text »."</div><div class='ctx'> </div><div class='hunk'>@@ -7368,9 +7368,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Connexion au site Web de Mandrakelinux pour obtenir la liste des serveurs "</div><div class='add'>+"Connexion au site Web de Mandrivalinux pour obtenir la liste des serveurs "</div><div class='ctx'> "miroirs disponibles..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7599,8 +7599,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Installation de Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Installation de Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10192,14 +10192,14 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Configuration de drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ceci configure un Pare-Feu (firewall) personnel pour votre machine "</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "Si vous souhaitez un Pare-Feu dédié plus puissant, tournez-vous plutôt vers\n"</div><div class='ctx'> "la distribution spécialisée « MandrakeSecurity »."</div><div class='ctx'> </div><div class='hunk'>@@ -11563,7 +11563,7 @@ msgid ""</div><div class='ctx'> "work, you might want to relaunch the configuration."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Des problèmes sont apparus pendant la configuration.\n"</div><div class='del'>-"Testez votre connexion avec le « Centre de Contrôle Mandrakelinux » (dans la "</div><div class='add'>+"Testez votre connexion avec le « Centre de Contrôle Mandrivalinux » (dans la "</div><div class='ctx'> "section « réseau ») ou la commande « net_monitor ». Si votre connexion ne "</div><div class='ctx'> "fonctionne pas, vous pouvez essayer de relancer la configuration."</div><div class='ctx'> </div><div class='hunk'>@@ -14325,12 +14325,12 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Lancez Sannerdrake (Matériel-&gt;Scanner dans le Centre de Contrôle "</div><div class='del'>-"Mandrakelinux) pour partager sur le réseau votre scanner.\n"</div><div class='add'>+"Mandrivalinux) pour partager sur le réseau votre scanner.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='ctx'> #: printer/printerdrake.pm:3933</div><div class='hunk'>@@ -14643,7 +14643,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "L'accès réseau n'a pas pu être démarré. Veuillez vérifier la configuration "</div><div class='ctx'> "de votre matériel et de votre accès réseau grâce au « Centre de Contrôle "</div><div class='del'>-"Mandrakelinux » puis essayez à nouveau de configurer l'imprimante distante."</div><div class='add'>+"Mandrivalinux » puis essayez à nouveau de configurer l'imprimante distante."</div><div class='ctx'> </div><div class='ctx'> #: printer/printerdrake.pm:4206</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15913,7 +15913,7 @@ msgstr ""</div><div class='ctx'> "Anacron exécute des tâches périodiques avec une précision exprimée en jours. "</div><div class='ctx'> "Les tâches sont exécutées automatiquement au redémarrage de la machine si "</div><div class='ctx'> "elles ont expiré leur délai. Quelques tâches de maintenances quotidienne et "</div><div class='del'>-"hebdomadaire sont préconfigurées pour le système Mandrakelinux. (Plus "</div><div class='add'>+"hebdomadaire sont préconfigurées pour le système Mandrivalinux. (Plus "</div><div class='ctx'> "d'informations dans « man anacron »)"</div><div class='ctx'> </div><div class='ctx'> #: services.pm:21</div><div class='hunk'>@@ -16102,7 +16102,7 @@ msgstr ""</div><div class='ctx'> "que vous avez choisi d'activer dès le démarrage du système. (par ex. vos "</div><div class='ctx'> "connexions pour le réseau local et l'ADSL ou le Câble). Vous pouvez accéder "</div><div class='ctx'> "séparément à vos interfaces réseau grâce au « Centre de Contrôle "</div><div class='del'>-"Mandrakelinux » dans la section « Internet et réseau »."</div><div class='add'>+"Mandrivalinux » dans la section « Internet et réseau »."</div><div class='ctx'> </div><div class='ctx'> #: services.pm:59</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16345,33 +16345,33 @@ msgstr "Arrêter"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Qu'est-ce que Mandrakelinux ?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Qu'est-ce que Mandrivalinux ?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux&lt;/b&gt; vous souhaite la bienvenue !"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux&lt;/b&gt; vous souhaite la bienvenue !"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux est une &lt;b&gt;distribution Linux&lt;/b&gt;, qui regroupe un &lt;b&gt;système "</div><div class='add'>+"Mandrivalinux est une &lt;b&gt;distribution Linux&lt;/b&gt;, qui regroupe un &lt;b&gt;système "</div><div class='ctx'> "d'exploitation&lt;/b&gt; (ie : le coeur du système, basé sur le noyau Linux) et "</div><div class='ctx'> "&lt;b&gt;un très grand nombre d'applications&lt;/b&gt; qui répondront à tous vos besoins."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux est la distribution Linux la plus &lt;b&gt;conviviale&lt;/b&gt; de toutes. "</div><div class='add'>+"Mandrivalinux est la distribution Linux la plus &lt;b&gt;conviviale&lt;/b&gt; de toutes. "</div><div class='ctx'> "C'est aussi l'une des &lt;b&gt;plus utilisées&lt;/b&gt; au monde !"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16387,15 +16387,15 @@ msgstr "Bienvenue dans le &lt;b&gt;monde du logiciel libre&lt;/b&gt; !"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux adhère au modèle du logiciel libre. Cela signifie que cette "</div><div class='add'>+"Mandrivalinux adhère au modèle du logiciel libre. Cela signifie que cette "</div><div class='ctx'> "dernière version est le résultat d'une &lt;b&gt;collaboration&lt;/b&gt; entre "</div><div class='del'>-"&lt;b&gt;l'équipe des développeurs de Mandrakesoft&lt;/b&gt; et la &lt;b&gt;communauté "</div><div class='del'>-"mondiale&lt;/b&gt; des contributeurs à Mandrakelinux."</div><div class='add'>+"&lt;b&gt;l'équipe des développeurs de Mandriva&lt;/b&gt; et la &lt;b&gt;communauté "</div><div class='add'>+"mondiale&lt;/b&gt; des contributeurs à Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16415,10 +16415,10 @@ msgstr "&lt;b&gt;La GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "La plupart des logiciels inclus dans la distribution et l'intégralité des "</div><div class='del'>-"outils Mandrakelinux respectent la &lt;b&gt;Licence Publique Générale&lt;/b&gt; (en "</div><div class='add'>+"outils Mandrivalinux respectent la &lt;b&gt;Licence Publique Générale&lt;/b&gt; (en "</div><div class='ctx'> "anglais General Public License ou GPL)."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16449,15 +16449,15 @@ msgstr "&lt;b&gt;Rejoignez la communauté&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux possède l'une des &lt;b&gt;plus importantes&lt;/b&gt; communautés "</div><div class='add'>+"Mandrivalinux possède l'une des &lt;b&gt;plus importantes&lt;/b&gt; communautés "</div><div class='ctx'> "d'utilisateurs et de développeurs. Le rôle de cette communauté est multiple, "</div><div class='ctx'> "des rapports de bugs aux développements de nouvelles applications. La "</div><div class='del'>-"communauté est une &lt;b&gt;part très importante&lt;/b&gt; du monde Mandrakelinux."</div><div class='add'>+"communauté est une &lt;b&gt;part très importante&lt;/b&gt; du monde Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16478,11 +16478,11 @@ msgstr "&lt;b&gt;Version Download&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Vous êtes en train d'installer &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. C'est la "</div><div class='del'>-"version gratuite que Mandrakesoft tient à garder &lt;b&gt;disponible pour tous&lt;/b&gt;."</div><div class='add'>+"Vous êtes en train d'installer &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. C'est la "</div><div class='add'>+"version gratuite que Mandriva tient à garder &lt;b&gt;disponible pour tous&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16514,10 +16514,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vous n'aurez pas non plus accès aux &lt;b&gt;services inclus&lt;/b&gt; dans les autres "</div><div class='del'>-"produits de Mandrakesoft."</div><div class='add'>+"produits de Mandriva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16526,8 +16526,8 @@ msgstr "&lt;b&gt;Discovery, Votre premier poste de travail sous Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Vous êtes en train d'installer &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Vous êtes en train d'installer &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16549,13 +16549,13 @@ msgstr "&lt;b&gt;PowerPack, Le poste de travail de référence sous Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Vous êtes en train d'installer &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Vous êtes en train d'installer &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16571,8 +16571,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Vous êtes en train d'installer &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Vous êtes en train d'installer &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16588,22 +16588,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Les produits Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Les produits Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; a développé une large gamme de produits "</div><div class='del'>-"&lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; a développé une large gamme de produits "</div><div class='add'>+"&lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Les produits Mandrakelinux sont :"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Les produits Mandrivalinux sont :"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16624,74 +16624,74 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux pour x86-64&lt;/b&gt;, La solution Mandrakelinux pour tirer "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux pour x86-64&lt;/b&gt;, La solution Mandrivalinux pour tirer "</div><div class='ctx'> "le meilleur parti de votre processeur 64 bits."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Les produits Mandrakesoft (produits nomades)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Les produits Mandriva (produits nomades)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft a développé deux produits qui permettent d'utiliser "</div><div class='del'>-"Mandrakelinux &lt;b&gt;sur n'importe quel ordinateur&lt;/b&gt; et sans installation :"</div><div class='add'>+"Mandriva a développé deux produits qui permettent d'utiliser "</div><div class='add'>+"Mandrivalinux &lt;b&gt;sur n'importe quel ordinateur&lt;/b&gt; et sans installation :"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, une distribution Mandrakelinux qui fonctionne entièrement "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, une distribution Mandrivalinux qui fonctionne entièrement "</div><div class='ctx'> "depuis un CD-ROM amorçable."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, une distribution Mandrakelinux préinstallée sur le "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, une distribution Mandrivalinux préinstallée sur le "</div><div class='ctx'> "disque dur ultra compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Les produits Mandrakesoft (solutions professionnelles)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Les produits Mandriva (solutions professionnelles)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Voici les produits Mandrakesoft destinés à répondre aux &lt;b&gt;besoins "</div><div class='add'>+"Voici les produits Mandriva destinés à répondre aux &lt;b&gt;besoins "</div><div class='ctx'> "professionnels&lt;/b&gt; :"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Le poste de travail Mandrakelinux à "</div><div class='add'>+"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Le poste de travail Mandrivalinux à "</div><div class='ctx'> "destination des entreprises."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, La solution serveur Mandrakelinux."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, La solution serveur Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, La solution sécurité Mandrakelinux."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, La solution sécurité Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16735,10 +16735,10 @@ msgstr "&lt;b&gt;Choisissez votre environnement de bureau favori&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Avec PowerPack, vous aurez le choix de l'&lt;b&gt;environnement graphique&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft a choisi &lt;b&gt;KDE&lt;/b&gt; comme environnement par défaut."</div><div class='add'>+"Mandriva a choisi &lt;b&gt;KDE&lt;/b&gt; comme environnement par défaut."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16762,10 +16762,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Avec PowerPack+, vous aurez le choix de l'&lt;b&gt;environnement graphique&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft a choisi &lt;b&gt;KDE&lt;/b&gt; comme environnement par défaut."</div><div class='add'>+"Mandriva a choisi &lt;b&gt;KDE&lt;/b&gt; comme environnement par défaut."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16896,10 +16896,10 @@ msgstr "&lt;b&gt;Profiter de la large gamme d'applications&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Dans le menu Mandrakelinux, vous trouverez des applications &lt;b&gt;faciles "</div><div class='add'>+"Dans le menu Mandrivalinux, vous trouverez des applications &lt;b&gt;faciles "</div><div class='ctx'> "d'utilisation&lt;/b&gt; pour &lt;b&gt;toutes vos tâches&lt;/b&gt; :"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -17170,18 +17170,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Centre de Contrôle Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Centre de Contrôle Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Le &lt;b&gt;Centre de Contrôle Mandrakelinux&lt;/b&gt; est un ensemble cohérent d'outils "</div><div class='del'>-"créés par Mandrakelinux pour simplifier la configuration de votre ordinateur."</div><div class='add'>+"Le &lt;b&gt;Centre de Contrôle Mandrivalinux&lt;/b&gt; est un ensemble cohérent d'outils "</div><div class='add'>+"créés par Mandrivalinux pour simplifier la configuration de votre ordinateur."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17205,17 +17205,17 @@ msgstr "&lt;b&gt;Le modèle du logiciel libre&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Comme toute autre activité informatique, le logiciel libre requiert du "</div><div class='ctx'> "&lt;b&gt;temps et des effectifs&lt;/b&gt; pour mener à bien les développements. Pour "</div><div class='del'>-"respecter la philosophie du logiciel libre, Mandrakesoft vend des produits "</div><div class='add'>+"respecter la philosophie du logiciel libre, Mandriva vend des produits "</div><div class='ctx'> "et des services à valeur ajoutée pour &lt;b&gt;continuer d'améliorer "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. Si vous souhaitez &lt;b&gt;soutenir la philosophie du logiciel "</div><div class='del'>-"libre&lt;/b&gt; et le développement de Mandrakelinux, &lt;b&gt;merci&lt;/b&gt; d'envisager "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. Si vous souhaitez &lt;b&gt;soutenir la philosophie du logiciel "</div><div class='add'>+"libre&lt;/b&gt; et le développement de Mandrivalinux, &lt;b&gt;merci&lt;/b&gt; d'envisager "</div><div class='ctx'> "l'achat d'un de nos produits ou services !"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -17226,10 +17226,10 @@ msgstr "&lt;b&gt;Boutique en ligne&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pour en savoir plus sur les produits et les services de Mandrakesoft, vous "</div><div class='add'>+"Pour en savoir plus sur les produits et les services de Mandriva, vous "</div><div class='ctx'> "pouvez visitez notre &lt;b&gt;plate-forme de commerce électronique&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -17254,24 +17254,24 @@ msgstr "Arrêtez-vous aujourd'hui sur &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; !"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; est le &lt;b&gt;partenaire parfait&lt;/b&gt; de votre produit "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; est le &lt;b&gt;partenaire parfait&lt;/b&gt; de votre produit "</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Profitez de &lt;b&gt;nombreux avantages&lt;/b&gt; en rejoignant Mandrakeclub, tels que :"</div><div class='add'>+"Profitez de &lt;b&gt;nombreux avantages&lt;/b&gt; en rejoignant Mandriva Club, tels que :"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17293,40 +17293,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Participation aux &lt;b&gt;forums d'utilisateurs&lt;/b&gt; Mandrakelinux."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Participation aux &lt;b&gt;forums d'utilisateurs&lt;/b&gt; Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* Accès privilégié, et avant les sorties publiques, aux images ISO de "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; est le tout nouveau service que Mandrakesoft est fier "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; est le tout nouveau service que Mandriva est fier "</div><div class='ctx'> "de présenter à ses clients !"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline fournit une large gamme de services à valeur ajoutée pour "</div><div class='del'>-"&lt;b&gt;mettre à jour facilement&lt;/b&gt; votre système Mandrakelinux :"</div><div class='add'>+"Mandriva Online fournit une large gamme de services à valeur ajoutée pour "</div><div class='add'>+"&lt;b&gt;mettre à jour facilement&lt;/b&gt; votre système Mandrivalinux :"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17352,41 +17352,41 @@ msgstr "\t* &lt;b&gt;Planification&lt;/b&gt; flexible des mises à jour."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Gestion de &lt;b&gt;tous vos systèmes Mandrakelinux&lt;/b&gt; avec un seul compte."</div><div class='add'>+"\t* Gestion de &lt;b&gt;tous vos systèmes Mandrivalinux&lt;/b&gt; avec un seul compte."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vous avez besoin d'&lt;b&gt;assistance&lt;/b&gt; ? Rencontrez les experts techniques de "</div><div class='del'>-"Mandrakesoft sur notre &lt;b&gt;plate-forme de support technique&lt;/b&gt; www."</div><div class='add'>+"Mandriva sur notre &lt;b&gt;plate-forme de support technique&lt;/b&gt; www."</div><div class='ctx'> "mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Grâce aux &lt;b&gt;experts Mandrakelinux qualifiés&lt;/b&gt;, vous gagnerez beaucoup de "</div><div class='add'>+"Grâce aux &lt;b&gt;experts Mandrivalinux qualifiés&lt;/b&gt;, vous gagnerez beaucoup de "</div><div class='ctx'> "temps."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pour toute question relative à Mandrakelinux, vous pouvez acheter du support "</div><div class='add'>+"Pour toute question relative à Mandrivalinux, vous pouvez acheter du support "</div><div class='ctx'> "d'incidents sur &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17688,8 +17688,8 @@ msgstr "Outils de surveillance, gestion de processus, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Assistants Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Assistants Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17786,8 +17786,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "OPTIONS :\n"</div><div class='ctx'> "  --help            - affiche ce message.\n"</div><div class='del'>-"  --report          - le programme doit être un outil Mandrakelinux\n"</div><div class='del'>-"  --incident        - le programme doit être un outil Mandrakelinux"</div><div class='add'>+"  --report          - le programme doit être un outil Mandrivalinux\n"</div><div class='add'>+"  --incident        - le programme doit être un outil Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17842,7 +17842,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17856,7 +17856,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Configurateur pour Mandrakelinux Terminal Server\n"</div><div class='add'>+"Configurateur pour Mandrivalinux Terminal Server\n"</div><div class='ctx'> "--enable         : active MTS\n"</div><div class='ctx'> "--disable        : désactive MTS\n"</div><div class='ctx'> "--start          : démarre MTS\n"</div><div class='hunk'>@@ -17913,7 +17913,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17921,7 +17921,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      ne demande pas la première confirmation en mode "</div><div class='del'>-"MandrakeUpdate\n"</div><div class='add'>+"Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        ne vérifie pas les signatures des paquetages\n"</div><div class='ctx'> "  --changelog-first      affiche le changelog avant la liste des fichiers "</div><div class='ctx'> "dans la fenêtre de description\n"</div><div class='hunk'>@@ -20709,13 +20709,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Outil de signalement de bogue Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Outil de signalement de bogue Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Centre de Contrôle Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Centre de Contrôle Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20735,8 +20735,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20780,8 +20780,8 @@ msgstr "Assistants de configuration"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Choisissez un outil Mandrakesoft :"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Choisissez un outil Mandriva :"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21208,20 +21208,20 @@ msgstr "Lancer au démarrage"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Cette interface n'a pas encore été configurée.\n"</div><div class='ctx'> "Lancez l'assistant « Ajouter une interface » depuis le Centre de Contrôle "</div><div class='del'>-"Mandrakelinux"</div><div class='add'>+"Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vous n'avez aucune connexion internet configurée.\n"</div><div class='del'>-"Lancez l'assistant « %s » depuis le Centre de Contrôle Mandrakelinux"</div><div class='add'>+"Lancez l'assistant « %s » depuis le Centre de Contrôle Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21271,8 +21271,8 @@ msgstr "KDM (Gestionnaire de connexion de KDE)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkDM (Gestionnaire de connexion de Mandrakelinux)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkDM (Gestionnaire de connexion de Mandrivalinux)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21576,7 +21576,7 @@ msgstr "Importer"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21585,7 +21585,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright © 2001-2002 par Mandrakesoft\n"</div><div class='add'>+"Copyright © 2001-2002 par Mandriva\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "     DUPONT Sébastien (original version)\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -22137,14 +22137,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright © 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright © 2003-2004 Mandriva.\n"</div><div class='ctx'> "Ce programme est un logiciel libre et peut être redistribué selon les\n"</div><div class='ctx'> "termes de la licence GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -22174,8 +22174,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Le centre d'aide de Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Le centre d'aide de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25757,8 +25757,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Actions des Outils Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Actions des Outils Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26278,10 +26278,10 @@ msgstr "Connexion effectuée."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "La connexion a échoué.\n"</div><div class='del'>-"Vérifiez votre configuration dans le Centre de Contrôle Mandrakelinux."</div><div class='add'>+"Vérifiez votre configuration dans le Centre de Contrôle Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/fur.po b/perl-install/share/po/fur.po<br/>index 615fdf1c8..15bfe8ab5 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/fur.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/fur.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/fur.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/fur.po</a></div><div class='hunk'>@@ -59,7 +59,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -78,7 +78,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -86,7 +86,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -94,7 +94,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -224,7 +224,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1216,7 +1216,7 @@ msgstr "Lenghis"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3468,7 +3468,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3578,7 +3578,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3589,11 +3589,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3700,10 +3700,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3812,7 +3812,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -3910,12 +3910,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -3942,7 +3942,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -3951,7 +3951,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4080,7 +4080,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4098,7 +4098,7 @@ msgstr "Precedent"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4127,7 +4127,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4143,7 +4143,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4229,7 +4229,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4274,7 +4274,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4283,13 +4283,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4330,7 +4330,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4487,7 +4487,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4508,7 +4508,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4608,7 +4608,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4625,7 +4625,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4687,7 +4687,7 @@ msgstr "Servizis"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4995,7 +4995,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5099,19 +5099,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5133,7 +5133,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5141,14 +5141,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5158,7 +5158,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5178,10 +5178,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5192,11 +5192,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5212,7 +5212,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5269,7 +5269,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5277,7 +5277,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5309,7 +5309,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -5811,7 +5811,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6016,7 +6016,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -8574,7 +8574,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12129,7 +12129,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13793,18 +13793,18 @@ msgstr "Ferme"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Benvignût in &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Benvignût in &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -13813,7 +13813,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -13830,9 +13830,9 @@ msgstr ""</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -13852,7 +13852,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -13878,10 +13878,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -13900,8 +13900,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -13928,7 +13928,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -13938,7 +13938,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -13957,13 +13957,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13975,7 +13975,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -13989,20 +13989,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Applet Atualizazions Mandrakelinux"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Applet Atualizazions Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -14022,61 +14022,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14114,7 +14114,7 @@ msgstr "&lt;b&gt;Ambients di svilup&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14135,7 +14135,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14165,7 +14165,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/15.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Kontact&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/15.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -14252,7 +14252,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14487,14 +14487,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14516,9 +14516,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14530,7 +14530,7 @@ msgstr "&lt;b&gt;Server&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14553,20 +14553,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -14585,33 +14585,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -14634,32 +14634,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14950,8 +14950,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15046,7 +15046,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15094,7 +15094,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17546,13 +17546,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Centri di Control Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Centri di Control Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17572,7 +17572,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -17617,7 +17617,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18021,14 +18021,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -18079,7 +18079,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18364,7 +18364,7 @@ msgstr ""</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -18822,7 +18822,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -18849,8 +18849,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Centri jutoris Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Centri jutoris Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21823,7 +21823,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -22327,7 +22327,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -23144,8 +23144,8 @@ msgstr "Instalazion falade"</div><div class='ctx'> #~ msgstr "Identitât ssh dizà instalade"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Insert a floppy in drive\n"</div><div class='head'>diff --git a/perl-install/share/po/ga.po b/perl-install/share/po/ga.po<br/>index 4d31fdc3a..f15975650 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/ga.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/ga.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/ga.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ga.po</a></div><div class='hunk'>@@ -57,7 +57,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -76,7 +76,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +84,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -92,7 +92,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -218,7 +218,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1207,7 +1207,7 @@ msgstr "Rogha teanga"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3462,7 +3462,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3572,7 +3572,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3583,11 +3583,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3694,10 +3694,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3806,7 +3806,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -3904,12 +3904,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -3936,7 +3936,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -3945,7 +3945,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4074,7 +4074,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4092,7 +4092,7 @@ msgstr "feist"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4121,7 +4121,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4137,7 +4137,7 @@ msgstr "Riarthóir Slándála"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4223,7 +4223,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4268,7 +4268,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4277,13 +4277,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4324,7 +4324,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4481,7 +4481,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4502,7 +4502,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4602,7 +4602,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4619,7 +4619,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4681,7 +4681,7 @@ msgstr "Seirbishí"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4995,7 +4995,7 @@ msgstr "Cruthaigh rann nua"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5099,19 +5099,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5133,7 +5133,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5141,14 +5141,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5158,7 +5158,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5178,10 +5178,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5192,11 +5192,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5212,7 +5212,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5269,7 +5269,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5277,7 +5277,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5309,7 +5309,7 @@ msgstr "Ag tosnú ar céim `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -5813,7 +5813,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6018,8 +6018,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Suiteáil Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Suiteáil Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -8614,7 +8614,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12169,7 +12169,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13833,18 +13833,18 @@ msgstr "Stad"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Fáilte go dtí &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Fáilte go dtí &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -13853,7 +13853,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -13870,9 +13870,9 @@ msgstr "Trialaigh an cumraíocht"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -13892,7 +13892,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -13918,10 +13918,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -13940,8 +13940,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -13968,7 +13968,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -13978,7 +13978,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -13997,13 +13997,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14015,7 +14015,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14029,19 +14029,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "Bainteach le hIdirlíon"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14062,61 +14062,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14154,7 +14154,7 @@ msgstr "Deasc Graphaicí Eile"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14175,7 +14175,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14292,7 +14292,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14527,14 +14527,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Ionad Rialaithe Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Ionad Rialaithe Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14556,9 +14556,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14570,7 +14570,7 @@ msgstr "Bainteach le hIdirlíon"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14593,20 +14593,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr "Bainteach le hIdirlíon"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -14625,33 +14625,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "Bainteach le hIdirlíon"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -14674,32 +14674,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr "Bainteach le hIdirlíon"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14991,7 +14991,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "Bainteach le hIdirlíon"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -15087,7 +15087,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15135,7 +15135,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17585,13 +17585,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Bainteach le hIdirlíon"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Ionad Rialaithe Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Ionad Rialaithe Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17611,8 +17611,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Ionad Rialaithe Mandrakelinux"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Ionad Rialaithe Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -17656,7 +17656,7 @@ msgstr "Draíodóir Cumraíocht Gréasánú"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18061,14 +18061,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -18119,7 +18119,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18404,7 +18404,7 @@ msgstr "Iompórtáil"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -18862,7 +18862,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -18889,7 +18889,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Bainteach le hIdirlíon"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -21864,7 +21864,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Bainteach le hIdirlíon"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -22368,7 +22368,7 @@ msgstr "Athraigh cineál ranna"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -23199,7 +23199,7 @@ msgstr "Theip ar shuiteáil"</div><div class='ctx'> #~ msgstr "Scrios ciú"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='ctx'> #~ msgstr "Bainteach le hIdirlíon"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='head'>diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po<br/>index 53189cc8b..845e977cb 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/gl.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/gl.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/gl.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/gl.po</a></div><div class='hunk'>@@ -69,7 +69,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Semella ser que a memoria USB ten activada a protección de escritura, pero\n"</div><div class='ctx'> "non se pode desenchufar de maneira segura.\n"</div><div class='hunk'>@@ -77,7 +77,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Clique no botón para reiniciar a máquina, desenchúfea, desactive a "</div><div class='ctx'> "protección\n"</div><div class='del'>-"de escritura, enchufe a memoria outra vez, e execute Mandrake Move outra vez."</div><div class='add'>+"de escritura, enchufe a memoria outra vez, e execute Mandriva Move outra vez."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A súa memoria USB non ten ningunha partición Windows (FAT)\n"</div><div class='hunk'>@@ -106,14 +106,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Tamén pode continuar sen unha memoria USB - ainda\n"</div><div class='del'>-"poderá usar Mandrake Move coma un Sistema Operativo\n"</div><div class='add'>+"poderá usar Mandriva Move coma un Sistema Operativo\n"</div><div class='ctx'> "Mandrake live normal."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -121,7 +121,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -249,7 +249,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1278,11 +1278,11 @@ msgstr "Selección da Lingua"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux pode soportar múltiples linguas. Seleccione\n"</div><div class='add'>+"Mandrivalinux pode soportar múltiples linguas. Seleccione\n"</div><div class='ctx'> "as linguas que desexa instalar. Esta linguas estarán dispoñibles\n"</div><div class='ctx'> "cando a instalación estea completa e reinicie o seu sistema."</div><div class='ctx'> </div><div class='hunk'>@@ -3649,12 +3649,12 @@ msgstr "activar o soporte de radio"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Antes de continuar, debe ler con coidado os termos da licenza. Esta\n"</div><div class='del'>-"licenza cobre toda a distribución Mandrakelinux. Se está de acordo\n"</div><div class='add'>+"licenza cobre toda a distribución Mandrivalinux. Se está de acordo\n"</div><div class='ctx'> "con tódolos termos que contén, marque o cadro \"%s\". Se non o está,\n"</div><div class='ctx'> "prema no botón \"%s\" e reiniciarase o seu ordenador."</div><div class='ctx'> </div><div class='hunk'>@@ -3832,13 +3832,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A instalación de Mandrakelinux distribúese en varios CDs. Se un\n"</div><div class='add'>+"A instalación de Mandrivalinux distribúese en varios CDs. Se un\n"</div><div class='ctx'> "paquete dos seleccionados está noutro CD, o DrakX expulsará o CD\n"</div><div class='ctx'> "actual e diralle que insira o CD requirido. Se non ten o CD requirido a "</div><div class='ctx'> "man,\n"</div><div class='hunk'>@@ -3848,11 +3848,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3959,10 +3959,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4101,7 +4101,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4220,12 +4220,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4252,7 +4252,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4261,7 +4261,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4282,11 +4282,11 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Agora ten que decidir onde quere instalar o sistema operativo\n"</div><div class='del'>-"Mandrakelinux no disco duro. Se o seu disco duro está baleiro, ou se\n"</div><div class='add'>+"Mandrivalinux no disco duro. Se o seu disco duro está baleiro, ou se\n"</div><div class='ctx'> "outro sistema operativo está usando todo o espacio dispoñible, terá que\n"</div><div class='ctx'> "particionalo. Básicamente, particionar un disco duro consiste en dividilo\n"</div><div class='ctx'> "lóxicamente para crear o espacio necesario para instalar o seu novo\n"</div><div class='del'>-"sistema Mandrakelinux.\n"</div><div class='add'>+"sistema Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Debido a que o proceso de particionamento é normalmente irreversible\n"</div><div class='ctx'> "e pode provocar perdas de datos, o particionamento pode intimidar e\n"</div><div class='hunk'>@@ -4316,7 +4316,7 @@ msgstr ""</div><div class='ctx'> "pode levarse a cabo sen a perda de ningún dato, con tal que\n"</div><div class='ctx'> "desfragmente previamente a partición Windows. É moi recomendable\n"</div><div class='ctx'> "que faga unha copia de seguridade dos seus datos. Recoméndase\n"</div><div class='del'>-"usar esta opción se desexa usar Mandrakelinux e Microsoft\n"</div><div class='add'>+"usar esta opción se desexa usar Mandrivalinux e Microsoft\n"</div><div class='ctx'> "Windows no mesmo ordenador.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Antes de escoller esta opción, debe comprender que despois deste\n"</div><div class='hunk'>@@ -4325,7 +4325,7 @@ msgstr ""</div><div class='ctx'> "para almacenar os seus datos ou para instalar novo software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". Se desexa eliminar tódolos datos e as particións presentes no\n"</div><div class='del'>-"seu disco duro e remprazalas polo seu novo sistema Mandrakelinux, elixa\n"</div><div class='add'>+"seu disco duro e remprazalas polo seu novo sistema Mandrivalinux, elixa\n"</div><div class='ctx'> "esta opción. Teña coidado, porque non poderá desfacer esta operación\n"</div><div class='ctx'> "despois de que confirme.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4453,7 +4453,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4471,7 +4471,7 @@ msgstr "Anterior"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4500,7 +4500,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4516,7 +4516,7 @@ msgstr "Administrador de Seguridade"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4602,7 +4602,7 @@ msgstr "Cambiar entre modo normal/experto"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4650,7 +4650,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4659,13 +4659,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4706,7 +4706,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4880,7 +4880,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4901,7 +4901,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5004,7 +5004,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5021,7 +5021,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5083,11 +5083,11 @@ msgstr "Servicios"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Elixa o disco duro que desexa borrar para poder crear a súa nova partición\n"</div><div class='del'>-"Mandrakelinux. Teña tino, porque se perderán tódolos datos da unidade e\n"</div><div class='add'>+"Mandrivalinux. Teña tino, porque se perderán tódolos datos da unidade e\n"</div><div class='ctx'> "non se poderán volver recuperar!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -5435,12 +5435,12 @@ msgstr "Calculando o tamaño da partición de Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A partición de Windows está demasiado fragmentada. Por favor reinicie o seu "</div><div class='ctx'> "sistema con Windows, execute a utilidade ``defrag'', e despois reinicie a "</div><div class='del'>-"instalación de Mandrakelinux."</div><div class='add'>+"instalación de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -5556,19 +5556,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5590,7 +5590,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5598,14 +5598,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5615,7 +5615,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5635,10 +5635,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5649,11 +5649,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5669,7 +5669,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5726,7 +5726,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5734,21 +5734,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Noraboa, rematou a instalación.\n"</div><div class='ctx'> "Quite o disco de arrinque da unidade e prema Intro para reiniciar.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Para información sobre parches dispoñibles para esta versión\n"</div><div class='del'>-"de Mandrakelinux, consulte as erratas dispoñibles en:\n"</div><div class='add'>+"de Mandrivalinux, consulte as erratas dispoñibles en:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Para información sobre a configuración do seu sistema, despois\n"</div><div class='del'>-"da instalación, hai un capítulo na Guía de Usuario Oficial de Mandrakelinux."</div><div class='add'>+"da instalación, hai un capítulo na Guía de Usuario Oficial de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -5783,12 +5783,12 @@ msgstr "Entrando na etapa '%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "O seu sistema ten poucos recursos. Pode que teña algún problema\n"</div><div class='del'>-"ó instala-lo Mandrakelinux. Se iso acontece, pode intenta-la instalación\n"</div><div class='add'>+"ó instala-lo Mandrivalinux. Se iso acontece, pode intenta-la instalación\n"</div><div class='ctx'> "en modo texto.  Para iso, prema 'F1' cando arrinque o CDROM, e escriba\n"</div><div class='ctx'> "'text'."</div><div class='ctx'> </div><div class='hunk'>@@ -6322,9 +6322,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Contactando co sitio web de Mandrakelinux para obte-la lista de espellos "</div><div class='add'>+"Contactando co sitio web de Mandrivalinux para obte-la lista de espellos "</div><div class='ctx'> "dispoñibles..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6545,8 +6545,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Instalación de Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Instalación de Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9126,13 +9126,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Configurador de drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Isto configura un cortalumes persoal para esta máquina Mandrakelinux.\n"</div><div class='add'>+"Isto configura un cortalumes persoal para esta máquina Mandrivalinux.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> </div><div class='hunk'>@@ -12995,12 +12995,12 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Execute Scannerdrake (Hardware/Escáner no Centro de Control de "</div><div class='del'>-"Mandrakelinux) para compartir o seu escáner na rede.\n"</div><div class='add'>+"Mandrivalinux) para compartir o seu escáner na rede.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='ctx'> #: printer/printerdrake.pm:3933</div><div class='hunk'>@@ -14823,23 +14823,23 @@ msgstr "Parar"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;¿Que é Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;¿Que é Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "¡Benvid@ a &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "¡Benvid@ a &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux é unha &lt;b&gt;distribución de Linux&lt;/b&gt; que consta do núcleo do "</div><div class='add'>+"Mandrivalinux é unha &lt;b&gt;distribución de Linux&lt;/b&gt; que consta do núcleo do "</div><div class='ctx'> "sistema, chamado &lt;b&gt;sistema operativo&lt;/b&gt; (baseado no kernel Linux) xunto "</div><div class='ctx'> "cunha &lt;b&gt;chea de aplicacións&lt;/b&gt; satisfan tódalas necesidades en que poida "</div><div class='ctx'> "pensar."</div><div class='hunk'>@@ -14847,10 +14847,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux é a distribución de Linux máis &lt;b&gt;amigable&lt;/b&gt; hoxe en día. "</div><div class='add'>+"Mandrivalinux é a distribución de Linux máis &lt;b&gt;amigable&lt;/b&gt; hoxe en día. "</div><div class='ctx'> "Tamén é unha das distribucións de Linux &lt;b&gt;máis usadas&lt;/b&gt; en todo o mundo!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -14866,15 +14866,15 @@ msgstr "¡Benvid@ ó &lt;b&gt;mundo do Código Aberto&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux comprométese co Modelo de Código Aberto. Isto significa que "</div><div class='add'>+"Mandrivalinux comprométese co Modelo de Código Aberto. Isto significa que "</div><div class='ctx'> "esta nova versión é o resultado da &lt;b&gt;colaboración&lt;/b&gt; entre o &lt;b&gt;equipo de "</div><div class='del'>-"desenvolvedores de Mandrakesoft&lt;/b&gt; e a &lt;b&gt;comunidade mundial&lt;/b&gt; de "</div><div class='del'>-"contribuíntes de Mandrakelinux."</div><div class='add'>+"desenvolvedores de Mandriva&lt;/b&gt; e a &lt;b&gt;comunidade mundial&lt;/b&gt; de "</div><div class='add'>+"contribuíntes de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -14894,10 +14894,10 @@ msgstr "&lt;b&gt;A GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A maioría do software incluido nesta distribución e tódalas ferramentas de "</div><div class='del'>-"Mandrakelinux usan a &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux usan a &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -14928,15 +14928,15 @@ msgstr "&lt;b&gt;¡Únase á comunidade!&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux ten unha das &lt;b&gt;maiores comunidades&lt;/b&gt; de usuarios e "</div><div class='add'>+"Mandrivalinux ten unha das &lt;b&gt;maiores comunidades&lt;/b&gt; de usuarios e "</div><div class='ctx'> "desenvolvedores. O rol desta comunidade é moi amplo, dende o informe de "</div><div class='ctx'> "erros ata o desenvolvemento de novas aplicacións. A comunidade xoga un "</div><div class='del'>-"&lt;b&gt;rol clave&lt;/b&gt; no mundo de Mandrakelinux."</div><div class='add'>+"&lt;b&gt;rol clave&lt;/b&gt; no mundo de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -14957,11 +14957,11 @@ msgstr "&lt;b&gt;Versión de Descarga&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Vostede está instalando &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Esta é a versión "</div><div class='del'>-"gratuita que Mandrakesoft quere ter &lt;b&gt;dispoñible para tod@s&lt;/b&gt;."</div><div class='add'>+"Vostede está instalando &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Esta é a versión "</div><div class='add'>+"gratuita que Mandriva quere ter &lt;b&gt;dispoñible para tod@s&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -14992,10 +14992,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Non terá acceso ós &lt;b&gt;servicios incluidos&lt;/b&gt; nos outros productos de "</div><div class='del'>-"Mandrakesoft."</div><div class='add'>+"Mandriva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15004,8 +15004,8 @@ msgstr "&lt;b&gt;Discovery, O Seu Primeiro Escritorio Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Está instalando &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Está instalando &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15027,18 +15027,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Está instalando &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Está instalando &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PowerPack é o &lt;b&gt;principal producto Linux para escritorio&lt;/b&gt; de "</div><div class='del'>-"Mandrakesoft. PowerPack inclúe &lt;b&gt;milleiros de aplicacións&lt;/b&gt; - dende as "</div><div class='add'>+"Mandriva. PowerPack inclúe &lt;b&gt;milleiros de aplicacións&lt;/b&gt; - dende as "</div><div class='ctx'> "máis populares ás máis avanzadas."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:13</div><div class='hunk'>@@ -15048,8 +15048,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Está instalando &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Está instalando &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15062,22 +15062,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Productos de Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Productos de Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; desenvolveu unha gran cantidade de productos "</div><div class='del'>-"&lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; desenvolveu unha gran cantidade de productos "</div><div class='add'>+"&lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Os productos Mandrakelinux son:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Os productos Mandrivalinux son:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15097,69 +15097,69 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Productos de Mandrakesoft (Productos para Nómadas)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Productos de Mandriva (Productos para Nómadas)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft desenvolveu dous productos que lle permiten usar Mandrakelinux "</div><div class='add'>+"Mandriva desenvolveu dous productos que lle permiten usar Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;en calquera ordenador&lt;/b&gt; e sen necesidade de instalalo nel:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, unha distribución de Mandrakelinux que se executa "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, unha distribución de Mandrivalinux que se executa "</div><div class='ctx'> "totalmente dende un CD-ROM arrincable."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, unha distribución de Mandrakelinux pre-instalada no "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, unha distribución de Mandrivalinux pre-instalada no "</div><div class='ctx'> "ultracompacto “LaCie Mobile Hard Drive”."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Productos de Mandrakesoft (Solucións Profesionais)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Productos de Mandriva (Solucións Profesionais)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Debaixo están os productos de Mandrakesoft deseñados para solucionar as "</div><div class='add'>+"Debaixo están os productos de Mandriva deseñados para solucionar as "</div><div class='ctx'> "&lt;b&gt;necesidades profesionais&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15199,7 +15199,7 @@ msgstr "&lt;b&gt;Escolla o seu Ambiente de Escritorio Preferido&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15224,7 +15224,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15351,10 +15351,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"No menú de Mandrakelinux atopará aplicacións &lt;b&gt;fáciles de usar&lt;/b&gt; para "</div><div class='add'>+"No menú de Mandrivalinux atopará aplicacións &lt;b&gt;fáciles de usar&lt;/b&gt; para "</div><div class='ctx'> "&lt;b&gt;tódalas tarefas&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -15611,18 +15611,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Centro de Control de Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Centro de Control de Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"O &lt;b&gt;Centro de Control de Mandrakelinux&lt;/b&gt; é unha colección esencial de "</div><div class='del'>-"utilidades específicas de Mandrakelinux para facilita-la configuración do "</div><div class='add'>+"O &lt;b&gt;Centro de Control de Mandrivalinux&lt;/b&gt; é unha colección esencial de "</div><div class='add'>+"utilidades específicas de Mandrivalinux para facilita-la configuración do "</div><div class='ctx'> "ordenador."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -15647,9 +15647,9 @@ msgstr "&lt;b&gt;O Modelo do Código Aberto&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15661,10 +15661,10 @@ msgstr "&lt;b&gt;Tenda en liña&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Para saber máis acerca dos productos e servicios de Mandrakesoft, pode "</div><div class='add'>+"Para saber máis acerca dos productos e servicios de Mandriva, pode "</div><div class='ctx'> "visitar a nosa &lt;b&gt;plataforma de comercio electrónico&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -15688,24 +15688,24 @@ msgstr "Parar hoxe en &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; é o &lt;b&gt;compañeiro perfecto&lt;/b&gt; para o seu producto "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; é o &lt;b&gt;compañeiro perfecto&lt;/b&gt; para o seu producto "</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Se se une a Mandrakeclub poderá gozar de &lt;b&gt;valiosos beneficios&lt;/b&gt;, coma:"</div><div class='add'>+"Se se une a Mandriva Club poderá gozar de &lt;b&gt;valiosos beneficios&lt;/b&gt;, coma:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15727,38 +15727,38 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Participación nos &lt;b&gt;foros de usuarios&lt;/b&gt; de Mandrakelinux."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Participación nos &lt;b&gt;foros de usuarios&lt;/b&gt; de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Acceso privilexiado e anticipado&lt;/b&gt;, antes da liberación pública, ás "</div><div class='del'>-"&lt;b&gt;imaxes ISO&lt;/b&gt; de Mandrakelinux."</div><div class='add'>+"&lt;b&gt;imaxes ISO&lt;/b&gt; de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline fornece unha gran cantidade de valiosos servicios para "</div><div class='del'>-"&lt;b&gt;actualizar fácilmente&lt;/b&gt; os seus sistemas Mandrakelinux:"</div><div class='add'>+"Mandriva Online fornece unha gran cantidade de valiosos servicios para "</div><div class='add'>+"&lt;b&gt;actualizar fácilmente&lt;/b&gt; os seus sistemas Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15782,35 +15782,35 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Administración de &lt;b&gt;tódolos seus sistemas Mandrakelinux&lt;/b&gt; cunha conta."</div><div class='add'>+"\t* Administración de &lt;b&gt;tódolos seus sistemas Mandrivalinux&lt;/b&gt; cunha conta."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Gracias á axuda dos &lt;b&gt;cualificados expertos de Mandrakelinux&lt;/b&gt;, aforrará "</div><div class='add'>+"Gracias á axuda dos &lt;b&gt;cualificados expertos de Mandrivalinux&lt;/b&gt;, aforrará "</div><div class='ctx'> "unha chea de tempo."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16112,8 +16112,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Asistentes de Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Asistentes de Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16214,7 +16214,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16262,7 +16262,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -18806,13 +18806,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Ferramenta de Informe de Erros de Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Ferramenta de Informe de Erros de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Centro de Control de Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Centro de Control de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18832,8 +18832,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18877,7 +18877,7 @@ msgstr "Asistentes de Configuración"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19304,21 +19304,21 @@ msgstr "Iniciado ó arrincar"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Esta interface ainda non foi configurada.\n"</div><div class='ctx'> "Execute o asistente \"Engadir unha interface\" dende o\n"</div><div class='del'>-"Centro de Control de Mandrakelinux"</div><div class='add'>+"Centro de Control de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Non ten configurada ningunha conexión á Internet.\n"</div><div class='ctx'> "Execute o asistente \"%s\" dende o\n"</div><div class='del'>-"Centro de Control de Mandrakelinux"</div><div class='add'>+"Centro de Control de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -19368,8 +19368,8 @@ msgstr "KDM (KDE Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19660,7 +19660,7 @@ msgstr "Importar"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19669,7 +19669,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright © 2001-2002 de Mandrakesoft \n"</div><div class='add'>+"Copyright © 2001-2002 de Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (versión orixinal)\n"</div><div class='hunk'>@@ -20167,14 +20167,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright © 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright © 2003-2004 Mandriva.\n"</div><div class='ctx'> "Isto é software libre e pode ser redistribuido baixo os termos da GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Uso: \n"</div><div class='hunk'>@@ -20199,7 +20199,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Centro de Axuda de Linux Mandrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -23346,8 +23346,8 @@ msgstr "Xa se fixo o cambio, pero para que sexa efectivo debe saír do sistema"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Ferramentas de Logs de Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Ferramentas de Logs de Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -23860,10 +23860,10 @@ msgstr "Conexión establecida."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Fallo ó conectarse.\n"</div><div class='del'>-"Verifique a configuración no Centro de Control de Mandrakelinux."</div><div class='add'>+"Verifique a configuración no Centro de Control de Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24731,5 +24731,5 @@ msgstr "Fallo ó instalar"</div><div class='ctx'> #~ msgid "http://www.mandrakelinux.com/en/101errata.php3"</div><div class='ctx'> #~ msgstr "http://www.mandrakelinux.com/en/101errata.php3"</div><div class='ctx'> </div><div class='del'>-#~ msgid "The Mandrakelinux 10.1 products are:"</div><div class='del'>-#~ msgstr "Os productos Mandrakelinux 10.1 son:"</div><div class='add'>+#~ msgid "The Mandrivalinux 10.1 products are:"</div><div class='add'>+#~ msgstr "Os productos Mandrivalinux 10.1 son:"</div><div class='head'>diff --git a/perl-install/share/po/he.po b/perl-install/share/po/he.po<br/>index 30deb7dae..d443359bf 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/he.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/he.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/he.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/he.po</a></div><div class='hunk'>@@ -75,7 +75,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -94,7 +94,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +102,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -110,7 +110,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +236,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1255,7 +1255,7 @@ msgstr "בחירת שפה"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3590,7 +3590,7 @@ msgstr "אפשר תמיכת רדיו"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3704,7 +3704,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3719,11 +3719,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3884,10 +3884,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4028,7 +4028,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4132,12 +4132,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4164,7 +4164,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4173,7 +4173,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4397,7 +4397,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4415,7 +4415,7 @@ msgstr "קודם"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4444,7 +4444,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4473,7 +4473,7 @@ msgstr "מנהל אבטחה"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4628,7 +4628,7 @@ msgstr "מעבר בין מצבי רגיל\"מומחה "</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4677,7 +4677,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4686,13 +4686,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "שלב זה מופעל רק כאשר זוהתה מחיצת גנו/לינוקס קיימת במחשבך.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4769,7 +4769,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4929,7 +4929,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4950,7 +4950,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "כעת עליך לבחור מנגנון הדפסה במערכת. מערכות הפעלה אחרות אפשרו לך\n"</div><div class='hunk'>@@ -5095,7 +5095,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5112,7 +5112,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5174,7 +5174,7 @@ msgstr "שרותים"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "עליך לבחור את הכונן הקשיח שברצונך למחוק על מנת לפנות מקום\n"</div><div class='hunk'>@@ -5527,7 +5527,7 @@ msgstr "חישוב השטח החופשי על מחיצת חלונות"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "מחיצת החלונות אינה מאוחה. עליך להפעיל מחדש את המחשב ולהיכנס לחלונות, ושם "</div><div class='hunk'>@@ -5644,19 +5644,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5678,7 +5678,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5686,14 +5686,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5703,7 +5703,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5723,10 +5723,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5737,11 +5737,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5757,7 +5757,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "מבוא\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5770,7 +5770,7 @@ msgstr ""</div><div class='ctx'> "1. הסכם רישוי\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "עליך לקרוא רשיון זה בעיון רב. מסמך זה מהווה הסכם רישוי בינך ובין חברת "</div><div class='del'>-"Mandrakesoft S.A. לגבי מוצרי התוכנה.\n"</div><div class='add'>+"Mandriva S.A. לגבי מוצרי התוכנה.\n"</div><div class='ctx'> "התקנה, שכפול או שימוש במוצרי התוכנה בכל צורה שהיא, משמעה שקיבלת והסכמת באופן "</div><div class='ctx'> "מפורש לתנאי וסייגי רישיון זה.\n"</div><div class='ctx'> "אם חלק כלשהו מרשיון זה אינו מקובל עליך, נאסר עליך להתקין, לשכפל או להשתמש "</div><div class='hunk'>@@ -5785,19 +5785,19 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "מוצרי התוכנה והתיעוד הנספח מסופקים \"כמות שהם\", בלי אחריות, עד לגבולות "</div><div class='ctx'> "המותרים על פי חוק.\n"</div><div class='del'>-"חברת Mandrakesoft S.A. לא תהיה אחראית, בשום תנאי שהוא בכפוף להוראות החוק, "</div><div class='add'>+"חברת Mandriva S.A. לא תהיה אחראית, בשום תנאי שהוא בכפוף להוראות החוק, "</div><div class='ctx'> "לכל אירוע מיוחד, נזקים ישירים\n"</div><div class='ctx'> "ועקיפים למיניהם (כולל, בין היתר הפסדים הנובעים עקב אובדן עסקים, הפרעה "</div><div class='ctx'> "להתנהלות העסק, הפסד כספי, שכר טרחת\n"</div><div class='ctx'> "עורך דין, קנסות ואגרות הנובעים מהחלטת בית משפט, או הפסד כתוצאה מכך) הנובעים "</div><div class='ctx'> "מהשימוש או מאי היכולת להשתמש\n"</div><div class='del'>-"במוצרי התוכנה, וזאת גם אם הובאה לידיעתה חברת Mandrakesoft S.A האפשרות "</div><div class='add'>+"במוצרי התוכנה, וזאת גם אם הובאה לידיעתה חברת Mandriva S.A האפשרות "</div><div class='ctx'> "לאפשרות ההתרחשות של נזקים\n"</div><div class='ctx'> "כאלו.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "הגבלת אחריות הנובעת משימוש או הפצת תוכנה אסורה במדינות מסויימות\n"</div><div class='ctx'> "\n"</div><div class='del'>-"בכפוף למגבלות החוק, חברת Mandrakesoft S.A. ומפיציה, לא יהיו אחראים בשום תנאי "</div><div class='add'>+"בכפוף למגבלות החוק, חברת Mandriva S.A. ומפיציה, לא יהיו אחראים בשום תנאי "</div><div class='ctx'> "שהוא, לכל נזק מיוחד, משני,\n"</div><div class='ctx'> "ישיר או עקיף כלשהו  (כולל, בין היתר הפסדים הנובעים עקב אובדן עסקים, הפרעה "</div><div class='ctx'> "להתנהלות העסק, הפסד כספי, שכר\n"</div><div class='hunk'>@@ -5818,9 +5818,9 @@ msgstr ""</div><div class='ctx'> "להפיץ את המרכיבים אשר הם מכסים. עליך לקרוא בעיון את התנאים והסייגים של כל "</div><div class='ctx'> "מרכיב לפני השימוש במרכיב כלשהו.\n"</div><div class='ctx'> "עליך להפנות כל שאלה בנוגע לרשיון השימוש הנוגעת לרשיון של מרכיב כלשהו למפתח "</div><div class='del'>-"התוכנה ולא ל Mandrakesoft.\n"</div><div class='del'>-"  התוכנות שפותחו ע\"י חברת Mandrakesoft S.A. כפופים לרשיון ה GPL. תיעוד "</div><div class='del'>-"שנכתב על ידי חברת Mandrakesoft\n"</div><div class='add'>+"התוכנה ולא ל Mandriva.\n"</div><div class='add'>+"  התוכנות שפותחו ע\"י חברת Mandriva S.A. כפופים לרשיון ה GPL. תיעוד "</div><div class='add'>+"שנכתב על ידי חברת Mandriva\n"</div><div class='ctx'> "כפוף לרשיון מיוחד. עליך לעיין בתיעוד למידע נוסף בנידון.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5829,12 +5829,12 @@ msgstr ""</div><div class='ctx'> "כל הזכויות למרכיבים של מוצרי התוכנה שייכים למפתחיהם בהתאמה ומוגנים על ידי "</div><div class='ctx'> "חוקי קניין רוחני וזכויות יוצרים התקפים\n"</div><div class='ctx'> "לגבי מוצרי תוכנה.\n"</div><div class='del'>-"חברת Mandrakesoft S.A. שומרת לעצמה את הזכות לשנות או להתאים את מוצרי התוכנה, "</div><div class='add'>+"חברת Mandriva S.A. שומרת לעצמה את הזכות לשנות או להתאים את מוצרי התוכנה, "</div><div class='ctx'> "כמקשה אחת או בחלקים,\n"</div><div class='ctx'> "בכל שיטה שהיא ולכל צורך שהוא.\n"</div><div class='del'>-"השמות \"Mandrake\", \"מנדרייק-לינוקס\" וסמלים מסחריים הקשורים אליהם הם שמות "</div><div class='add'>+"השמות \"Mandriva\", \"מנדרייק-לינוקס\" וסמלים מסחריים הקשורים אליהם הם שמות "</div><div class='ctx'> "שמורים של חברת\n"</div><div class='del'>-"Mandrakesoft S.A.\n"</div><div class='add'>+"Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. תקפות לחוק\n"</div><div class='hunk'>@@ -5845,7 +5845,7 @@ msgstr ""</div><div class='ctx'> "התנאים והסייגים של רישיון זה כפופים לחוקי צרפת. יש לשאוף להגיע להסכמה בכל "</div><div class='ctx'> "ויכוח לגבי תנאי רשיון זה מחוץ לכתלי\n"</div><div class='ctx'> "בית המשפט. כמוצא אחרון, הויכוח יובא בפני בית המשפט המתאים של פריז - צרפת.\n"</div><div class='del'>-"בכל שאלה הנוגעת למסמך זה, יש לפנות לחברת Mandrakesoft S.A.\n"</div><div class='add'>+"בכל שאלה הנוגעת למסמך זה, יש לפנות לחברת Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "נספח\n"</div><div class='hunk'>@@ -5854,7 +5854,7 @@ msgstr ""</div><div class='ctx'> "(מנדרייק לינוקס). התרגום מסופק על\n"</div><div class='ctx'> "מנת לאפשר לך להבין את תנאי הרישוי של הפצה זו, אולם זה אינו תרגום מחייב. "</div><div class='ctx'> "השימוש בהפצה כפוף לרשיון השימוש המקורי,\n"</div><div class='del'>-"בשפה האנגלית, המופיע בתקליטור. מתרגמי ההפצה ו/או חברת Mandrakesoft לא יהיו "</div><div class='add'>+"בשפה האנגלית, המופיע בתקליטור. מתרגמי ההפצה ו/או חברת Mandriva לא יהיו "</div><div class='ctx'> "אחראים לכל אי-הבנה ותוצאותיה\n"</div><div class='ctx'> "שעלולים לנבוע מהסתמכות על התרגום הזה, ו/או אי הבנה ותוצאותיה שעלולים לנבוע "</div><div class='ctx'> "כתוצאה מתרגום מרכיבים אחר בהפצה\n"</div><div class='hunk'>@@ -5929,7 +5929,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5937,7 +5937,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ברכותינו, ההתקנה הסתיימה.\n"</div><div class='ctx'> "עליך להוציא את תקליטור ההתקנה ולאחר מכן ללחוץ על \"הפעלה מחדש\" להמשך.\n"</div><div class='hunk'>@@ -5984,7 +5984,7 @@ msgstr "נכנס לשלב `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -6524,7 +6524,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr "מתחבר לאתר מנדרייק-לינוקס בכדי לקבל רשימה של אתרי מראה זמינים..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6741,7 +6741,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr "התקנת מנדרייק-לינוקס %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -9318,7 +9318,7 @@ msgstr "ביטורנט"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13186,7 +13186,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14945,18 +14945,18 @@ msgstr "הפסק"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr "מהי מנדרייק-לינוקס?"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "ברוך בואך אל מנדרייק-לינוקס!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14968,7 +14968,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "מנדרייק-לינוקס היא הפצת הלינוקס הידידותית ביותר כיום. מנדרייק-לינוקס היא גם "</div><div class='hunk'>@@ -14987,9 +14987,9 @@ msgstr "ברוך בואך לעולם הקוד הפתוח!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "מנדרייק-לינוקס מחוייבת למודל הקוד הפתוח. משמעות הדבר היא שגרסת הפצה חדשה זו "</div><div class='hunk'>@@ -15012,7 +15012,7 @@ msgstr "רשיון ה-GPL"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "רוב התוכנות הכלולות בהפצה וכל הכלים של מנדרייק-לינוקס כפופים לרישיון הציבורי "</div><div class='ctx'> "הכללי של גנו (GPL)."</div><div class='hunk'>@@ -15045,10 +15045,10 @@ msgstr "הצטרפות לקהילה"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "למנדרייק-לינוקס יש את אחת מקהילות המפתחים והמשתמשים הגדולות ביותר. התפקידים "</div><div class='ctx'> "של קהילה זו הם מגוונים, החל מדיווח אודות בעיות ועד פיתוח של  תוכנות חדשות. "</div><div class='hunk'>@@ -15073,8 +15073,8 @@ msgstr "גרסת ההורדה"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "הגרסה שתותקן במחשבך היא גרסת ההורדה של מנדרייק-לינוקס. זו גרסה חופשית "</div><div class='ctx'> "וחינמית שמנדרייקסופט רוצה להעניק לקהילה."</div><div class='hunk'>@@ -15107,7 +15107,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "כמו כן, גרסת ההורדה אינה מקנה לך גישה לשרותי ערך מוסף הכלולים במוצרים האחרים "</div><div class='ctx'> "של מנדרייקסופט."</div><div class='hunk'>@@ -15119,7 +15119,7 @@ msgstr "Discovery - גרסת הלינוקס השולחנית למשתמשים ח</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr "מנדרייק-לינוקס Discovery מותקנת כעת."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15141,13 +15141,13 @@ msgstr "PowerPack, שולחן העבודה האולטימטיבי למשתמשי</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr "מנדרייק-לינוקס PowerPack מותקנת כעת."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15161,7 +15161,7 @@ msgstr "PowerPack+, פתרון לינוקס לשולחנות עבודה ושרת</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr "כעת מותקנת מנדרייק-לינוקס PowerPack+"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15175,19 +15175,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "מוצרי מנדרייקסופט"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr "מנדרייקסופט פיתחה מגוון רחב של מוצרי מנדרייק-לינוקס."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr "מוצרי מנדרייק-לינוקס הם:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -15208,7 +15208,7 @@ msgstr "\t* PowerPack+, פתרון הלינוקס המתאים הן לשולחן</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* מנדרייק-לינוקס עבור x86-64&lt;/b&gt;, מערכת מנדרייק-לינוקס המיועדת לניצול "</div><div class='hunk'>@@ -15216,13 +15216,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr "מוצרי מנדרייקסופט (מסדרת Nomad)"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "מנדרייקסופט פיתחה שני מוצרים המאפשרים לך להשתמש במנדרייק-לינוקס על כל מחשב "</div><div class='hunk'>@@ -15231,14 +15231,14 @@ msgstr ""</div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr "\t* Move, הפצת מנדרייק-לינוקס שניתנת להפעלה מתקליטור ללא התקנה."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* GlobeTrotter, הפצת מנדרייק-לינוקס המגיעה מותקנת בתוך כונן קומפקטי ונייד "</div><div class='hunk'>@@ -15246,29 +15246,29 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr "מוצרי מנדרייקסופט (פתרונות מקצועיים)"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr "להלן רשימת מוצרי מנדרייק-סופט המיועדים לענות על צרכים מקצועיים:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr "\t* Corporate Desktop, הפצת מנדרייק-לינוקס השולחנית המיועדת לעסקים."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr "\t* Corporate Server, פתרון השרת מבוסס מנדרייק-לינוקס לעסקים."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr "\t* Multi-Network Firewall, פתרון אבטחה מבוסס מנדרייק-לינוקס."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15308,7 +15308,7 @@ msgstr "בחירת סביבת העבודה הגרפית שלך"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15329,7 +15329,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15450,7 +15450,7 @@ msgstr "הנאה ממגוון רחב של יישומים"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr "בתפריט של מנדרייק-לינוקס נמצאים יישומים קלים לשימוש לכל צרכיך: "</div><div class='ctx'> </div><div class='hunk'>@@ -15689,14 +15689,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "מרכז הבקרה של מנדרייק-לינוקס"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "מרכז הבקרה של מנדרייק-לינוקס כולל מגוון כלי עזר ייחודיים למנדרייק שיקלו את "</div><div class='hunk'>@@ -15723,9 +15723,9 @@ msgstr "מודל הקוד הפתוח"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15737,7 +15737,7 @@ msgstr "החנות המקוונת"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr "בחנות המקוונת שלנו ניתן למצוא מגוון מוצרים ושרותים של מנדרייקסופט."</div><div class='ctx'> </div><div class='hunk'>@@ -15760,20 +15760,20 @@ msgstr "אנו מזמינים אותך לבקר כבר היום בכתובת sto</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakeclub"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "Mandriva Club"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr "מועדון מנדרייק הוא השרות המושלם למוצר מנדרייק-לינוקס שברשותך."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "הצטרפות למועדון-מנדרייק תעניק לך גישה להטבות רבות ערך, מוצרים ושרותים, כגון:"</div><div class='ctx'> </div><div class='hunk'>@@ -15797,27 +15797,27 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr "\t* השתתפות בפורומי המשתמשים של מנדרייק-לינוקס"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* גישה ראשונית ומועדפת לתמונות תקליטור של גרסאות ציבוריות של מנדרייק-"</div><div class='ctx'> "לינוקס, לפני הציבור הרחב."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "מנדרייק-אונליין"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "מנדרייק-אונליין הוא שרות ערך מוסף חדש שמנדרייקסופט גאה להציע ללקוחותיה!"</div><div class='hunk'>@@ -15825,8 +15825,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "מנדרייק-אונליין מספק מגוון רחב של שרותים רבי ערך לעדכון קל של מערכות מנדרייק-"</div><div class='ctx'> "לינוקס שברשותך:"</div><div class='hunk'>@@ -15853,18 +15853,18 @@ msgstr "\t* עדכונים גמישים במועדים מתוכננים מראש</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr "\t* ניהול כל מערכות מנדרייק-לינוקס שברשותך בעזרת חשבון אחד."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakeexpert"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "Mandriva Expert"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "האם דרושה לך עזרה? המומחים המקצועניים של מנדרייקסופט מחכים לך במערכת התמיכה "</div><div class='hunk'>@@ -15873,14 +15873,14 @@ msgstr ""</div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr "הודות לעזרה של מומחי מנדרייק-לינוקס מוסמכים, ייחסך לך זמן רב."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "אם יש לך שאלות הנוגעות למנדרייק-לינוקס, יש באפשרותך לרכוש יחידות תמיכה בחנות "</div><div class='hunk'>@@ -16178,7 +16178,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "אשפי מנדרייקסופט"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -16316,7 +16316,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16330,7 +16330,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : MTS אפשור\n"</div><div class='ctx'> "--disable        : MTS ביטול\n"</div><div class='ctx'> "--start          : MTS התחלת\n"</div><div class='hunk'>@@ -16384,7 +16384,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -18945,12 +18945,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "כלי דיווח התקלות של מנדרייק-לינוקס"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "מרכז הבקרה של מנדרייק-לינוקס"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -18971,7 +18971,7 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr "חנות מנדרייק"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -19016,7 +19016,7 @@ msgstr "אשפי ההגדרות"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr "עליך לבחור את תוכנת מנדרייקסופט בה חלה תקלה: "</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19439,7 +19439,7 @@ msgstr "מופעל באתחול"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "הממשק לא הוגדר עדיין.\n"</div><div class='ctx'> "עליך להפעיל את האשף \"הוספת ממשק\" ממרכז הבקרה של מנדרייק-לינוקס"</div><div class='hunk'>@@ -19448,7 +19448,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "החיבור לאינטרנט לא הוגדר עדיין.\n"</div><div class='ctx'> "עליך להפעיל את האשף \"%s\" ממרכז הבקרה של מנדרייק-לינוקס"</div><div class='hunk'>@@ -19501,7 +19501,7 @@ msgstr "מנהל ההפעלה של פרוייקט KDE"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr "מנהל ההפעלה של מנדרייק-לינוקס MdkKDM"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -19797,7 +19797,7 @@ msgstr "ייבוא"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20301,14 +20301,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "זוהי תוכנה חופשית ומותר להפיצה מחדש בהתאם לתנאי הרשיון GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "שימוש: \n"</div><div class='hunk'>@@ -20333,7 +20333,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "מרכז הבקרה של מנדרייק-לינוקס"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -23364,7 +23364,7 @@ msgstr "השינוי הסתיים, אך כדי שיהיה בעל משמעות ע</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "כלי רישום של מנדרייק-לינוקס"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -23877,7 +23877,7 @@ msgstr "התחברות הושלמה."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "התחברות נכשלה.\n"</div><div class='ctx'> "נא לבדוק את ההגדרות במרכז ההגדרות של Mandrake."</div><div class='head'>diff --git a/perl-install/share/po/help-de.pot b/perl-install/share/po/help-de.pot<br/>index 62b76bcbf..c454dccdf 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/help-de.pot?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/help-de.pot</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/help-de.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/help-de.pot</a></div><div class='hunk'>@@ -5,12 +5,12 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -37,7 +37,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -46,7 +46,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you won't be able to undo this operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -65,11 +65,11 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrakelinux\n"</div><div class='add'>+"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrivalinux\n"</div><div class='ctx'> "System installiert werden soll. Sofern alles leer ist bzw. ein\n"</div><div class='ctx'> "Betriebssystem alles belegt, müssen die Platte(n) neu partitioniert werden.\n"</div><div class='ctx'> "Prinzipiell besteht das Partitionieren der Platte(n) darin, den\n"</div><div class='del'>-"Plattenplatz so aufzuteilen, dass Ihr Mandrakelinux darauf installiert\n"</div><div class='add'>+"Plattenplatz so aufzuteilen, dass Ihr Mandrivalinux darauf installiert\n"</div><div class='ctx'> "werden kann.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Da dieser Schritt normalerweise irreversibel ist und auch zu Datenverlusten\n"</div><div class='hunk'>@@ -100,7 +100,7 @@ msgstr ""</div><div class='ctx'> "defragmentiert. Dennoch sollten Sie vor diesem Schritt eine Sicherungskopie\n"</div><div class='ctx'> "Ihrer Daten auf einem anderem Medium als der zu verändernden Festplatte\n"</div><div class='ctx'> "vornehmen. Sie sollten diese Variante wählen, falls Sie beide\n"</div><div class='del'>-"Betriebssysteme (Microsoft Windows und Mandrakelinux) nebeneinander nutzen\n"</div><div class='add'>+"Betriebssysteme (Microsoft Windows und Mandrivalinux) nebeneinander nutzen\n"</div><div class='ctx'> "wollen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Bevor Sie sich für diese Variante entscheiden, sei hier noch einmal\n"</div><div class='hunk'>@@ -108,7 +108,7 @@ msgstr ""</div><div class='ctx'> "als momentan.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * „%s“: Falls Sie alle Daten Ihrer Platte verlieren, und sie durch Ihr\n"</div><div class='del'>-"neues Mandrakelinux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"</div><div class='add'>+"neues Mandrivalinux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"</div><div class='ctx'> "Beachten Sie, dass dieser Schritt nicht rückgängig gemacht werden kann.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! Wenn Sie diese Variante wählen, werden alle Ihre Daten auf der Platte\n"</div><div class='hunk'>@@ -233,7 +233,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -242,41 +242,41 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data won't be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dieser Schritt wird nur aufgerufen, wenn mindestens eine GNU/Linux\n"</div><div class='ctx'> "Partition auf Ihren Festplatten gefunden wird.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX fragt Sie nun nach der gewünschten Installationsart. Sie haben die\n"</div><div class='ctx'> "Wahl zwischen einer Aktualisierung einer bereits vorhandenen\n"</div><div class='del'>-"Mandrakelinux-Version oder einer kompletten Neuinstallation:\n"</div><div class='add'>+"Mandrivalinux-Version oder einer kompletten Neuinstallation:\n"</div><div class='ctx'> "\n"</div><div class='del'>-" * „%s“: Entfernt komplett ältere Versionen von Mandrakelinux, die noch\n"</div><div class='add'>+" * „%s“: Entfernt komplett ältere Versionen von Mandrivalinux, die noch\n"</div><div class='ctx'> "installiert sind - um genau zu sein, können Sie je nach aktuellem Inhalt\n"</div><div class='ctx'> "Ihrer Platte auch einige ältere Linux- oder anderweitige Partitionen\n"</div><div class='ctx'> "unangetastet behalten. Diese Installationsart ist gut, wenn Sie die\n"</div><div class='ctx'> "Partitionseinteilung auf Ihrer Festplatte sowieso ändern oder das benutzte\n"</div><div class='ctx'> "Dateisystem austauschen wollen\n"</div><div class='ctx'> "\n"</div><div class='del'>-" * „%s“: Mit dieser Variante können Sie eine existierende Mandrakelinux\n"</div><div class='add'>+" * „%s“: Mit dieser Variante können Sie eine existierende Mandrivalinux\n"</div><div class='ctx'> "Version aktualisieren. Die Partitionstabellen sowie die persönlichen\n"</div><div class='ctx'> "Verzeichnisse der Anwender bleiben erhalten. Alle anderen\n"</div><div class='ctx'> "Installationsschritte werden wie bei einer Installation ausgeführt.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Aktualisierungen von Mandrakelinux „8.1“ oder neueren Systemen sollten\n"</div><div class='del'>-"problemlos funktionieren. Ältere Versionen von Mandrakelinux sollten Sie\n"</div><div class='add'>+"Aktualisierungen von Mandrivalinux „8.1“ oder neueren Systemen sollten\n"</div><div class='add'>+"problemlos funktionieren. Ältere Versionen von Mandrivalinux sollten Sie\n"</div><div class='ctx'> "nicht zu aktualisieren versuchen."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -288,7 +288,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrakelinux\n"</div><div class='add'>+"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrivalinux\n"</div><div class='ctx'> "Installation bereits einige Pakete aktualisiert wurden, etwa da noch Fehler\n"</div><div class='ctx'> "entdeckt und beseitigt wurden oder da in Paketen Sicherheitslücken entdeckt\n"</div><div class='ctx'> "wurden, für die bereits Lösungen existieren. Um von diesen aktualisierten\n"</div><div class='hunk'>@@ -310,7 +310,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -339,7 +339,7 @@ msgid ""</div><div class='ctx'> "disk or partition is called \"C:\")."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Es wurde mehr als eine Windows-Partition gefunden. Wählen Sie bitte, welche\n"</div><div class='del'>-"Sie verkleinern wollen, um Platz für Ihr neues Mandrakelinux zu schaffen.\n"</div><div class='add'>+"Sie verkleinern wollen, um Platz für Ihr neues Mandrivalinux zu schaffen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Die Partitionen werden folgendermaßen aufgelistet: „Linux-Name“,\n"</div><div class='ctx'> "„Windows-Name“, „Kapazität“.\n"</div><div class='hunk'>@@ -372,7 +372,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -428,7 +428,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (das X Window System) ist das Herz der grafischen Benutzeroberfläche von\n"</div><div class='ctx'> "GNU/Linux. Es bildet die Grundlage für die Vielzahl grafischer\n"</div><div class='del'>-"Benutzerumgebungen, die Mandrakelinux Ihnen anbietet (wie etwa KDE, GNOME,\n"</div><div class='add'>+"Benutzerumgebungen, die Mandrivalinux Ihnen anbietet (wie etwa KDE, GNOME,\n"</div><div class='ctx'> "AfterStep oder WindowMaker).\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Sie erhalten eine Liste möglicher Parameter, mit deren Hilfe Sie die\n"</div><div class='hunk'>@@ -490,7 +490,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"</div><div class='hunk'>@@ -511,11 +511,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you don't like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Hier können Sie das Drucksystem für Ihren Rechner wählen. Andere\n"</div><div class='del'>-"Betriebssysteme bieten Ihnen nur eines, bei Mandrakelinux können Sie\n"</div><div class='add'>+"Betriebssysteme bieten Ihnen nur eines, bei Mandrivalinux können Sie\n"</div><div class='ctx'> "zwischen zwei verschiedenen wählen. jedes dieser Systeme ist für eine\n"</div><div class='ctx'> "bestimmte Konfiguration des Systems am besten geeignet.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -537,18 +537,18 @@ msgstr ""</div><div class='ctx'> "starten. „%s“ bietet grafische Konfigurations- und Druckmenüs.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Sie können diese Wahl später immer wieder ändern, indem Sie PrinterDrake\n"</div><div class='del'>-"aus dem Mandrakelinux Control Center starten und dort die Schaltfläche „%s“\n"</div><div class='add'>+"aus dem Mandrivalinux Control Center starten und dort die Schaltfläche „%s“\n"</div><div class='ctx'> "betätigen."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -600,7 +600,7 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nun ist es Zeit sich zu entscheiden, welche Programme Sie auf Ihrem Rechner\n"</div><div class='del'>-"installieren wollen. Es gibt tausende von Paketen für Mandrakelinux, und\n"</div><div class='add'>+"installieren wollen. Es gibt tausende von Paketen für Mandrivalinux, und\n"</div><div class='ctx'> "Sie müssen sie nicht alle auswendig kennen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Die Pakete sind nach ihrer Verwendung in vier Kategorien eingeteilt. Sie\n"</div><div class='hunk'>@@ -657,13 +657,13 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Die Mandrakelinux-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"</div><div class='add'>+"Die Mandrivalinux-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"</div><div class='ctx'> "kann daher vorkommen, dass DrakX Pakete von anderen, als der\n"</div><div class='ctx'> "Installations-CD-ROM installieren will. In diesem Fall wird es die aktuelle\n"</div><div class='ctx'> "CD auswerfen und nach einer anderen fragen. Wenn Sie dieses CD nicht haben,\n"</div><div class='hunk'>@@ -781,10 +781,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you don't know what a particular service is supposed to do or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='ctx'> "the listed services and they will be started automatically at boot time. !!\n"</div><div class='hunk'>@@ -813,7 +813,7 @@ msgstr ""</div><div class='ctx'> "!! Es kommt vor, dass Server- und Dienst-Pakete angewählt wurden - entweder\n"</div><div class='ctx'> "absichtlich, oder als Paket einer ganzen Gruppe; sollte das der Fall sein,\n"</div><div class='ctx'> "werden Sie nun gefragt, ob Sie diese wirklich installiert haben wollen.\n"</div><div class='del'>-"Unter Mandrakelinux werden installierte Server und Dienste automatisch beim\n"</div><div class='add'>+"Unter Mandrivalinux werden installierte Server und Dienste automatisch beim\n"</div><div class='ctx'> "Betriebssystemstart gestartet. Selbst wenn zum Zeitpunkt, als die\n"</div><div class='ctx'> "Distribution zusammengestellt wurde, keine Sicherheitslücken oder Fehler in\n"</div><div class='ctx'> "diesen Paketen bekannt waren, ist natürlich nicht auszuschließen, dass\n"</div><div class='hunk'>@@ -933,7 +933,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -974,7 +974,7 @@ msgstr ""</div><div class='ctx'> "Zur UTF-8 (Unicode) Unterstützung: Unicode ist ein Zeichenkodierung, die\n"</div><div class='ctx'> "die existierenden Kodierungen ablösen soll und die Zeichen aller\n"</div><div class='ctx'> "existierender Sprachen beinhalten. Komplette Unterstützung in GNU/Linux ist\n"</div><div class='del'>-"leider immer noch nicht gegeben. Daher verwendet Mandrakelinux diese\n"</div><div class='add'>+"leider immer noch nicht gegeben. Daher verwendet Mandrivalinux diese\n"</div><div class='ctx'> "Kodierung nur auf Wunsch des Anwenders:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Falls Sie eine Sprache nutzen, die eine gut unterstütztes Kodierung\n"</div><div class='hunk'>@@ -1016,11 +1016,11 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bitte wählen Sie die Festplatte, die Sie löschen wollen, um Ihr neues\n"</div><div class='del'>-"Mandrakelinux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"</div><div class='add'>+"Mandrivalinux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"</div><div class='ctx'> "dieser Platte nach diesem Schritt unwiederbringlich verloren sind!"</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -1072,7 +1072,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you don't know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -1086,7 +1086,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Sollten Sie sich an dieser Stelle nicht sicher sein, so behalten Sie die\n"</div><div class='ctx'> "Standardeinstellung bei. Sie können die Ebene später noch mittels draksec\n"</div><div class='del'>-"im Mandrakelinux Control Center anpassen.\n"</div><div class='add'>+"im Mandrivalinux Control Center anpassen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Das Feld „%s“ dient dazu, dem System mitzuteilen, wer für die Sicherheit\n"</div><div class='ctx'> "dieses Rechners verantwortlich ist. An dieses Kennzeichen/diese E-Mail\n"</div><div class='hunk'>@@ -1138,7 +1138,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -1155,7 +1155,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -1206,7 +1206,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * „%s“: Falls Sie Ihren Internetzugang oder Ihr lokales Netzwerk nun\n"</div><div class='ctx'> "einrichten wollen, können Sie das hier tun. Lesen Sie sich dazu die\n"</div><div class='del'>-"gedruckte Dokumentation durch oder benutzen Sie das Mandrakelinux Control\n"</div><div class='add'>+"gedruckte Dokumentation durch oder benutzen Sie das Mandrivalinux Control\n"</div><div class='ctx'> "Center nachdem die Installation beendet ist.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * „%s“: Hier können Sie HTTP- und FTP-Proxyadressen eintragen falls Ihre\n"</div><div class='hunk'>@@ -1225,10 +1225,10 @@ msgstr ""</div><div class='ctx'> "(„Bootloader“) ändern wollen, wählen Sie diese Schaltfläche. Es sei\n"</div><div class='ctx'> "angemerkt, dass dieser Punkt sich an fortgeschrittenere Nutzer richtet.\n"</div><div class='ctx'> "Hilfe finden Sie in der gedruckten Dokumentation oder im integrierten\n"</div><div class='del'>-"Hilfeteil des Mandrakelinux Control Center.\n"</div><div class='add'>+"Hilfeteil des Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * „%s“: Sie können hier die Dienste wählen, die ab dem Start von\n"</div><div class='del'>-"Mandrakelinux zur Verfügung gestellt werden sollen. Wollen Sie den Rechner\n"</div><div class='add'>+"Mandrivalinux zur Verfügung gestellt werden sollen. Wollen Sie den Rechner\n"</div><div class='ctx'> "als Server verwenden, sollten Sie unbedingt einen Blick auf diese Liste\n"</div><div class='ctx'> "werfen."</div><div class='ctx'> </div><div class='hunk'>@@ -1338,7 +1338,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -1526,7 +1526,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -1548,7 +1548,7 @@ msgstr ""</div><div class='ctx'> "Schaltfläche „%s“, um mit dem Formatieren der Partitionen zu beginnen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Betätigen Sie „%s“, wenn Sie eine andere Partition für Ihr neues\n"</div><div class='del'>-"Mandrakelinux vorgesehen haben.\n"</div><div class='add'>+"Mandrivalinux vorgesehen haben.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Betätigen Sie die Schaltfläche „%s“, falls Sie Partitionen auf defekte\n"</div><div class='ctx'> "Blöcke untersuchen wollen."</div><div class='hunk'>@@ -1670,7 +1670,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -1741,7 +1741,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sie müssen nun entscheiden, auf welche(n) Partition(en) Ihr neues\n"</div><div class='del'>-"Mandrakelinux System installiert werden soll. Falls bereits Partitionen\n"</div><div class='add'>+"Mandrivalinux System installiert werden soll. Falls bereits Partitionen\n"</div><div class='ctx'> "existieren (etwa von einer früheren Installation von GNU/Linux oder durch\n"</div><div class='ctx'> "das Erzeugen mit einem anderen Partitionierungswerkzeug), können Sie diese\n"</div><div class='ctx'> "verwenden. Anderenfalls müssen Sie Partitionen definieren.\n"</div><div class='head'>diff --git a/perl-install/share/po/help-es.pot b/perl-install/share/po/help-es.pot<br/>index cdb49450d..4a26d308e 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/help-es.pot?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/help-es.pot</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/help-es.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/help-es.pot</a></div><div class='hunk'>@@ -5,12 +5,12 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -37,7 +37,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -46,7 +46,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you won't be able to undo this operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -66,11 +66,11 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ahora necesita elegir el lugar de su disco rígido donde se instalará su\n"</div><div class='del'>-"sistema operativo Mandrakelinux. Si su disco rígido está vacío o si un\n"</div><div class='add'>+"sistema operativo Mandrivalinux. Si su disco rígido está vacío o si un\n"</div><div class='ctx'> "sistema operativo existente está utilizando todo el espacio disponible,\n"</div><div class='ctx'> "necesitará particionar el disco. Básicamente, particionar un disco rígido\n"</div><div class='ctx'> "consiste en dividirlo lógicamente para crear espacio para instalar su\n"</div><div class='del'>-"sistema Mandrakelinux nuevo.\n"</div><div class='add'>+"sistema Mandrivalinux nuevo.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Debido a que el proceso de particionado de un disco rígido por lo general\n"</div><div class='ctx'> "es irreversible y puede llevar a pérdida de datos, el particionado puede\n"</div><div class='hunk'>@@ -100,7 +100,7 @@ msgstr ""</div><div class='ctx'> "realizar sin la pérdida de datos, siempre y cuando Usted haya\n"</div><div class='ctx'> "desfragmentado con anterioridad la partición Windows. Es altamente\n"</div><div class='ctx'> "recomendable hacer una copia de respaldo de sus datos. Se recomienda usar\n"</div><div class='del'>-"esta solución si desea utilizar tanto Mandrakelinux como Microsoft Windows\n"</div><div class='add'>+"esta solución si desea utilizar tanto Mandrivalinux como Microsoft Windows\n"</div><div class='ctx'> "en la misma computadora.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Antes de elegir esta opción, por favor comprenda que después de este\n"</div><div class='hunk'>@@ -110,7 +110,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". Si desea borrar todos los datos y todas las particiones\n"</div><div class='ctx'> "presentes en su disco rígido y reemplazarlos con su nuevo sistema\n"</div><div class='del'>-"Mandrakelinux, seleccione esta opción. Tenga cuidado con esta solución ya\n"</div><div class='add'>+"Mandrivalinux, seleccione esta opción. Tenga cuidado con esta solución ya\n"</div><div class='ctx'> "que no podrá revertir su elección después de confirmarla.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! Si elige esta opción, se perderán todos los datos en su disco. !!\n"</div><div class='hunk'>@@ -234,7 +234,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -243,19 +243,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data won't be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Este paso se activa sólo si se encontró una partición GNU/Linux existente\n"</div><div class='ctx'> "en su máquina.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX ahora necesita saber si desea realizar una instalación nueva o una\n"</div><div class='del'>-"actualización de un sistema Mandrakelinux existente:\n"</div><div class='add'>+"actualización de un sistema Mandrivalinux existente:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". En gran parte, esta opción borrará por completo el sistema\n"</div><div class='ctx'> "anterior. Sin embargo, dependiendo de su esquema de particiones, puede\n"</div><div class='hunk'>@@ -264,20 +264,20 @@ msgstr ""</div><div class='ctx'> "particionan sus discos, debería usar esta opción.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Esta clase de instalación le permite actualizar los paquetes que\n"</div><div class='del'>-"en este momento están instalados en su sistema Mandrakelinux. No se alteran\n"</div><div class='add'>+"en este momento están instalados en su sistema Mandrivalinux. No se alteran\n"</div><div class='ctx'> "las particiones corrientes de sus discos ni los datos de los usuarios. La\n"</div><div class='ctx'> "mayoría de los otros pasos de configuración permanecen disponibles y son\n"</div><div class='ctx'> "similares a una instalación estándar.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "El uso de la opción \"Actualizar\" debería funcionar sin problemas para los\n"</div><div class='del'>-"sistemas Mandrakelinux que corren la versión \"8.1\" o una posterior. No se\n"</div><div class='add'>+"sistemas Mandrivalinux que corren la versión \"8.1\" o una posterior. No se\n"</div><div class='ctx'> "recomienda realizar una actualización sobre versiones anteriores a\n"</div><div class='del'>-"Mandrakelinux versión \"8.1\"."</div><div class='add'>+"Mandrivalinux versión \"8.1\"."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -289,7 +289,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Es probable que cuando instale Mandrakelinux algunos paquetes se hayan\n"</div><div class='add'>+"Es probable que cuando instale Mandrivalinux algunos paquetes se hayan\n"</div><div class='ctx'> "actualizado desde la publicación inicial. Se pueden haber corregido errores\n"</div><div class='ctx'> "y solucionado problemas de seguridad. Para permitir que Usted se beneficie\n"</div><div class='ctx'> "de estas actualizaciones, ahora las puede descargar desde la Internet.\n"</div><div class='hunk'>@@ -307,7 +307,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -337,7 +337,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Se ha detectado más de una partición Microsoft Windows en su disco rígido.\n"</div><div class='ctx'> "Por favor, elija aquella a la cual desea cambiar el tamaño para poder\n"</div><div class='del'>-"instalar su sistema operativo Mandrakelinux nuevo.\n"</div><div class='add'>+"instalar su sistema operativo Mandrivalinux nuevo.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cada partición se lista como sigue: \"Nombre Linux\", \"Nombre Windows\",\n"</div><div class='ctx'> "\"Capacidad\".\n"</div><div class='hunk'>@@ -374,7 +374,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -430,7 +430,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (por \"X Window System\") es el corazón de la interfaz gráfica de\n"</div><div class='ctx'> "GNU/Linux en el que se apoyan todos los entornos gráficos (KDE, GNOME,\n"</div><div class='del'>-"AfterStep, WindowMaker, etc.) que se incluyen con Mandrakelinux.\n"</div><div class='add'>+"AfterStep, WindowMaker, etc.) que se incluyen con Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Se le presentará la lista de parámetros diferentes a cambiar para obtener\n"</div><div class='ctx'> "una presentación gráfica óptima.\n"</div><div class='hunk'>@@ -489,7 +489,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"</div><div class='hunk'>@@ -510,12 +510,12 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you don't like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ahora es el momento de seleccionar un sistema de impresión para su\n"</div><div class='ctx'> "computadora. Otros sistemas operativos pueden ofrecerle uno, pero\n"</div><div class='del'>-"Mandrakelinux le ofrece dos. Cada uno de los sistemas de impresión es más\n"</div><div class='add'>+"Mandrivalinux le ofrece dos. Cada uno de los sistemas de impresión es más\n"</div><div class='ctx'> "adecuado para tipos de configuración particulares.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" - \"print, don't queue\" (imprimir sin poner en cola) es la\n"</div><div class='hunk'>@@ -538,17 +538,17 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Si hace una elección ahora y más tarde encuentra que a Usted no le gusta su\n"</div><div class='ctx'> "sistema de impresión, puede cambiarlo ejecutando PrinterDrake desde el\n"</div><div class='del'>-"Centro de Control de Mandrakelinux y haciendo clic sobre el botón \"%s\"."</div><div class='add'>+"Centro de Control de Mandrivalinux y haciendo clic sobre el botón \"%s\"."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -600,11 +600,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ahora es el momento de especificar los programas que desea instalar en su\n"</div><div class='del'>-"sistema. Hay miles de paquetes disponibles para Mandrakelinux, y para hacer\n"</div><div class='add'>+"sistema. Hay miles de paquetes disponibles para Mandrivalinux, y para hacer\n"</div><div class='ctx'> "más simple el manejo de los paquetes, los mismos se han puesto en grupos de\n"</div><div class='ctx'> "aplicaciones similares.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux clasifica los grupos de paquetes en cuatro categorías. Puede\n"</div><div class='add'>+"Mandrivalinux clasifica los grupos de paquetes en cuatro categorías. Puede\n"</div><div class='ctx'> "mezclar y hacer coincidir aplicaciones de varias categorías, por lo que una\n"</div><div class='ctx'> "instalación de \"Estación de trabajo\" puede tener instaladas aplicaciones\n"</div><div class='ctx'> "de la categoría \"Desarrollo\".\n"</div><div class='hunk'>@@ -658,13 +658,13 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"La instalación de Mandrakelinux se distribuye en varios CD-ROM. Si un\n"</div><div class='add'>+"La instalación de Mandrivalinux se distribuye en varios CD-ROM. Si un\n"</div><div class='ctx'> "paquete seleccionado se encuentra en otro CD-ROM, DrakX expulsará el CD\n"</div><div class='ctx'> "corriente y le pedirá que inserte el necesario. Si no tiene el CD necesario\n"</div><div class='ctx'> "a mano, simplemente haga clic sobre \"%s\", no se instalarán los paquetes\n"</div><div class='hunk'>@@ -782,10 +782,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you don't know what a particular service is supposed to do or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='ctx'> "the listed services and they will be started automatically at boot time. !!\n"</div><div class='hunk'>@@ -819,11 +819,11 @@ msgstr ""</div><div class='ctx'> "seleccionó específicamente el paquete individual o porque el mismo era\n"</div><div class='ctx'> "parte de un grupo de paquetes, se le pedirá que confirme que realmente\n"</div><div class='ctx'> "desea que se instalen esos servidores. De manera predeterminada,\n"</div><div class='del'>-"Mandrakelinux iniciará automáticamente todos los servicios instalados al\n"</div><div class='add'>+"Mandrivalinux iniciará automáticamente todos los servicios instalados al\n"</div><div class='ctx'> "momento del arranque. Aunque estos son seguros y no tienen problemas\n"</div><div class='ctx'> "conocidos al momento en que se publicó la distribución, es muy posible que\n"</div><div class='ctx'> "se descubran vulnerabilidades en la seguridad luego que se terminó con esta\n"</div><div class='del'>-"versión de Mandrakelinux. Si no sabe que es lo que se supone que hace un\n"</div><div class='add'>+"versión de Mandrivalinux. Si no sabe que es lo que se supone que hace un\n"</div><div class='ctx'> "servicio o la razón por la cual se está instalando, entonces haga clic\n"</div><div class='ctx'> "sobre \"%s\". Si hace clic sobre \"%s\" se instalarán todos los servicios\n"</div><div class='ctx'> "listados y los mismos se iniciarán automáticamente al momento del arranque.\n"</div><div class='hunk'>@@ -937,7 +937,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -978,7 +978,7 @@ msgstr ""</div><div class='ctx'> "Acerca del soporte UTF-8 (Unicode): Unicode es una codificación nueva de\n"</div><div class='ctx'> "caracteres que pretende cubrir todos los idiomas existentes. Sin embargo,\n"</div><div class='ctx'> "el soporte completo para Unicode bajo GNU/Linux todavía está en desarrollo.\n"</div><div class='del'>-"Por esta razón, Mandrakelinux lo usará o no dependiendo de las elecciones\n"</div><div class='add'>+"Por esta razón, Mandrivalinux lo usará o no dependiendo de las elecciones\n"</div><div class='ctx'> "del usuario:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Si elige un idioma con codificación legada fuerte (idiomas latin1, ruso,\n"</div><div class='hunk'>@@ -1021,11 +1021,11 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Elija la unidad de disco que desea borrar para instalar su partición\n"</div><div class='del'>-"Mandrakelinux nueva. Tenga cuidado, ¡se perderán todos los datos presentes\n"</div><div class='add'>+"Mandrivalinux nueva. Tenga cuidado, ¡se perderán todos los datos presentes\n"</div><div class='ctx'> "en dicha unidad de disco y no se podrán recuperar!."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -1078,7 +1078,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you don't know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -1092,7 +1092,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Si no sabe cual elegir, mantenga la opción predeterminada. Podrá cambiarla\n"</div><div class='ctx'> "más adelante con la herramienta draksec, que es parte del Centro de Control\n"</div><div class='del'>-"de Mandrakelinux.\n"</div><div class='add'>+"de Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Complete el campo \"%s\" con la dirección de correo electrónico de la\n"</div><div class='ctx'> "persona responsable de la seguridad. Los mensajes relativos a la seguridad\n"</div><div class='hunk'>@@ -1144,7 +1144,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -1161,7 +1161,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -1213,7 +1213,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": si desea configurar ahora el acceso a la Internet o a su red\n"</div><div class='ctx'> "local, puede hacerlo ahora. Consulte la documentación impresa o utilice el\n"</div><div class='del'>-"Centro de Control de Mandrakelinux luego que finalizó la instalación para\n"</div><div class='add'>+"Centro de Control de Mandrivalinux luego que finalizó la instalación para\n"</div><div class='ctx'> "aprovechar la ayuda en línea completa.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": permite configurar las direcciones de los proxy HTTP y FTP si la\n"</div><div class='hunk'>@@ -1232,7 +1232,7 @@ msgstr ""</div><div class='ctx'> "haga clic sobre este botón. Esto debería estar reservado para los usuarios\n"</div><div class='ctx'> "avanzados. Consulte la documentación impresa o la ayuda en línea acerca de\n"</div><div class='ctx'> "la configuración del cargador de arranque en el Centro de Control de\n"</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": por medio de esta entrada podrá tener un control fino sobre qué\n"</div><div class='ctx'> "servicios correrán en su máquina. Si planifica utilizar esta máquina como\n"</div><div class='hunk'>@@ -1346,12 +1346,12 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Antes de continuar, debería leer cuidadosamente los términos de la\n"</div><div class='del'>-"licencia. La misma cubre a toda la distribución Mandrakelinux. Si está de\n"</div><div class='add'>+"licencia. La misma cubre a toda la distribución Mandrivalinux. Si está de\n"</div><div class='ctx'> "acuerdo con todos los términos en la misma, haga clic en el botón \"%s\".\n"</div><div class='ctx'> "Si no, haga clic en el botón \"%s\" lo que reiniciará su computadora."</div><div class='ctx'> </div><div class='hunk'>@@ -1535,7 +1535,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -1558,7 +1558,7 @@ msgstr ""</div><div class='ctx'> "Haga clic sobre \"%s\" cuando esté listo para formatear las particiones.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Haga clic sobre \"%s\" si desea elegir otra partición para la instalación\n"</div><div class='del'>-"de su sistema operativo Mandrakelinux nuevo.\n"</div><div class='add'>+"de su sistema operativo Mandrivalinux nuevo.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Haga clic sobre \"%s\" si desea seleccionar las particiones del disco en\n"</div><div class='ctx'> "las que se buscarán bloques defectuosos."</div><div class='hunk'>@@ -1677,7 +1677,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -1748,7 +1748,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ahora necesita elegir qué particiones se utilizarán para la instalación de\n"</div><div class='del'>-"su sistema Mandrakelinux. Si ya se han definido particiones, ya sea por una\n"</div><div class='add'>+"su sistema Mandrivalinux. Si ya se han definido particiones, ya sea por una\n"</div><div class='ctx'> "instalación previa de GNU/Linux o con otra herramienta de particionado,\n"</div><div class='ctx'> "puede utilizarlas. De lo contrario, se deben definir particiones en el\n"</div><div class='ctx'> "disco rígido.\n"</div><div class='head'>diff --git a/perl-install/share/po/help-fr.pot b/perl-install/share/po/help-fr.pot<br/>index 591913853..56353ecfa 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/help-fr.pot?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/help-fr.pot</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/help-fr.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/help-fr.pot</a></div><div class='hunk'>@@ -5,12 +5,12 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -37,7 +37,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -46,7 +46,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you won't be able to undo this operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -66,7 +66,7 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Cette étape vous permet de déterminer précisément l'emplacement de votre\n"</div><div class='del'>-"installation de Mandrakelinux. Si votre disque est vide ou utilisé par un\n"</div><div class='add'>+"installation de Mandrivalinux. Si votre disque est vide ou utilisé par un\n"</div><div class='ctx'> "autre système d'exploitation, vous devrez repartitionner votre disque.\n"</div><div class='ctx'> "Partitionner un disque désigne l'opération consistant à le diviser\n"</div><div class='ctx'> "précisément afin de créer un espace pour votre installation.\n"</div><div class='hunk'>@@ -96,7 +96,7 @@ msgstr ""</div><div class='ctx'> "Le redimensionnement peut être effectué sans pertes de données, à condition\n"</div><div class='ctx'> "que vous ayez préalablement défragmenté la partition Windows. Une\n"</div><div class='ctx'> "sauvegarde de vos données ne fera pas de mal non plus. Cette solution est\n"</div><div class='del'>-"recommandée pour faire cohabiter Mandrakelinux et Microsoft Windows sur le\n"</div><div class='add'>+"recommandée pour faire cohabiter Mandrivalinux et Microsoft Windows sur le\n"</div><div class='ctx'> "même ordinateur.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Avant de choisir cette option, il faut comprendre qu'après cette\n"</div><div class='hunk'>@@ -106,7 +106,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * « %s »: si vous voulez effacer toutes les données et les applications\n"</div><div class='ctx'> "installées sur votre système et les remplacer par votre nouveau système\n"</div><div class='del'>-"Mandrakelinux, choisissez cette option. Soyez prudent, car ce choix est\n"</div><div class='add'>+"Mandrivalinux, choisissez cette option. Soyez prudent, car ce choix est\n"</div><div class='ctx'> "irréversible et permanent. Il vous sera impossible de retrouver vos données\n"</div><div class='ctx'> "effacées.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -227,7 +227,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -236,19 +236,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data won't be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Cette étape ne s'affichera que si une partition GNU/Linux a été détectée\n"</div><div class='ctx'> "sur votre disque dur.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX doit maintenant savoir si vous désirez lancer une « %s » ou une\n"</div><div class='del'>-"« %s » d'un système Mandrakelinux déjà installé :\n"</div><div class='add'>+"« %s » d'un système Mandrivalinux déjà installé :\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * « %s » : remplace l'ancien système. Cependant, selon votre table de\n"</div><div class='ctx'> "partition, vous pourrez éviter l'effacement de vos données existantes\n"</div><div class='hunk'>@@ -257,13 +257,13 @@ msgstr ""</div><div class='ctx'> "vous devriez utiliser cette option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * « %s » : cette classe d'installation vous permet de mettre à jour\n"</div><div class='del'>-"seulement les paquetages qui composent votre système Mandrakelinux. Elle\n"</div><div class='add'>+"seulement les paquetages qui composent votre système Mandrivalinux. Elle\n"</div><div class='ctx'> "conserve les partitions existantes, ainsi que la configuration des\n"</div><div class='ctx'> "utilisateurs. La plupart des autres étapes d'une installation classique\n"</div><div class='ctx'> "sont accessibles.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "La mise à jour devrait fonctionner correctement pour les systèmes\n"</div><div class='del'>-"Mandrakelinux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"</div><div class='add'>+"Mandrivalinux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"</div><div class='ctx'> "jour sur les versions antérieures à « 8.1 » n'est pas recommandé."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -271,7 +271,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -301,7 +301,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Plus d'une partition Windows a été détectée sur votre disque dur. Veuillez\n"</div><div class='ctx'> "choisir celle que vous choisissez pour votre nouvelle installation de\n"</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Chaque partition est identifiée comme suit: \"Nom linux\", \"Nom Windows\",\n"</div><div class='ctx'> "\"Capacité\".\n"</div><div class='hunk'>@@ -333,7 +333,7 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -345,7 +345,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Au moment où vous installez Mandrakelinux, il est possible que certains\n"</div><div class='add'>+"Au moment où vous installez Mandrivalinux, il est possible que certains\n"</div><div class='ctx'> "paquetages aient été mis à jour depuis la sortie du produit. Des bogues ont\n"</div><div class='ctx'> "pu être corrigés, et des problèmes de sécurité résolus. Pour vous permettre\n"</div><div class='ctx'> "de bénéficier de ces mises à jour, il vous est maintenant proposé de les\n"</div><div class='hunk'>@@ -363,7 +363,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -419,7 +419,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (pour le système X Window) est le coeur de votre interface graphique sous\n"</div><div class='ctx'> "GNU/Linux. Tous les environnements graphiques (KDE, GNOME, WindowMaker\n"</div><div class='del'>-"etc.) présents sur Mandrakelinux dépendent de X.\n"</div><div class='add'>+"etc.) présents sur Mandrivalinux dépendent de X.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Il vous sera présenté une liste de divers paramètres à changer pour obtenir\n"</div><div class='ctx'> "un affichage optimal :\n"</div><div class='hunk'>@@ -479,7 +479,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"</div><div class='hunk'>@@ -500,11 +500,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you don't like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Il faut choisir ici un système d'impression pour votre ordinateur. D'autres\n"</div><div class='del'>-"OS en offrent un, Mandrakelinux en propose deux. Chaque système\n"</div><div class='add'>+"OS en offrent un, Mandrivalinux en propose deux. Chaque système\n"</div><div class='ctx'> "d'impression convient le mieux à certains types de configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * « %s » - qui veut dire « print, don't queue », (ou, impression sans\n"</div><div class='hunk'>@@ -526,17 +526,17 @@ msgstr ""</div><div class='ctx'> "Si vous choisissez votre système d'impression maintenant et que par la\n"</div><div class='ctx'> "suite vous n'en seriez pas convaincu, vous pourrez le changer\n"</div><div class='ctx'> "ultérieurement en lançant PrinterDrake depuis le Centre de contrôle\n"</div><div class='del'>-"Mandrakelinux puis en cliquant sur le bouton « %s »."</div><div class='add'>+"Mandrivalinux puis en cliquant sur le bouton « %s »."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -588,11 +588,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "C'est maintenant le moment de choisir les paquetages qui seront installés\n"</div><div class='del'>-"sur votre système. Sachez que Mandrakelinux contient plusieurs milliers de\n"</div><div class='add'>+"sur votre système. Sachez que Mandrivalinux contient plusieurs milliers de\n"</div><div class='ctx'> "paquetages à installer, et ces paquetages ont été rangés par groupes chacun\n"</div><div class='ctx'> "correspondant à un usage particulier de l'ordinateur.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux range ces groupes en quatre catégories. Vous pouvez mélanger\n"</div><div class='add'>+"Mandrivalinux range ces groupes en quatre catégories. Vous pouvez mélanger\n"</div><div class='ctx'> "des groupes de plusieurs catégories de sorte qu'« une station de travail »\n"</div><div class='ctx'> "peut toujours proposer des applications pour la catégorie « Serveur ».\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -647,13 +647,13 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Les paquetages requis à l'installation de Mandrakelinux sont distribués sur\n"</div><div class='add'>+"Les paquetages requis à l'installation de Mandrivalinux sont distribués sur\n"</div><div class='ctx'> "plusieurs CD-ROM. Si un paquetage requis se trouve sur un autre CD-ROM,\n"</div><div class='ctx'> "DrakX éjectera celui présent dans le lecteur et vous demandera d'insérer le\n"</div><div class='ctx'> "CD-ROM approprié. Si vous ne possédez pas le CD demandé, cliquez tout\n"</div><div class='hunk'>@@ -769,10 +769,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you don't know what a particular service is supposed to do or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='ctx'> "the listed services and they will be started automatically at boot time. !!\n"</div><div class='hunk'>@@ -801,7 +801,7 @@ msgstr ""</div><div class='ctx'> "apparaît à droite.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Si un paquetage serveur a été sélectionné, vous devrez confirmer que\n"</div><div class='del'>-"vous voulez vraiment que celui-ci soit installé. Sous Mandrakelinux , par\n"</div><div class='add'>+"vous voulez vraiment que celui-ci soit installé. Sous Mandrivalinux , par\n"</div><div class='ctx'> "défaut, tous les services installés sont lancés au démarrage. Malgré tous\n"</div><div class='ctx'> "les efforts investis pour vous livrer une distribution Linux sécurisée, il\n"</div><div class='ctx'> "est possible que certaines failles de sécurité affectent les serveurs\n"</div><div class='hunk'>@@ -924,7 +924,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -967,7 +967,7 @@ msgstr ""</div><div class='ctx'> "À propos de l'encodage UTF-8 (unicode) : Unicode est un nouveau système\n"</div><div class='ctx'> "d'encodage des caractères censé couvrir tous les langues existantes.\n"</div><div class='ctx'> "Cependant son intégration dans GNU/Linux est encore imparfaite. Pour cette\n"</div><div class='del'>-"raison, Mandrakelinux l'utilisera ou non selon les critères suivants :\n"</div><div class='add'>+"raison, Mandrivalinux l'utilisera ou non selon les critères suivants :\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Si vous choisissez une langue avec un encodage ayant une longue histoire\n"</div><div class='ctx'> "(langues associées à « latin1 », Russe, Japonais, Chinois, Coréen, Thaï,\n"</div><div class='hunk'>@@ -997,7 +997,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Choisissez le disque dur à effacer pour installer votre partition\n"</div><div class='hunk'>@@ -1044,7 +1044,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you don't know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -1059,7 +1059,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Si vous ne savez pas quel niveau choisir, gardez la sélection par défaut.\n"</div><div class='ctx'> "Vous pourrez le modifier ultérieurement avec l'outil draksec, qui se trouve\n"</div><div class='del'>-"dans le Mandrakelinux Control Center\n"</div><div class='add'>+"dans le Mandrivalinux Control Center\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Remplissez le champ « %s » avec l'adresse électronique de l'utilisateur qui\n"</div><div class='ctx'> "sera responsable de la sécurité. Les messages de sécurité lui seront\n"</div><div class='hunk'>@@ -1120,7 +1120,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -1137,7 +1137,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -1188,7 +1188,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * « %s » : si vous souhaitez configurer votre accès Internet ou réseau\n"</div><div class='ctx'> "local dès maintenant. Lisez la documentation fournie ou éxécutez\n"</div><div class='del'>-"Mandrakelinux Control Center après l'installation pour avoir droit à une\n"</div><div class='add'>+"Mandrivalinux Control Center après l'installation pour avoir droit à une\n"</div><div class='ctx'> "aide complète en ligne.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * « %s »: permet de configurer les adresses proxy HTTP et FTP si la\n"</div><div class='hunk'>@@ -1205,7 +1205,7 @@ msgstr ""</div><div class='ctx'> " * « %s » : si vous souhaitez changer la configuration par défaut de votre\n"</div><div class='ctx'> "chargeur de démarrage. À réserver aux utilisateurs expérimentés. Lisez la\n"</div><div class='ctx'> "documentation fournie ou l'aide en ligne sur la configuration de chargeur\n"</div><div class='del'>-"de démarrage présente dans Mandrakelinux Control Center.\n"</div><div class='add'>+"de démarrage présente dans Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * « %s » : vous pourrez ici contrôler finement les services disponibles\n"</div><div class='ctx'> "sur votre machine. Si vous envisagez de monter un serveur, c'est une bonne\n"</div><div class='hunk'>@@ -1294,13 +1294,13 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Avant d'aller plus loin, il est fortement recommandé de lire attentivement\n"</div><div class='ctx'> "les termes et conditions d'utilisation de la licence. Celle-ci régit\n"</div><div class='del'>-"l'ensemble de la distribution Mandrakelinux. Si vous en acceptez tous les\n"</div><div class='add'>+"l'ensemble de la distribution Mandrivalinux. Si vous en acceptez tous les\n"</div><div class='ctx'> "termes, cochez la case « %s », sinon, cliquez sur le bouton « %s » pour\n"</div><div class='ctx'> "redémarrer votre ordinateur."</div><div class='ctx'> </div><div class='hunk'>@@ -1510,7 +1510,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -1530,7 +1530,7 @@ msgstr ""</div><div class='ctx'> "Cliquez sur « %s » lorsque vous êtes prêt à formater les partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cliquez sur « %s » pour choisir une autre partition où installer votre\n"</div><div class='del'>-"nouveau système d'exploitation Mandrakelinux.\n"</div><div class='add'>+"nouveau système d'exploitation Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cliquer sur « %s » si vous désirez sélectionner des partitions pour une\n"</div><div class='ctx'> "vérification des secteurs défectueux (« Bad Blocks »)."</div><div class='hunk'>@@ -1610,7 +1610,7 @@ msgid ""</div><div class='ctx'> "\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"</div><div class='ctx'> "/dev/fd0\"."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Votre installation de Mandrakelinux est maintenant terminée et votre\n"</div><div class='add'>+"Votre installation de Mandrivalinux est maintenant terminée et votre\n"</div><div class='ctx'> "système est prêt à être utilisé. Cliquez sur « %s » pour redémarrer votre\n"</div><div class='ctx'> "système. N'oubliez pas de retirer la source d'installation(CD-ROM ou\n"</div><div class='ctx'> "disquette). La première chose que vous verrez alors après que l'ordinateur\n"</div><div class='hunk'>@@ -1648,7 +1648,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -1719,7 +1719,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "À cette étape, vous devez sélectionner quelle partition sera utilisée pour\n"</div><div class='del'>-"votre système Mandrakelinux. Si votre disque est déjà partitionné, soit par\n"</div><div class='add'>+"votre système Mandrivalinux. Si votre disque est déjà partitionné, soit par\n"</div><div class='ctx'> "une autre installation GNU/Linux ou par un autre outil de partitionnement,\n"</div><div class='ctx'> "vous pourrez les utiliser. Sinon, les partitions devront être créées.\n"</div><div class='ctx'> "\n"</div><div class='head'>diff --git a/perl-install/share/po/help-it.pot b/perl-install/share/po/help-it.pot<br/>index 246fd6490..d10f299bb 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/help-it.pot?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/help-it.pot</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/help-it.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/help-it.pot</a></div><div class='hunk'>@@ -5,12 +5,12 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -37,7 +37,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -46,7 +46,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you won't be able to undo this operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -66,12 +66,12 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A questo punto dovete scegliere in quali punti del vostro disco rigido\n"</div><div class='del'>-"installare il sistema operativo Mandrakelinux. Se il disco è vuoto, o se\n"</div><div class='add'>+"installare il sistema operativo Mandrivalinux. Se il disco è vuoto, o se\n"</div><div class='ctx'> "tutto lo spazio disponibile è occupato da un altro sistema operativo già\n"</div><div class='ctx'> "installato, allora dovrete creare o modificare le partizioni. In breve,\n"</div><div class='ctx'> "partizionare un disco rigido consiste nel suddividerlo logicamente in più\n"</div><div class='ctx'> "zone in maniera da creare lo spazio necessario all'installazione di\n"</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Dato che gli effetti del partizionamento sono di solito irreversibili, e\n"</div><div class='ctx'> "possono causare la perdita di dati, questa operazione può intimidire e\n"</div><div class='hunk'>@@ -102,7 +102,7 @@ msgstr ""</div><div class='ctx'> "dati, a patto che prima di procedere la partizione Windows sia stata\n"</div><div class='ctx'> "deframmentata. Vi consigliamo caldamente di fare comunque una copia di\n"</div><div class='ctx'> "sicurezza dei vostri dati. Questa è la soluzione consigliata se desiderate\n"</div><div class='del'>-"usare sia Mandrakelinux che Microsoft Windows sullo stesso computer.\n"</div><div class='add'>+"usare sia Mandrivalinux che Microsoft Windows sullo stesso computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Prima di scegliere questa opzione, tenete presente che le dimensioni\n"</div><div class='ctx'> "della partizione su cui risiede Windows saranno ridotte rispetto a quelle\n"</div><div class='hunk'>@@ -111,7 +111,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": se desiderate cancellare tutti i dati e tutte le partizioni\n"</div><div class='ctx'> "presenti sul vostro disco rigido e rimpiazzarli con il vostro nuovo sistema\n"</div><div class='del'>-"Mandrakelinux, potete selezionare questa opzione. Fate molta attenzione,\n"</div><div class='add'>+"Mandrivalinux, potete selezionare questa opzione. Fate molta attenzione,\n"</div><div class='ctx'> "perché dopo aver dato conferma non potrete più tornare indietro.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! Se scegliete questa opzione tutti i dati sul vostro disco saranno\n"</div><div class='hunk'>@@ -235,7 +235,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -244,19 +244,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data won't be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Questo passo viene eseguito soltanto se sulla vostra macchina viene trovata\n"</div><div class='ctx'> "una partizione GNU/Linux preesistente.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "A questo punto DrakX ha bisogno di sapere se intendete effettuare una nuova\n"</div><div class='del'>-"installazione o un aggiornamento di un sistema Mandrakelinux esistente:\n"</div><div class='add'>+"installazione o un aggiornamento di un sistema Mandrivalinux esistente:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": nella maggior parte dei casi cancella completamente il vecchio\n"</div><div class='ctx'> "sistema. Tuttavia, in base allo schema di partizionamento usato, potete\n"</div><div class='hunk'>@@ -266,19 +266,19 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": questo tipo di installazione vi permette di effettuare un\n"</div><div class='ctx'> "semplice aggiornamento dei pacchetti già installati sul vostro sistema\n"</div><div class='del'>-"Mandrakelinux. Tutte le partizioni attuali del disco rigido vengono\n"</div><div class='add'>+"Mandrivalinux. Tutte le partizioni attuali del disco rigido vengono\n"</div><div class='ctx'> "conservate, come pure le configurazioni e i dati individuali degli utenti.\n"</div><div class='ctx'> "La maggior parte degli altri passi relativi alla configurazione restano\n"</div><div class='ctx'> "disponibili, come per una installazione normale.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "L'opzione \"Aggiornamento\" non dovrebbe comportare difficoltà per sistemi\n"</div><div class='del'>-"Mandrakelinux a partire dalla versione \"8.1\", mentre non è consigliabile\n"</div><div class='del'>-"utilizzarla per aggiornare versioni di Mandrakelinux precedenti la \"8.1\"."</div><div class='add'>+"Mandrivalinux a partire dalla versione \"8.1\", mentre non è consigliabile\n"</div><div class='add'>+"utilizzarla per aggiornare versioni di Mandrivalinux precedenti la \"8.1\"."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -290,7 +290,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"È molto probabile che, al momento in cui installate Mandrakelinux, alcuni\n"</div><div class='add'>+"È molto probabile che, al momento in cui installate Mandrivalinux, alcuni\n"</div><div class='ctx'> "pacchetti siano stati aggiornati rispetto alla versione iniziale;\n"</div><div class='ctx'> "potrebbero essere stati corretti degli errori, o risolti eventuali problemi\n"</div><div class='ctx'> "relativi alla sicurezza. Per permettervi di beneficiare di questi\n"</div><div class='hunk'>@@ -311,7 +311,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -341,7 +341,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sul vostro disco rigido è stata individuata più di una partizione\n"</div><div class='ctx'> "Microsoft. Scegliete quella che deve essere ridimensionata in modo da poter\n"</div><div class='del'>-"installare il vostro nuovo sistema operativo Mandrakelinux.\n"</div><div class='add'>+"installare il vostro nuovo sistema operativo Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ogni partizione è elencata in questo modo: \"nome Linux\", \"nome Windows\"\n"</div><div class='ctx'> "\"Dimensione\".\n"</div><div class='hunk'>@@ -374,7 +374,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -430,7 +430,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (abbreviazione per \"X Window System\") è il cuore dell'interfaccia\n"</div><div class='ctx'> "grafica di GNU/Linux, sul quale sono basati tutti gli ambienti grafici\n"</div><div class='del'>-"inclusi in Mandrakelinux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"</div><div class='add'>+"inclusi in Mandrivalinux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Vi verrà mostrata una lista dei parametri da configurare in modo da avere\n"</div><div class='ctx'> "la miglior visualizzazione possibile:\n"</div><div class='hunk'>@@ -492,7 +492,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"</div><div class='hunk'>@@ -513,11 +513,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you don't like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Qui potrete scegliere il sistema di stampa da usare con il vostro computer;\n"</div><div class='del'>-"altri sistemi operativi ve ne offrono uno, ma Mandrakelinux ve ne offre ben\n"</div><div class='add'>+"altri sistemi operativi ve ne offrono uno, ma Mandrivalinux ve ne offre ben\n"</div><div class='ctx'> "due. Ciascuno di essi è adatto a un particolare tipo di configurazione.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- che sta per \"\"print, don't queue\"\" (\"stampa, non mettere\n"</div><div class='hunk'>@@ -541,17 +541,17 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Se fate una scelta adesso e successivamente cambiate idea, potrete sempre\n"</div><div class='ctx'> "scegliere un diverso sistema di stampa avviando PrinterDrake dal\n"</div><div class='del'>-"Mandrakelinux Control Center e cliccando sul pulsante \"%s\"."</div><div class='add'>+"Mandrivalinux Control Center e cliccando sul pulsante \"%s\"."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -604,7 +604,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Adesso è il momento di indicare i programmi che volete siano installati sul\n"</div><div class='ctx'> "vostro sistema. Ci sono migliaia di pacchetti disponibili per\n"</div><div class='del'>-"Mandrakelinux, e sono stati suddivisi in gruppi in base al loro campo di\n"</div><div class='add'>+"Mandrivalinux, e sono stati suddivisi in gruppi in base al loro campo di\n"</div><div class='ctx'> "utilizzo, in modo da facilitarne la gestione.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "I gruppi sono a loro volta suddivisi in quattro categorie. Potete\n"</div><div class='hunk'>@@ -665,13 +665,13 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"La distribuzione Mandrakelinux è suddivisa su più CD-ROM. Se uno dei\n"</div><div class='add'>+"La distribuzione Mandrivalinux è suddivisa su più CD-ROM. Se uno dei\n"</div><div class='ctx'> "pacchetti selezionati si trova su un CD-ROM diverso da quello attualmente\n"</div><div class='ctx'> "inserito nel lettore, DrakX provvederà a espellerlo e a chiedervi di\n"</div><div class='ctx'> "inserire quello corretto. Se non avete a portata di mano il CD richiesto,\n"</div><div class='hunk'>@@ -791,10 +791,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you don't know what a particular service is supposed to do or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='ctx'> "the listed services and they will be started automatically at boot time. !!\n"</div><div class='hunk'>@@ -825,11 +825,11 @@ msgstr ""</div><div class='ctx'> "!! Se avete selezionato un pacchetto che offre un servizio come server\n"</div><div class='ctx'> "(intenzionalmente, oppure perché faceva parte di un gruppo), vi verrà\n"</div><div class='ctx'> "chiesta conferma per la sua effettiva installazione. Come opzione\n"</div><div class='del'>-"predefinita, in Mandrakelinux tutti i servizi installati vengono attivati\n"</div><div class='add'>+"predefinita, in Mandrivalinux tutti i servizi installati vengono attivati\n"</div><div class='ctx'> "automaticamente all'avvio. Sebbene si tratti di servizi sicuri ed esenti da\n"</div><div class='ctx'> "problemi noti al momento del rilascio della distribuzione, non è escluso\n"</div><div class='ctx'> "che possano essere scoperte falle di sicurezza al loro interno dopo la\n"</div><div class='del'>-"pubblicazione di questa versione di Mandrakelinux. Quindi, se non avete\n"</div><div class='add'>+"pubblicazione di questa versione di Mandrivalinux. Quindi, se non avete\n"</div><div class='ctx'> "idea di cosa faccia un particolare servizio o del perché debba essere\n"</div><div class='ctx'> "installato, cliccate su \"%s\". Scegliendo \"%s\", invece, i servizi\n"</div><div class='ctx'> "elencati saranno installati e attivati in automatico all'avvio del sistema.\n"</div><div class='hunk'>@@ -946,7 +946,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -990,7 +990,7 @@ msgstr ""</div><div class='ctx'> "Riguardo al supporto UTF-8 (Unicode): Unicode è un nuovo standard per la\n"</div><div class='ctx'> "codifica dei caratteri, progettato per supportare tutte le lingue\n"</div><div class='ctx'> "esistenti. Il suo supporto su GNU/Linux è ancora in fase di sviluppo, e per\n"</div><div class='del'>-"questo motivo la sua attivazione su Mandrakelinux dipenderà dalle scelte\n"</div><div class='add'>+"questo motivo la sua attivazione su Mandrivalinux dipenderà dalle scelte\n"</div><div class='ctx'> "effettuate dall'utente:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * se scegliete lingue fortemente legate alle vecchie codifiche (lingue del\n"</div><div class='hunk'>@@ -1035,11 +1035,11 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Scegliete il disco rigido che volete cancellare per poter creare la nuova\n"</div><div class='del'>-"partizione su cui installare Mandrakelinux. Attenzione, tutti i dati\n"</div><div class='add'>+"partizione su cui installare Mandrivalinux. Attenzione, tutti i dati\n"</div><div class='ctx'> "presenti sul disco selezionato andranno perduti e non potranno più essere\n"</div><div class='ctx'> "recuperati!"</div><div class='ctx'> </div><div class='hunk'>@@ -1093,7 +1093,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you don't know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -1108,7 +1108,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Se non sapete quale scelta fare, utilizzate l'impostazione predefinita.\n"</div><div class='ctx'> "Potrete comunque cambiare in seguito il livello di sicurezza usando\n"</div><div class='del'>-"draksec, uno strumento del Mandrakelinux Control Center.\n"</div><div class='add'>+"draksec, uno strumento del Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Nel campo \"%s\" inserite l'indirizzo email dell'utente che sarà\n"</div><div class='ctx'> "responsabile per la sicurezza: tutti i messaggi relativi alla sicurezza\n"</div><div class='hunk'>@@ -1160,7 +1160,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -1177,7 +1177,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -1231,7 +1231,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": se desiderate configurare l'accesso a Internet o a una rete\n"</div><div class='ctx'> "locale potete farlo adesso. Consultate la documentazione stampata, oppure\n"</div><div class='del'>-"utilizzate il Mandrakelinux Control Center una volta terminata\n"</div><div class='add'>+"utilizzate il Mandrivalinux Control Center una volta terminata\n"</div><div class='ctx'> "l'installazione per avere a vostra disposizione un aiuto in linea completo.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": vi permette di configurare gli indirizzi di proxy HTTP e FTP,\n"</div><div class='hunk'>@@ -1249,7 +1249,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": cliccate su questo pulsante per cambiare la configurazione del\n"</div><div class='ctx'> "bootloader. Questa opzione dovrebbe essere utilizzata solo dagli utenti più\n"</div><div class='ctx'> "esperti. Consultate la documentazione stampata o l'aiuto in linea del\n"</div><div class='del'>-"Mandrakelinux Control Center riguardo la configurazione del bootloader.\n"</div><div class='add'>+"Mandrivalinux Control Center riguardo la configurazione del bootloader.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": qui potrete stabilire in dettaglio quali servizi saranno\n"</div><div class='ctx'> "attivati sul vostro sistema. Se pensate di utilizzare il computer come\n"</div><div class='hunk'>@@ -1365,12 +1365,12 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Prima di proseguire dovreste leggere con attenzione le condizioni d'uso che\n"</div><div class='del'>-"riguardano l'intera distribuzione Mandrakelinux. Se siete d'accordo con\n"</div><div class='add'>+"riguardano l'intera distribuzione Mandrivalinux. Se siete d'accordo con\n"</div><div class='ctx'> "tutti i termini della licenza cliccate sul pulsante \"%s\". In caso\n"</div><div class='ctx'> "contrario, semplicemente spegnere il computer per interrompere\n"</div><div class='ctx'> "l'installazione."</div><div class='hunk'>@@ -1558,7 +1558,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -1580,7 +1580,7 @@ msgstr ""</div><div class='ctx'> "Cliccate su \"%s\" quando siete pronti ad avviare la formattazione.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cliccate su \"%s\" se desiderate installare il vostro nuovo sistema\n"</div><div class='del'>-"operativo Mandrakelinux su partizioni diverse da quelle selezionate.\n"</div><div class='add'>+"operativo Mandrivalinux su partizioni diverse da quelle selezionate.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cliccate su \"%s\" se desiderate selezionare alcune delle partizioni\n"</div><div class='ctx'> "affinché venga controllata la presenza di eventuali blocchi danneggiati su\n"</div><div class='hunk'>@@ -1707,7 +1707,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -1778,7 +1778,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A questo punto, dovete decidere quali partizioni devono essere usate per\n"</div><div class='del'>-"l'installazione del vostro sistema Mandrakelinux. Se sono già state\n"</div><div class='add'>+"l'installazione del vostro sistema Mandrivalinux. Se sono già state\n"</div><div class='ctx'> "definite delle partizioni, grazie a una precedente installazione di\n"</div><div class='ctx'> "GNU/Linux o usando un altro programma di partizionamento, potete utilizzare\n"</div><div class='ctx'> "quelle. In caso contrario, sarà necessario creare o modificare le\n"</div><div class='head'>diff --git a/perl-install/share/po/help-ru.pot b/perl-install/share/po/help-ru.pot<br/>index a9fa70a81..b56f80cd3 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/help-ru.pot?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/help-ru.pot</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/help-ru.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/help-ru.pot</a></div><div class='hunk'>@@ -5,12 +5,12 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -37,7 +37,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -46,7 +46,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you won't be able to undo this operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -66,11 +66,11 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "На этом шаге вам прийдется решить, куда вы хотите установить операционную\n"</div><div class='del'>-"систему Mandrakelinux на вашем жестком диске. Если ваш жесткий диск пуст,\n"</div><div class='add'>+"систему Mandrivalinux на вашем жестком диске. Если ваш жесткий диск пуст,\n"</div><div class='ctx'> "или существующая операционная система на нем занимает все дисковое\n"</div><div class='ctx'> "пространство, вам прийдется диск переразбить (partition). Разделение диска\n"</div><div class='ctx'> "в основном состоит в том, чтобы логически выделить на нем свободное\n"</div><div class='del'>-"пространство для установки вашей новой системы Mandrakelinux.\n"</div><div class='add'>+"пространство для установки вашей новой системы Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Поскольку разделение диска - это обычно необратимый процесс и может\n"</div><div class='ctx'> "привести к потере данных, если на диске уже есть установленная операционная\n"</div><div class='hunk'>@@ -97,7 +97,7 @@ msgstr ""</div><div class='ctx'> "потери данных, особенно если вы предварительно провели дефрагментацию\n"</div><div class='ctx'> "раздела Windows. Резервное копирование ваших данных настойчиво\n"</div><div class='ctx'> "рекомендуется.. Рекомендуем выбрать эту опцию, если вы собираетесь\n"</div><div class='del'>-"использовать Mandrakelinux и Microsoft Windows на одном компьютере.\n"</div><div class='add'>+"использовать Mandrivalinux и Microsoft Windows на одном компьютере.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Перед тем, как выбрать эту опцию, вы должны осознать, что размер вашего\n"</div><div class='ctx'> "раздела Microsoft Windows станет меньше, чем был. У вас будет меньше\n"</div><div class='hunk'>@@ -105,7 +105,7 @@ msgstr ""</div><div class='ctx'> "новых программ.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" выберите эту опцию, если вы хотите удалить все данные на всех\n"</div><div class='del'>-"разделах вашего жесткого диска и заменить их новой системой Mandrakelinux.\n"</div><div class='add'>+"разделах вашего жесткого диска и заменить их новой системой Mandrivalinux.\n"</div><div class='ctx'> "Будьте осторожны в этом решении, потому что после подтверждения вы не\n"</div><div class='ctx'> "сможете вернуть обратно все как было.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -227,7 +227,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -236,19 +236,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data won't be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Этот шаг появляется только в случае, если на вашей машине найден старый\n"</div><div class='ctx'> "раздел GNU/Linux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX теперь должен узнать, хотите ли вы провести новую установку или\n"</div><div class='del'>-"обновление существующей системы Mandrakelinux:\n"</div><div class='add'>+"обновление существующей системы Mandrivalinux:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": в большинстве случаев этот вариант приведет к уничтожению старой\n"</div><div class='ctx'> "системы. Если вы желаете изменить разделы вашего жесткого диска или\n"</div><div class='hunk'>@@ -257,18 +257,18 @@ msgstr ""</div><div class='ctx'> "от перезаписи некоторые свои данные.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": этот класс установки позволит вам обновить пакеты, установленные\n"</div><div class='del'>-"в вашей системе Mandrakelinux. Текущая схема разделов диска и\n"</div><div class='add'>+"в вашей системе Mandrivalinux. Текущая схема разделов диска и\n"</div><div class='ctx'> "пользовательские данные останутся нетронутыми. Большинство других шагов\n"</div><div class='ctx'> "будут доступны, как и при стандартной установке.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"``Обновление'' будет неплохо работать на системах Mandrakelinux начиная с\n"</div><div class='del'>-"\"8.1\" и выше. Проведение обновления на системах Mandrakelinux старше\n"</div><div class='add'>+"``Обновление'' будет неплохо работать на системах Mandrivalinux начиная с\n"</div><div class='add'>+"\"8.1\" и выше. Проведение обновления на системах Mandrivalinux старше\n"</div><div class='ctx'> "\"8.1\" не рекомендуется."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -280,7 +280,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"В данный момент установки Mandrakelinux было бы неплохо обновить некоторые\n"</div><div class='add'>+"В данный момент установки Mandrivalinux было бы неплохо обновить некоторые\n"</div><div class='ctx'> "пакеты из исходного релиза. Некоторые баги могут быть уже исправлены и\n"</div><div class='ctx'> "решены проблемы безопасности. Чтобы получить пользу от этих обновлений,\n"</div><div class='ctx'> "сейчас вы можете загрузить их из Интернет. Нажмите \"%s\", если у вас есть\n"</div><div class='hunk'>@@ -297,7 +297,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -327,7 +327,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "На вашем жестом диске обнаружено несколько разделов Microsoft. Выберите\n"</div><div class='ctx'> "необходимый раздел для изменения его размера с целью установки вашей новой\n"</div><div class='del'>-"операционной системы Mandrakelinux.\n"</div><div class='add'>+"операционной системы Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Каждый раздел перечислен так: \"Linux имя\", \"Windows имя\" \"Размер\".\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -359,7 +359,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -415,7 +415,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (для системы X Window) это сердце графического интерфейса GNU/Linux, на\n"</div><div class='ctx'> "базе которого работают все графические среды (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, и т.д..), входящие в Mandrakelinux.\n"</div><div class='add'>+"WindowMaker, и т.д..), входящие в Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Вам будет представлен список различных параметров для получения\n"</div><div class='ctx'> "оптимального графического отображения: Видеокарта\n"</div><div class='hunk'>@@ -473,7 +473,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"</div><div class='hunk'>@@ -494,11 +494,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you don't like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Теперь пришло время выбрать систему печати для вашего компьютера. Другие OS\n"</div><div class='del'>-"могут предложить вам одну, а Mandrakelinux предлагает две. Каждая из систем\n"</div><div class='add'>+"могут предложить вам одну, а Mandrivalinux предлагает две. Каждая из систем\n"</div><div class='ctx'> "является лучшей для определенной конфигурации.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- что означает ``печатать, не ставить в очередь'' (``print,\n"</div><div class='hunk'>@@ -527,11 +527,11 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -583,11 +583,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Теперь настало время определить, какие программы вы хотите установить в\n"</div><div class='del'>-"вашу систему. С Mandrakelinux поставляются тысячи пакетов и, для упрощения\n"</div><div class='add'>+"вашу систему. С Mandrivalinux поставляются тысячи пакетов и, для упрощения\n"</div><div class='ctx'> "выбора, они разбиты на группы.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Пакеты сортированы по группам, которые соответствуют специфике\n"</div><div class='del'>-"использования вашей машины. В Mandrakelinux пакеты сортируются по четырем\n"</div><div class='add'>+"использования вашей машины. В Mandrivalinux пакеты сортируются по четырем\n"</div><div class='ctx'> "категориям. Вы можете смешивать и сочетать приложения из различных\n"</div><div class='ctx'> "категорий, например, вариант установки ``Рабочая станция'' может иметь\n"</div><div class='ctx'> "приложения из категории ``Разработка''.\n"</div><div class='hunk'>@@ -635,13 +635,13 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Инсталляция Mandrakelinux размещена на нескольких CD-ROMах. Если выбранный\n"</div><div class='add'>+"Инсталляция Mandrivalinux размещена на нескольких CD-ROMах. Если выбранный\n"</div><div class='ctx'> "пакет находится на другом CD-ROM, DrakX будет отдавать текущий CD и просить\n"</div><div class='ctx'> "вас вставить другой по мере надобности."</div><div class='ctx'> </div><div class='hunk'>@@ -753,10 +753,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you don't know what a particular service is supposed to do or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='ctx'> "the listed services and they will be started automatically at boot time. !!\n"</div><div class='hunk'>@@ -785,10 +785,10 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Если был выбран какой-либо серверный пакет, специально или он был частью\n"</div><div class='ctx'> "какой-либо группы, вас попросят подтвердить, действительно ли вы желаете\n"</div><div class='del'>-"установить эти сервера. Под Mandrakelinux все установленные сервера\n"</div><div class='add'>+"установить эти сервера. Под Mandrivalinux все установленные сервера\n"</div><div class='ctx'> "запускаются по умолчанию в процессе загрузки. Даже если они безопасны и не\n"</div><div class='ctx'> "имеют известных проблем на момент выпуска дистрибутива, в них могут быть\n"</div><div class='del'>-"обнаружены дыры в безопасности после выпуска данной версии Mandrakelinux.\n"</div><div class='add'>+"обнаружены дыры в безопасности после выпуска данной версии Mandrivalinux.\n"</div><div class='ctx'> "Если вы не знаете, зачем нужен данный сервис и что он делает, нажмите\n"</div><div class='ctx'> "\"%s\". Если вы нажмете \"%s\", тогда все сервисы из списка будут\n"</div><div class='ctx'> "установлены и автоматически запущены при загрузке системы. !!\n"</div><div class='hunk'>@@ -894,7 +894,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -932,7 +932,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "О поддержке UTF-8 (unicode): Unicode это новая кодировка, которая включает\n"</div><div class='ctx'> "в себя все существующие языки. Однако ее полная поддержка в GNU/Linux пока\n"</div><div class='del'>-"находится в стадии разработки. Поэтому Mandrakelinux будет определять\n"</div><div class='add'>+"находится в стадии разработки. Поэтому Mandrivalinux будет определять\n"</div><div class='ctx'> "использовать ее или нет в зависимости от выбора пользователя:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Если вы выбираете языки, которые имеют свою традиционную устоявшуюся\n"</div><div class='hunk'>@@ -975,11 +975,11 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Выберите жесткий диск, который нужно очистить для инсталляции вашего нового\n"</div><div class='del'>-"раздела Mandrakelinux. Будьте осторожны, все данные на нем будут потеряны и\n"</div><div class='add'>+"раздела Mandrivalinux. Будьте осторожны, все данные на нем будут потеряны и\n"</div><div class='ctx'> "их нельзя будет восстановить!"</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -1031,7 +1031,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you don't know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -1045,7 +1045,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Если вы не знаете что выбрать, оставьте выбор по умолчанию. Вы сможете\n"</div><div class='ctx'> "изменить этот уровень безопасности потом с помощью утилиты draksec из\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "В поле \"%s\" системе указывается пользователь, который будет отвечать за\n"</div><div class='ctx'> "безопасность. На этот адрес будут посылаться сообщения по безопасности."</div><div class='hunk'>@@ -1096,7 +1096,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -1113,7 +1113,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -1281,12 +1281,12 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Прежде чем продолжить, вы должны внимательно прочитать условия лицензии.\n"</div><div class='del'>-"Лицензия распространяется на весь дистрибутив Mandrakelinux. Если вы\n"</div><div class='add'>+"Лицензия распространяется на весь дистрибутив Mandrivalinux. Если вы\n"</div><div class='ctx'> "согласны со всеми условиями лицензии, отметьте пункт \"%s\". Если нет -\n"</div><div class='ctx'> "просто выключите свой компьютер."</div><div class='ctx'> </div><div class='hunk'>@@ -1465,7 +1465,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -1490,7 +1490,7 @@ msgstr ""</div><div class='ctx'> "Нажмите \"%s\", когда будете готовы начать форматирование разделов.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Нажмите \"%s\", если вы хотите выбрать другой раздел для установки\n"</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Нажмите \"%s\", если хотите выбрать разделы, которые следует проверить на\n"</div><div class='ctx'> "сбойные блоки (bad blocks)."</div><div class='hunk'>@@ -1604,7 +1604,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -1675,7 +1675,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Здесь вам предложат выбрать, какие разделы будут использоваться для\n"</div><div class='del'>-"установки вашей системы Mandrakelinux. Если разделы были уже определены\n"</div><div class='add'>+"установки вашей системы Mandrivalinux. Если разделы были уже определены\n"</div><div class='ctx'> "ранее, например, предыдущей инсталляцией GNU/Linux или другой утилитой\n"</div><div class='ctx'> "разбиения дисков, вы можете воспользоваться существующими разделами. В\n"</div><div class='ctx'> "противном случае, разделы жесткого диска должны быть определены.\n"</div><div class='head'>diff --git a/perl-install/share/po/help-zh_CN.pot b/perl-install/share/po/help-zh_CN.pot<br/>index a7d768fa7..eedb1edf9 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/help-zh_CN.pot?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/help-zh_CN.pot</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/help-zh_CN.pot?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/help-zh_CN.pot</a></div><div class='hunk'>@@ -19,7 +19,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -53,7 +53,7 @@ msgstr ""</div><div class='ctx'> "单击\"%s\"按钮以后，您可以选择要在您的工作站上安装哪些额外的语言，即为系统文档和应用程序安装特定语言的文件。例如，如果您的计算机要为繁体中文的用户提供服务，请在树视图中选择简体中文作为默认语言，然后在高级选项中选择\"%s\"。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "关于 UTF-8 (Unicode) 支持：Unicode 是一种新的字符编码，该编码可支持所有现存的语言。但是，在 GNU/Linux 下完全支持\n"</div><div class='del'>-"Unicode，仍然在开发和完善中。由此原因，Mandrakelinux 会根据用户的选择是否使用 UTF-8：\n"</div><div class='add'>+"Unicode，仍然在开发和完善中。由此原因，Mandrivalinux 会根据用户的选择是否使用 UTF-8：\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、泰语、希腊语、土耳其语及大多数 iso-8859-2\n"</div><div class='ctx'> "语言)，则会默认使用强制编码；\n"</div><div class='hunk'>@@ -82,12 +82,12 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -114,7 +114,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -123,7 +123,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you won't be able to undo this operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -142,9 +142,9 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"在这一步里，您需要决定您想要将 Mandrakelinux\n"</div><div class='add'>+"在这一步里，您需要决定您想要将 Mandrivalinux\n"</div><div class='ctx'> "操作系统安装到硬盘的何处。如果您的硬盘完全是空的，或者已有操作系统使用了所有的空间，您就必须要对硬盘进行分区。粗略的说，对硬盘进行分区就是将其划分成几个逻辑上不同的部分，以便创建安装您新的\n"</div><div class='del'>-"Mandrakelinux 系统所需的空间。\n"</div><div class='add'>+"Mandrivalinux 系统所需的空间。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "由于对硬盘进行分区通常是不可恢复的，并且可能导致数据丢失，所以对于没有经验的用户来说，分区是十分危险的操作。所幸的是，DrakX\n"</div><div class='ctx'> "所包含的向导能够显著简化这一过程。在继续这一步骤之前，请花点时间仔细阅读本节及以上的所有内容。\n"</div><div class='hunk'>@@ -159,13 +159,13 @@ msgstr ""</div><div class='ctx'> " * \"%s\"。如果在您的硬盘上安装了 Microsoft Windows，而该操作系统占用了所有的空间，您就需要为 GNU/Linux\n"</div><div class='ctx'> "创建剩余空间。要完成这一操作，您可以删除您的 Microsoft Windows 分区和数据(参看``删除整个磁盘''方案)，或者更改\n"</div><div class='ctx'> "Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢失，但您必须事先对 Windows\n"</div><div class='del'>-"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计算机上使用 Mandrakelinux 和 Microsoft\n"</div><div class='add'>+"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计算机上使用 Mandrivalinux 和 Microsoft\n"</div><div class='ctx'> "Windows，则推荐使用此选项。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   注意，在执行这一过程之后，您原有的 Microsoft Windows 分区将会比先前小一些。而您在 Microsoft Windows\n"</div><div class='ctx'> "下可用来存储数据或安装新软件的剩余空间也会变少。\n"</div><div class='ctx'> "\n"</div><div class='del'>-" * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区，并将其替换为全新的 Mandrakelinux\n"</div><div class='add'>+" * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区，并将其替换为全新的 Mandrivalinux\n"</div><div class='ctx'> "系统，请选择此选项。请额外小心，因为在您确认之后，此操作无法撤销。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! 如果您选择了此选项，您硬盘上的全部数据都将被删除。 !!\n"</div><div class='hunk'>@@ -282,7 +282,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you don't know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -291,7 +291,7 @@ msgstr ""</div><div class='ctx'> "在这里，DrakX 将允许您选择计算机要使用的安全级别。说的直白一点，如果计算机将包含关键数据，或者将直接暴露于 Internet\n"</div><div class='ctx'> "之下，则应该设置较高的安全级别。较高的安全级别通常以损失易用性作为代价。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"如果您不知道要选择什么，请保持默认选项。您可以稍后从 Mandrakelinux Control Center的一部分 draksec\n"</div><div class='add'>+"如果您不知道要选择什么，请保持默认选项。您可以稍后从 Mandrivalinux Control Center的一部分 draksec\n"</div><div class='ctx'> "来更改安全级别。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "请在\"%s\"域中填入要负责安全的人的电子邮件地址。安全信息将被发送到该地址。"</div><div class='hunk'>@@ -303,7 +303,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -312,26 +312,26 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data won't be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "仅当在您的计算机上发现了已有的 GNU/Linux 分区，才会激活这一步骤。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"DrakX 现在需要知道您是想要执行全新安装，还是升级已有的 Mandrakelinux 系统：\n"</div><div class='add'>+"DrakX 现在需要知道您是想要执行全新安装，还是升级已有的 Mandrivalinux 系统：\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " *\n"</div><div class='ctx'> "\"%s\"：总体来说，这将完全销毁旧系统。但是，根据您选择的分区方案，您可以让现有的数据(比如\"主\"目录)免于覆盖。如果您想要更改硬盘的分区方案，或者更该文件系统，您就应该使用此选项。\n"</div><div class='ctx'> "\n"</div><div class='del'>-" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrakelinux\n"</div><div class='add'>+" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrivalinux\n"</div><div class='ctx'> "系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可用，与标准安装类似。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrakelinux 系统上工作正常。不推荐在先于 \"8.1\" 版本的\n"</div><div class='del'>-"Mandrakelinux 系统上执行升级。"</div><div class='add'>+"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrivalinux 系统上工作正常。不推荐在先于 \"8.1\" 版本的\n"</div><div class='add'>+"Mandrivalinux 系统上执行升级。"</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml</div><div class='hunk'>@@ -379,7 +379,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -396,7 +396,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -428,7 +428,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\"：默认情况下，DrakX 会将您的图形界面配置为 \"800x600\" 或 \"1024x768\"\n"</div><div class='ctx'> "分辨率。如果这不适合您的话，请单击\"%s\"重新配置您的图形界面。\n"</div><div class='ctx'> "\n"</div><div class='del'>-" * \"%s\"：如果您想要配置您的 Internet 或局域网访问，现在就可以进行。请参考印刷文档或在安装完成后使用 Mandrakelinux\n"</div><div class='add'>+" * \"%s\"：如果您想要配置您的 Internet 或局域网访问，现在就可以进行。请参考印刷文档或在安装完成后使用 Mandrivalinux\n"</div><div class='ctx'> "Control Center来获得完整的在线帮助。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\"：如果您所安装的计算机位于代理服务器之后，这里将允许您配置 HTTP 和 FTP 代理服务器地址。\n"</div><div class='hunk'>@@ -438,7 +438,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\"：如果您计划将您的计算机连接到\n"</div><div class='ctx'> "Internet，那么保护您的计算机免于攻击的有效方法就是设置防火墙。请参考``初学者指南''中的相应章节，以获得关于防火墙设置的细节。\n"</div><div class='ctx'> "\n"</div><div class='del'>-" * \"%s\"：如果您想要更改您的引导程序配置，请单击此按钮。这仅适用于高级用户。请参考印刷文档或 Mandrakelinux Control\n"</div><div class='add'>+" * \"%s\"：如果您想要更改您的引导程序配置，请单击此按钮。这仅适用于高级用户。请参考印刷文档或 Mandrivalinux Control\n"</div><div class='ctx'> "Center中关于引导程序配置的帮助。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\"：在此您可以精确调整要在您的计算机上运行哪些服务。如果您要将此计算机用作服务器，那么应该复查这一设置。"</div><div class='hunk'>@@ -455,7 +455,7 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -467,7 +467,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"在您安装 Mandrakelinux\n"</div><div class='add'>+"在您安装 Mandrivalinux\n"</div><div class='ctx'> "的这个时候，很可能有些软件包在发行之后已经更新。有些故障已经被修正，有些安全问题已经被解决。为了让您能够享用这些更新，您现在可以从 Internet\n"</div><div class='ctx'> "上下载它们。如果您的 Internet 连接已经可以使用，请选择\"%s\"。如果您愿意以后再升级，请选择\"%s\"。\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -531,7 +531,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -585,7 +585,7 @@ msgid ""</div><div class='ctx'> "want to check \"%s\" if your machine is to act as a server, or if you were\n"</div><div class='ctx'> "not successful in getting the display configured."</div><div class='ctx'> msgstr ""</div><div class='del'>-"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrakelinux\n"</div><div class='add'>+"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrivalinux\n"</div><div class='ctx'> "附带的所有图形环境(KDE、GNOME、AfterStep、WindowMaker 等)都依赖于该系统。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "您将会看到不同的参数列表，以便进行图形显示选项的更改来达到最佳状态。其中包括：\n"</div><div class='hunk'>@@ -629,7 +629,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"</div><div class='hunk'>@@ -650,10 +650,10 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you don't like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='del'>-"现在，应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择，但 Mandrakelinux\n"</div><div class='add'>+"现在，应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择，但 Mandrivalinux\n"</div><div class='ctx'> "提供了两种。每种打印系统都能够在不同的配置中大展身手。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" --\n"</div><div class='hunk'>@@ -666,7 +666,7 @@ msgstr ""</div><div class='ctx'> "\"pdq\" 一样简单。如果您想模拟一台 \"lpd\" 服务器，不要忘了打开 \"cups-lpd \" 守护程序。\"%s\"\n"</div><div class='ctx'> "还包括一个图形界面，可用来打印或选择打印机选项，以及管理打印机。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"如果您现在进行了选择，但稍后又发现您并不喜欢所选择的打印系统，可以轻松修改。只需从 Mandrakelinux Control Center中选择\n"</div><div class='add'>+"如果您现在进行了选择，但稍后又发现您并不喜欢所选择的打印系统，可以轻松修改。只需从 Mandrivalinux Control Center中选择\n"</div><div class='ctx'> "PrinterDrake，然后单击\"%s\"按钮。"</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -692,11 +692,11 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"在继续之前，您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrakelinux\n"</div><div class='add'>+"在继续之前，您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrivalinux\n"</div><div class='ctx'> "发行版。如果您同意其中的全部条款，请选中\"%s\"框。如果不同意，单击\"%s\"按钮将重新启动您的计算机。"</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -745,11 +745,11 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -800,10 +800,10 @@ msgid ""</div><div class='ctx'> "command-line interface. The total size of this installation is about 65\n"</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='del'>-"现在该指定要在您的系统中安装哪些程序了。Mandrakelinux\n"</div><div class='add'>+"现在该指定要在您的系统中安装哪些程序了。Mandrivalinux\n"</div><div class='ctx'> "为您准备了数千个软件包。而为了使管理软件包更加容易，软件包已经按相似程度分成了多个组。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "按四个类别对软件包进行了分类。您可以从不同的类别混合选择应用程序。也就是说，``工作站''中也可以选择安装``服务器''分类中的应用程序。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\"：如果您计划将您的计算机用作工作站，请选择工作站分类中的一个或多个组。\n"</div><div class='hunk'>@@ -835,13 +835,13 @@ msgstr ""</div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM，DrakX 将弹出当前\n"</div><div class='add'>+"Mandrivalinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM，DrakX 将弹出当前\n"</div><div class='ctx'> "CD，并要求您插入所需的正确 CD。如果您手中没有所请求的 CD，只需单击\"%s\"，就不会安装相应的软件包了。"</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -1009,7 +1009,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -1024,7 +1024,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "如果您准备好格式化分区了，请单击\"%s\"。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"如果您想要选择其它分区用于安装 Mandrakelinux 操作系统，请单击\"%s\"。\n"</div><div class='add'>+"如果您想要选择其它分区用于安装 Mandrivalinux 操作系统，请单击\"%s\"。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "如果您想要选择要检测磁盘上的坏块，请单击单击\"%s\"。"</div><div class='ctx'> </div><div class='hunk'>@@ -1042,10 +1042,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you don't know what a particular service is supposed to do or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='ctx'> "the listed services and they will be started automatically at boot time. !!\n"</div><div class='hunk'>@@ -1069,8 +1069,8 @@ msgstr ""</div><div class='ctx'> "只要您在左侧的树中选择了软件包，右侧就会出现该软件包用途的描述。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "!!\n"</div><div class='del'>-"如果选择了服务器软件包，不管是您特意选中的，还是因为该软件包是某组的成员，您都需要确认是否真的想要安装这些服务器。默认情况下，Mandrakelinux\n"</div><div class='del'>-"会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的，但完全有可能在此版本 Mandrakelinux\n"</div><div class='add'>+"如果选择了服务器软件包，不管是您特意选中的，还是因为该软件包是某组的成员，您都需要确认是否真的想要安装这些服务器。默认情况下，Mandrivalinux\n"</div><div class='add'>+"会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的，但完全有可能在此版本 Mandrivalinux\n"</div><div class='ctx'> "完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途，或者不知道为什么要安装这些服务，请单击\"%s\"。单击\"%s\"将安装列出的服务，并且启动时这些服务会被自动启动。\n"</div><div class='ctx'> "!!\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1201,7 +1201,7 @@ msgstr ""</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -1271,7 +1271,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"在这一步中，您需要选择要使用哪个或哪些分区来安装您的 Mandrakelinux 系统。如果已经定义了分区，不管是先前安装的 GNU/Linux\n"</div><div class='add'>+"在这一步中，您需要选择要使用哪个或哪些分区来安装您的 Mandrivalinux 系统。如果已经定义了分区，不管是先前安装的 GNU/Linux\n"</div><div class='ctx'> "还是由其它分区工具划分的，您都可以使用已有的分区。否则，必须对硬盘分区进行定义。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "要创建分区，您必须先选择硬盘。您可以单击``hda'' 选择第一个 IDE 硬盘进行分区，``hdb'' 选择第二个 IDE 硬盘，``sda''\n"</div><div class='head'>diff --git a/perl-install/share/po/hi.po b/perl-install/share/po/hi.po<br/>index a0f1f2a68..184c4bf68 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/hi.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/hi.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/hi.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/hi.po</a></div><div class='hunk'>@@ -61,7 +61,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "लगता है कि यूएसबी कुँजी को लेखन अभिरक्षित किया हुआ है, परन्तु हम \n"</div><div class='ctx'> "अभी इसे सावधानी-पूर्वक हटा नहीं सकते है।\n"</div><div class='hunk'>@@ -86,7 +86,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "आपकी यूएसबी कुँजी में कोई वैध विण्डो (फ़ैट) के विभाजन नहीं हैं।\n"</div><div class='hunk'>@@ -104,7 +104,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -112,7 +112,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "आपके कम्प्यूटर पर हम कोई यूएसबी कुँजी को नहीं खोज पायें ।\n"</div><div class='hunk'>@@ -250,7 +250,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1295,7 +1295,7 @@ msgstr "मैनुअल पसन्द"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3705,7 +3705,7 @@ msgstr "रेडियो समर्थन सक्रिय"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3896,7 +3896,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3910,11 +3910,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4069,10 +4069,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4262,7 +4262,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4436,12 +4436,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4468,7 +4468,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4477,7 +4477,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4606,7 +4606,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4624,7 +4624,7 @@ msgstr "पिछला"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4653,7 +4653,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4669,7 +4669,7 @@ msgstr "सुरक्षा प्रबंधक"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4755,7 +4755,7 @@ msgstr "सामान्य/विशेषज्ञ विधा के म�</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4833,7 +4833,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4842,13 +4842,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4889,7 +4889,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5064,7 +5064,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5085,7 +5085,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5191,7 +5191,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5208,7 +5208,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5270,7 +5270,7 @@ msgstr "सेवायें"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "उस हार्ड ड्राइव का चयन करें जिसे आप अपने नवीन मैनड्रैक लिनक्स विभाजन के संसाधन के लिए \n"</div><div class='hunk'>@@ -5625,7 +5625,7 @@ msgstr "विण्डो विभाजन के आकार की गण�</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "आपका विण्डो विभाजन अति खंडित है । कृपया अपने कम्प्यूटर को विण्डो के अन्तर्गत पुनः आरम्भ "</div><div class='hunk'>@@ -5743,19 +5743,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5777,7 +5777,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5785,14 +5785,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5802,7 +5802,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5822,10 +5822,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5836,11 +5836,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5856,7 +5856,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "भूमिका\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5866,14 +5866,14 @@ msgstr ""</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "१. अधिकार-पत्र करारनामा\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5895,7 +5895,7 @@ msgstr ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5903,14 +5903,14 @@ msgstr ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5920,7 +5920,7 @@ msgstr ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5940,10 +5940,10 @@ msgstr ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5954,11 +5954,11 @@ msgstr ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "५. लागू होने वाले कानून \n"</div><div class='hunk'>@@ -5974,7 +5974,7 @@ msgstr ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6036,7 +6036,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6044,7 +6044,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "बधाई हो, संसाधन सम्पूर्ण हुआ ।\n"</div><div class='ctx'> "बूट माध्यम को हटायें और पुनः आरम्भ करने के लिए रीटर्न (return) कुँजी को दबायें ।\n"</div><div class='hunk'>@@ -6093,7 +6093,7 @@ msgstr "`%s' चरण में प्रवेश \n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -6631,7 +6631,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "उपलब्ध मिररों की सूची को प्राप्त करने के लिए मैनड्रैक लिनक्स वेब-स्थल से सम्पर्क किया जा रहा "</div><div class='ctx'> "है..."</div><div class='hunk'>@@ -6853,7 +6853,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr "मैनड्रैक लिनक्स संसाधन %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -9440,7 +9440,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13446,7 +13446,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15222,18 +15222,18 @@ msgstr "रूको"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "मैनड्रैकलिनक्स में स्वागत !"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15242,7 +15242,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15259,9 +15259,9 @@ msgstr "मुक्त स्रोत जगत में स्वागत !</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "आपका नवीन मैनड्रैक लिनक्स संचालन-तंत्र और इसके अनेकों कार्यक्रम,मैनड्रैकसॉफ़्ट विकासकर्ताओं व "</div><div class='hunk'>@@ -15286,7 +15286,7 @@ msgstr "&lt;b&gt;सूचना&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15312,10 +15312,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15334,8 +15334,8 @@ msgstr "यह मैनड्रैक लिनक्स का &lt;b&gt;डॉउ�</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15362,7 +15362,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15372,7 +15372,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15394,13 +15394,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15412,7 +15412,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15426,19 +15426,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;मैनड्रैकस्टोर&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr "मैनड्रैक अपडेटो का एपलेट"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -15459,61 +15459,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15551,7 +15551,7 @@ msgstr "&lt;b&gt;अपने ग्राफ़िक्ल डेस्कटाप व</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15572,7 +15572,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15689,7 +15689,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15924,14 +15924,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;मैनड्रैक नियंत्रण केन्द्र&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15953,9 +15953,9 @@ msgstr "&lt;b&gt;केडीई पसन्द&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15967,7 +15967,7 @@ msgstr "&lt;b&gt;मैनड्रैकस्टोर&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15990,20 +15990,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;मैनड्रैकक्लब&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16022,33 +16022,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;मैनड्रैकऑनलाइन&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16071,32 +16071,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;मैनड्रैक-विशेषज्ञ&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16394,7 +16394,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "&lt;b&gt;मैनड्रैकस्टोर&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -16496,7 +16496,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16544,7 +16544,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -19146,12 +19146,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "मैनड्रैक दोष रिपोर्ट औज़ार"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "मैनड्रैक नियंत्रण केन्द्र"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -19172,7 +19172,7 @@ msgstr "हार्ड ड्रैक"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr "मैनड्रैक ऑनलाइन"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -19217,7 +19217,7 @@ msgstr "संरचना विज़ार्ड"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19642,7 +19642,7 @@ msgstr "बूट के समय आरम्भ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "इस इन्टरफ़ेस को अभी तक संरचित नहीं किया गया है ।\n"</div><div class='ctx'> "मैनड्रैक नियंत्रण केन्द्र से \"एक इन्टरफ़ेस को जोड़े\" सहायक को चलायें"</div><div class='hunk'>@@ -19651,7 +19651,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "इस इन्टरफ़ेस को अभी तक संरचित नहीं किया गया है ।\n"</div><div class='ctx'> "मैनड्रैक नियंत्रण केन्द्र से \"%s\" सहायक को चलायें"</div><div class='hunk'>@@ -19704,7 +19704,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -19997,7 +19997,7 @@ msgstr "इम्पोर्ट"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20492,7 +20492,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -20528,7 +20528,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "मैनड्रैक नियंत्रण केन्द्र"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -23700,7 +23700,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "मैनड्रैक टूल्स लॉग्स"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -24213,7 +24213,7 @@ msgstr "संबंध सम्पूर्ण ।"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "संबंधीकरण की प्रक्रिया असफ़ल हो गई ।\n"</div><div class='ctx'> "मैनड्रैक नियंत्रण केन्द्र में अपनी संरचना को सत्यापित करें ।"</div><div class='hunk'>@@ -25091,7 +25091,7 @@ msgstr "संसाधन असफ़ल"</div><div class='ctx'> #~ msgstr "आपने किसी फ़ॉन्ट का चयन नहीं किया है"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='ctx'> #~ msgstr "&lt;b&gt;मैनड्रैकस्टोर&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='hunk'>@@ -25221,7 +25221,7 @@ msgstr "संसाधन असफ़ल"</div><div class='ctx'> #~ msgstr "लेखन के लिए %s को खोलने में त्रुटि: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -25630,7 +25630,7 @@ msgstr "संसाधन असफ़ल"</div><div class='ctx'> #~ "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."</div><div class='ctx'> #~ msgstr "स्टार ऑफ़िस/ओपनऑफ़िस.ओआरजी/जीआईएमपी से \"%s\" प्रिंटर को हटाने में असफ़ल ।"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Congratulations for choosing Mandrakelinux!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Congratulations for choosing Mandrivalinux!&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;मैनड्रैक लिनक्स का चयन करने के लिए धन्यवाद!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -25652,31 +25652,31 @@ msgstr "संसाधन असफ़ल"</div><div class='ctx'> #~ msgid "Listen to music files and watch videos with &lt;b&gt;Totem&lt;/b&gt;."</div><div class='ctx'> #~ msgstr "&lt;b&gt;Totem&lt;/b&gt; के साथ संगीत संचिकाओ को सुनें और वीडियों के देखें।"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Become a &lt;b&gt;Mandrakeclub&lt;/b&gt; member!"</div><div class='add'>+#~ msgid "Become a &lt;b&gt;Mandriva Club&lt;/b&gt; member!"</div><div class='ctx'> #~ msgstr "&lt;b&gt;मैनड्रैकक्लब&lt;/b&gt; के एक सदस्य बनें !"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Full access to commercial applications"</div><div class='ctx'> #~ msgstr "\t* वाणिज्य कार्यक्रमों तक पूर्ण पहुँच"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Voting for software to put in Mandrakelinux"</div><div class='add'>+#~ msgid "\t* Voting for software to put in Mandrivalinux"</div><div class='ctx'> #~ msgstr "\t* मैनड्रैक लिनक्स में सॉफ़्टवेयर डालने के लिए मतदान"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "Do you require assistance?"</div><div class='ctx'> #~ msgstr "क्या आप को सहायता की आवश्यकता है?"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Become a Mandrakeclub member!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Become a Mandriva Club member!&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;मैनड्रैक क्लब के एक सदस्य बनें !&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Do you require assistance?&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;क्या आप को सहायता की आवश्यकता है?&lt;/b&gt;"</div><div class='ctx'> </div><div class='del'>-#~ msgid "This is the Mandrakelinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='add'>+#~ msgid "This is the Mandrivalinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='ctx'> #~ msgstr "यह मैनड्रैक लिनक्स का &lt;b&gt;डॉउनलोड संस्मरण&lt;/b&gt; है ।"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux distribution and its many applications are the "</div><div class='del'>-#~ "result of collaborative efforts between Mandrakesoft developers and "</div><div class='del'>-#~ "Mandrakelinux contributors throughout the world."</div><div class='add'>+#~ "Your new Mandrivalinux distribution and its many applications are the "</div><div class='add'>+#~ "result of collaborative efforts between Mandriva developers and "</div><div class='add'>+#~ "Mandrivalinux contributors throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "आपका नवीन मैनड्रैक लिनक्स संचालन-तंत्र और इसके अनेकों कार्यक्रम,मैनड्रैकसॉफ़्ट विकासकर्ताओं "</div><div class='ctx'> #~ "व विश्वव्यापी मैनड्रैक लिनक्स योगदानकर्ताओं केमध्य किये हुए मिले-जुले प्रयासों का मिला-जुला "</div><div class='hunk'>@@ -25732,7 +25732,7 @@ msgstr "संसाधन असफ़ल"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Before continuing, you should carefully read the terms of the license. "</div><div class='ctx'> #~ "It\n"</div><div class='del'>-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "</div><div class='add'>+#~ "covers the entire Mandrivalinux distribution. If you do agree with all "</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"</div><div class='ctx'> #~ "will reboot your computer."</div><div class='hunk'>@@ -25851,7 +25851,7 @@ msgstr "संसाधन असफ़ल"</div><div class='ctx'> #~ "यदि आप इस सुविधा के इच्छुक नहीं है, तो \"%s\" बॉक्स को अचिह्नन्ति करें।"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+#~ "The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> #~ "selected package is located on another CD-ROM, DrakX will eject the "</div><div class='ctx'> #~ "current\n"</div><div class='ctx'> #~ "CD and ask you to insert the correct CD as required."</div><div class='hunk'>@@ -25862,14 +25862,14 @@ msgstr "संसाधन असफ़ल"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "It is now time to specify which programs you wish to install on your\n"</div><div class='del'>-#~ "system. There are thousands of packages available for Mandrakelinux, and\n"</div><div class='add'>+#~ "system. There are thousands of packages available for Mandrivalinux, and\n"</div><div class='ctx'> #~ "to make it simpler to manage the packages have been placed into groups "</div><div class='ctx'> #~ "of\n"</div><div class='ctx'> #~ "similar applications.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Packages are sorted into groups corresponding to a particular use of "</div><div class='ctx'> #~ "your\n"</div><div class='del'>-#~ "machine. Mandrakelinux sorts packages groups in four categories. You can\n"</div><div class='add'>+#~ "machine. Mandrivalinux sorts packages groups in four categories. You can\n"</div><div class='ctx'> #~ "mix and match applications from the various categories, so a\n"</div><div class='ctx'> #~ "``Workstation'' installation can still have applications from the\n"</div><div class='ctx'> #~ "``Development'' category installed.\n"</div><div class='hunk'>@@ -25988,11 +25988,11 @@ msgstr "संसाधन असफ़ल"</div><div class='ctx'> #~ "chose the individual package or because it was part of a group of "</div><div class='ctx'> #~ "packages,\n"</div><div class='ctx'> #~ "you will be asked to confirm that you really want those servers to be\n"</div><div class='del'>-#~ "installed. By default Mandrakelinux will automatically start any "</div><div class='add'>+#~ "installed. By default Mandrivalinux will automatically start any "</div><div class='ctx'> #~ "installed\n"</div><div class='ctx'> #~ "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> #~ "the time the distribution was shipped, it is entirely possible that that\n"</div><div class='del'>-#~ "security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+#~ "security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> #~ "finalized. If you do not know what a particular service is supposed to "</div><div class='ctx'> #~ "do\n"</div><div class='ctx'> #~ "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"</div><div class='hunk'>@@ -26061,7 +26061,7 @@ msgstr "संसाधन असफ़ल"</div><div class='ctx'> #~ "You will now set up your Internet/network connection. If you wish to\n"</div><div class='ctx'> #~ "connect your computer to the Internet or to a local network, click \"%s"</div><div class='ctx'> #~ "\".\n"</div><div class='del'>-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"</div><div class='add'>+#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"</div><div class='ctx'> #~ "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"</div><div class='ctx'> #~ "configure the network, or to do it later, in which case clicking the \"%s"</div><div class='ctx'> #~ "\"\n"</div><div class='hunk'>@@ -26082,7 +26082,7 @@ msgstr "संसाधन असफ़ल"</div><div class='ctx'> #~ "modems\n"</div><div class='ctx'> #~ "that require additional software to work compared to Normal modems. Some "</div><div class='ctx'> #~ "of\n"</div><div class='del'>-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"</div><div class='add'>+#~ "those modems actually work under Mandrivalinux, some others do not. You\n"</div><div class='ctx'> #~ "can consult the list of supported modems at LinModems.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You can consult the ``Starter Guide'' chapter about Internet connections\n"</div><div class='hunk'>@@ -26238,7 +26238,7 @@ msgstr "संसाधन असफ़ल"</div><div class='ctx'> #~ "X (for X Window System) is the heart of the GNU/Linux graphical "</div><div class='ctx'> #~ "interface\n"</div><div class='ctx'> #~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-#~ "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You will be presented with a list of different parameters to change to "</div><div class='ctx'> #~ "get\n"</div><div class='hunk'>@@ -26555,7 +26555,7 @@ msgstr "संसाधन असफ़ल"</div><div class='ctx'> #~ "  --report          - कार्यक्रम को मैनड्रैक औजारों में से एक होना चाहिए \n"</div><div class='ctx'> #~ "  --incident        - कार्यक्रम को मैनड्रैक औजारों में से एक होना चाहिए"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='ctx'> #~ msgstr "मैनड्रैक ऑनलाइन"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='head'>diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po<br/>index aa0fa7a2c..3b034b251 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/hr.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/hr.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/hr.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/hr.po</a></div><div class='hunk'>@@ -68,7 +68,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "UsB zapis ima uključenu zaštitu za pisanje, ali sad se nemože sigurno\n"</div><div class='ctx'> "odstraniti.\n"</div><div class='hunk'>@@ -94,7 +94,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +102,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -110,7 +110,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +236,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -252,7 +252,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Mogući uzrok su uništene sistemske konfiguracijske datoteke\n"</div><div class='ctx'> "na USB ključu, u ovom slučaju će problem riješiti njihovo uklanjanje\n"</div><div class='del'>-"i ponovno pokretanje Mandrake Move. Da biste to učinili, kliknite\n"</div><div class='add'>+"i ponovno pokretanje Mandriva Move. Da biste to učinili, kliknite\n"</div><div class='ctx'> "na odgovarajući gumb.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1275,7 +1275,7 @@ msgstr "Myanmar"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "Možete izabrati druge jezike koji će biti dostupni nakon instalacije"</div><div class='hunk'>@@ -3604,12 +3604,12 @@ msgstr "omogući podršku za radio"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Prije nastavka trebate pažljivo pročitati stavke licence. Ona\n"</div><div class='del'>-"pokriva cijelu Mandrakelinux distribuciju, i ako se ne slažete u svim\n"</div><div class='add'>+"pokriva cijelu Mandrivalinux distribuciju, i ako se ne slažete u svim\n"</div><div class='ctx'> "stavkama sadržanih u njoj, kliknite na \"Odbij\" gumb koji će automatski\n"</div><div class='ctx'> "završiti instalaciju. Za nastavak instalacije, kliknite na\n"</div><div class='ctx'> "\"Prihvati\" gumb."</div><div class='hunk'>@@ -3791,13 +3791,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux instalacija je proširena na nekoliko CDROMova. DrakX\n"</div><div class='add'>+"Mandrivalinux instalacija je proširena na nekoliko CDROMova. DrakX\n"</div><div class='ctx'> "zna ukoliko se odabrani paket nalazi na drugom CDROMu i izbaciti će\n"</div><div class='ctx'> "trenutni CD i pitati vas da ubacite drugi koji je potreban."</div><div class='ctx'> </div><div class='hunk'>@@ -3805,11 +3805,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3977,10 +3977,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4020,13 +4020,13 @@ msgstr ""</div><div class='ctx'> "grupi,\n"</div><div class='ctx'> "bit ćete upitani da potvrdite da li želite stvarno instalirati te "</div><div class='ctx'> "poslužitelje.\n"</div><div class='del'>-"Kod Mandrakelinuxa, svi instalirani poslužitelji se pokreću prilikom "</div><div class='add'>+"Kod Mandrivalinuxa, svi instalirani poslužitelji se pokreću prilikom "</div><div class='ctx'> "podizanja\n"</div><div class='ctx'> "sustava. Čak iako su sigurni, bez poznatih problema u vrijeme izlaska "</div><div class='ctx'> "distribucije,\n"</div><div class='ctx'> "može se dogoditi da se otkriju sigurnosne rupe nakon zgotovljenja ove "</div><div class='ctx'> "inačice\n"</div><div class='del'>-"Mandrakelinuxa. Ako ne znate što bi pojedini servis trebao raditi ili "</div><div class='add'>+"Mandrivalinuxa. Ako ne znate što bi pojedini servis trebao raditi ili "</div><div class='ctx'> "zašto \n"</div><div class='ctx'> "se instalira, pritisnite \"Ne\". Pritiskanjem na \"Da\"instalirat će se "</div><div class='ctx'> "navedeni\n"</div><div class='hunk'>@@ -4178,7 +4178,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4283,12 +4283,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4315,7 +4315,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4324,7 +4324,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4345,12 +4345,12 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "U ovom trenutku, trebate izabrati gdje ćete instalirati vaš\n"</div><div class='del'>-"Mandrakelinux operativni sustav na vašem tvrdom disku. Ukoliko je prazan "</div><div class='add'>+"Mandrivalinux operativni sustav na vašem tvrdom disku. Ukoliko je prazan "</div><div class='ctx'> "ili \n"</div><div class='ctx'> "ako postojeći operativni sustav koristi čitav prostor na disku, trebate ga\n"</div><div class='ctx'> "particionirati. Jednostavno, particioniranje hard diska sastoji se od\n"</div><div class='ctx'> "logičkog dijeljenja kako bi napravili prostor za instalaciju vašeg novog\n"</div><div class='del'>-"Mandrakelinux sustava.\n"</div><div class='add'>+"Mandrivalinux sustava.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Zato što su posljedice procesa particioniranja obično nepovratne,\n"</div><div class='ctx'> "particioniranje može biti strašno i stresno ukoliko ste korisnik bez "</div><div class='hunk'>@@ -4359,7 +4359,7 @@ msgstr ""</div><div class='ctx'> "upute i uzmite vremena koliko vam je potrebno.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ako ste pokrenuli instalaciju u modu za stručnjake, ući ćete u DiskDrake,\n"</div><div class='del'>-"Mandrakelinuxov alat za particioniranje, s kojim možete fino podešavati\n"</div><div class='add'>+"Mandrivalinuxov alat za particioniranje, s kojim možete fino podešavati\n"</div><div class='ctx'> "particije. Pogledajte DiskDrake odjeljak u ``User Guide''.\n"</div><div class='ctx'> "Iz sučelja instalacije možete koristiti čarobnjake koji su ovdje opisani\n"</div><div class='ctx'> "pritiskom na \"Čarobnjak\" dugme.\n"</div><div class='hunk'>@@ -4382,7 +4382,7 @@ msgstr ""</div><div class='ctx'> " * \"Obriši cijeli disk\": ukoliko želite obrisati sve podatke i sve "</div><div class='ctx'> "particije\n"</div><div class='ctx'> "koje postoje na vašem hard disku i zamjeniti ih sa\n"</div><div class='del'>-"vašim novim Mandrakelinux sustavom, možete izabrati ovu opciju. Budite\n"</div><div class='add'>+"vašim novim Mandrivalinux sustavom, možete izabrati ovu opciju. Budite\n"</div><div class='ctx'> "pažljivi sa ovim rješenjem, nećete moći\n"</div><div class='ctx'> "povratiti vaš izbor nakon potvrde.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4397,7 +4397,7 @@ msgstr ""</div><div class='ctx'> "Microsoft Windows particije. Mijenjanje veličine može se obaviti bez\n"</div><div class='ctx'> "gubitka bilo kakvih podataka, ako prethodno defragmentirate Windows "</div><div class='ctx'> "particiju.\n"</div><div class='del'>-"Ovo rješenje je preporučeno ukoliko želite koristiti zajedno Mandrakelinux\n"</div><div class='add'>+"Ovo rješenje je preporučeno ukoliko želite koristiti zajedno Mandrivalinux\n"</div><div class='ctx'> "i Microsoft Windows-e na istom računalu.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "  Prije izabiranja ovog rješenja, molimo shvatite da će veličina vaše "</div><div class='hunk'>@@ -4562,7 +4562,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4588,7 +4588,7 @@ msgstr ""</div><div class='ctx'> "Pritisnite na \"U redu\" kada ste spremni za formatiranje particije.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Pritisnite na \"Odustani\" kada želite izabrati druge particije za\n"</div><div class='del'>-"instalaciju vašeg novog Mandrakelinux operativnog sustava.\n"</div><div class='add'>+"instalaciju vašeg novog Mandrivalinux operativnog sustava.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Pritisnite na \"Napredno\" ako želite izabrati particije koje će biti\n"</div><div class='ctx'> "provjeravane radi loših blokova (bad blocks)."</div><div class='hunk'>@@ -4605,7 +4605,7 @@ msgstr "Prethodni"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4617,7 +4617,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Dok instalirate Mandrakelinux, moguće je da su neki paketi već nadograđeni\n"</div><div class='add'>+"Dok instalirate Mandrivalinux, moguće je da su neki paketi već nadograđeni\n"</div><div class='ctx'> "od prvotne inačice. Neki bugovi su možda uklonjeni, i sigurnost poboljšana.\n"</div><div class='ctx'> "Da bi iskoristili prednosti tih nadogradnji, predloženo vam je da ih\n"</div><div class='ctx'> "skinete s Interneta. Izaberite \"Da\" ako ste povezani s Internetom, ili \"Ne"</div><div class='hunk'>@@ -4646,7 +4646,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4672,7 +4672,7 @@ msgstr "Udaljeno administriranje"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4744,7 +4744,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "U ovoj točki instalacije, trebate izabrati koje partiticije ćete koristiti "</div><div class='ctx'> "za\n"</div><div class='del'>-"instalaciju vašeg novog Mandrakelinux sustava. Ukoliko su\n"</div><div class='add'>+"instalaciju vašeg novog Mandrivalinux sustava. Ukoliko su\n"</div><div class='ctx'> "particije već definirane (iz prethodne instalacije GNU/Linux-a ili iz\n"</div><div class='ctx'> "drugih particijskih alata), možete koristiti postojeće particije. Inače,\n"</div><div class='ctx'> "moraju biti definirane.\n"</div><div class='hunk'>@@ -4826,7 +4826,7 @@ msgstr "Prebaci u normalni mod"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4857,7 +4857,7 @@ msgstr ""</div><div class='ctx'> "Više od jedne Microsoft Windows particije su pronađene\n"</div><div class='ctx'> "na vašem hard disku. Molimo izaberite jednu kojoj želite promjeniti "</div><div class='ctx'> "veličinu\n"</div><div class='del'>-"kako bi instalirali vaš novi Mandrakelinux operativni sustav.\n"</div><div class='add'>+"kako bi instalirali vaš novi Mandrivalinux operativni sustav.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Svaka je particija popisana kako slijedi; \"Linux ime\", \"Windows ime\"\n"</div><div class='ctx'> "\"Kapacitet\".\n"</div><div class='hunk'>@@ -4902,7 +4902,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4911,13 +4911,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4968,7 +4968,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5202,7 +5202,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5223,12 +5223,12 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ovdje biramo sustav za ispis za vaše računalo. Drugi OSovi možda nude "</div><div class='ctx'> "jedan,\n"</div><div class='del'>-"ali Mandrakelinux nudi tri.\n"</div><div class='add'>+"ali Mandrivalinux nudi tri.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"pdq\", što znači ``print, do not queue'' (ispiši, bez stavljanja u "</div><div class='ctx'> "red), je\n"</div><div class='hunk'>@@ -5385,7 +5385,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5402,7 +5402,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5464,11 +5464,11 @@ msgstr "Servisi"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Izaberite hard disk kojeg želite obrisati kako bi instalirali vašu\n"</div><div class='del'>-"novu Mandrakelinux particiju. Budite pažljivi, svi postojeći podaci\n"</div><div class='add'>+"novu Mandrivalinux particiju. Budite pažljivi, svi postojeći podaci\n"</div><div class='ctx'> "biti će izgubljen i neće se moći povratiti!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -5815,7 +5815,7 @@ msgstr "Iskoristi slobodan prostor na Windows particiji"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vaša Windows particija je prefragmentirana, molim pokrenite ``defrag'' prvo."</div><div class='hunk'>@@ -5933,19 +5933,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5967,7 +5967,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5975,14 +5975,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5992,7 +5992,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6012,10 +6012,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6026,11 +6026,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6046,7 +6046,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Uvod\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6056,14 +6056,14 @@ msgstr ""</div><div class='ctx'> "Produkti  uključuju, ali nisu \n"</div><div class='ctx'> "ograničeni na, skup programa, metoda, zakona i dokumentacija vezanih uz "</div><div class='ctx'> "operativni\n"</div><div class='del'>-"sustav i različite komponente Mandrakelinux distribucije.\n"</div><div class='add'>+"sustav i različite komponente Mandrivalinux distribucije.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Licencni Dogovor\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Molimo pažljivo pročitajte ovaj dokument. Ovaj dokument je licenci dogovor "</div><div class='ctx'> "između vas i \n"</div><div class='del'>-"Mandrakesoft S.A. koji se primjenjuje na Software-ske produkte.\n"</div><div class='add'>+"Mandriva S.A. koji se primjenjuje na Software-ske produkte.\n"</div><div class='ctx'> "Instaliranjem, dupliciranjem ili korištenjem Software-skih Produkata u bilo "</div><div class='ctx'> "kojem obliku,eksplicitno \n"</div><div class='ctx'> "prihvaćate i potpuno se slažete da ćete prihvatiti stavke i uvjete ove "</div><div class='hunk'>@@ -6084,7 +6084,7 @@ msgstr ""</div><div class='ctx'> "Software-ski Produkt i pripadajuća dokumentacija je pružena \"kako je\", bez "</div><div class='ctx'> "jamstva, do \n"</div><div class='ctx'> "mjere dozvoljene zakonom.\n"</div><div class='del'>-"Mandrakesoft S.A. neće, u bilo kojim slučajevima i do te mjere dozvoljene "</div><div class='add'>+"Mandriva S.A. neće, u bilo kojim slučajevima i do te mjere dozvoljene "</div><div class='ctx'> "zakonom, biti odgovaran za bilo kakvu specijalnu,\n"</div><div class='ctx'> "nesretnu, direktnu ili indirektnu štetu bilo kakvu (uključujući granice "</div><div class='ctx'> "štete od gubitka\n"</div><div class='hunk'>@@ -6092,13 +6092,13 @@ msgstr ""</div><div class='ctx'> "posljedica sudskih \n"</div><div class='ctx'> "presuda, ili bilo kakvih drugih posljedica gubitka) što je posljedica "</div><div class='ctx'> "korištenja ili nemogućnosti korištenja Software-skog \n"</div><div class='del'>-"Produkta, iako je Mandrakesoft S.A. bio upozoren od mogućnosti takve \n"</div><div class='add'>+"Produkta, iako je Mandriva S.A. bio upozoren od mogućnosti takve \n"</div><div class='ctx'> "štete.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "OGRANIČENA ODGOVORNOST POVEZANA SA POSJEDOVANJEM ILI KORIŠTENJEM ZABRANJENOG "</div><div class='ctx'> "SOFTWARE-A U NEKIM ZEMLJAMA\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Do granice dozvoljene zakonom, Mandrakesoft S.A. ili njegovi distributori "</div><div class='add'>+"Do granice dozvoljene zakonom, Mandriva S.A. ili njegovi distributori "</div><div class='ctx'> "neće, u bilo kakvim slučajevima, biti \n"</div><div class='ctx'> "odgovaran za bilo kakvu specijalnu, nesretnu, direktnu ili indirektnu štetu "</div><div class='ctx'> "bilo kako (uključujući \n"</div><div class='hunk'>@@ -6108,7 +6108,7 @@ msgstr ""</div><div class='ctx'> "posljedicagubitka) što je posljedica \n"</div><div class='ctx'> "posjedovanja ili korištenja software-skih komponenti ili kao posljedica "</div><div class='ctx'> "skidanja (download-a) software-skih komponenti \n"</div><div class='del'>-"sa jednog od Mandrakelinux site-ova koja su zabranjena ili ograničena u "</div><div class='add'>+"sa jednog od Mandrivalinux site-ova koja su zabranjena ili ograničena u "</div><div class='ctx'> "nekim zemljama po lokalnim zakonima.\n"</div><div class='ctx'> "Ova ograničena odgovornost se primjenjuje na, ali nije ograničena, jake "</div><div class='ctx'> "kriptografske komponente \n"</div><div class='hunk'>@@ -6127,10 +6127,10 @@ msgstr ""</div><div class='ctx'> "i uvjete licencnog dogovora svake komponente prije korištenja bilo koje "</div><div class='ctx'> "komponente. Bilo koje pitanje \n"</div><div class='ctx'> "o licenci komponente trebao bi biti adresiran autoru komponente a ne "</div><div class='del'>-"Mandrakesoft-u.\n"</div><div class='del'>-"Programe razvijeni od strane Mandrakesoft S.A. su pokriveni GPL licencom. "</div><div class='add'>+"Mandriva-u.\n"</div><div class='add'>+"Programe razvijeni od strane Mandriva S.A. su pokriveni GPL licencom. "</div><div class='ctx'> "Dokumentacija napisana \n"</div><div class='del'>-"od strane Mandrakesoft S.A. je pokrivena specifičnom licencom. Molimo "</div><div class='add'>+"od strane Mandriva S.A. je pokrivena specifičnom licencom. Molimo "</div><div class='ctx'> "pogledajte dokumentaciju za \n"</div><div class='ctx'> "više detalja.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6141,11 +6141,11 @@ msgstr ""</div><div class='ctx'> "autorima i \n"</div><div class='ctx'> "zaštićeni su intelektualnim vlasništvom i autorskim zakonima primjenjivim na "</div><div class='ctx'> "software-ske programe.\n"</div><div class='del'>-"Mandrakesoft S.A. zadržava svoje pravo za izmjenu ili prilagođavanje "</div><div class='add'>+"Mandriva S.A. zadržava svoje pravo za izmjenu ili prilagođavanje "</div><div class='ctx'> "Software-skog Produkta, kao cijelinu ili u\n"</div><div class='ctx'> "dijelovima, u svim slučajevima za sve namjene.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" i pripadajući logoi su zaštićeni prodajni "</div><div class='del'>-"znaci Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" i pripadajući logoi su zaštićeni prodajni "</div><div class='add'>+"znaci Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Državni zakoni \n"</div><div class='hunk'>@@ -6159,7 +6159,7 @@ msgstr ""</div><div class='ctx'> "Sve sporove oko stavaka licence će preferirano biti uređeno sudom. Kao "</div><div class='ctx'> "zadnji \n"</div><div class='ctx'> "izlaz, spor će biti predan odgovarajućem Sudu u Parizu - Francuska.\n"</div><div class='del'>-"Za bilo kakva pitanja o ovom dokumentu, molimo kontaktirajte Mandrakesoft S."</div><div class='add'>+"Za bilo kakva pitanja o ovom dokumentu, molimo kontaktirajte Mandriva S."</div><div class='ctx'> "A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -6245,7 +6245,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6253,7 +6253,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Čestitam, instalacija je kompletna.\n"</div><div class='ctx'> "Uklonite boot medij i pritisnite return za ponovno podizanje.\n"</div><div class='hunk'>@@ -6268,7 +6268,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informacije o konfiguriranju vašeg sustava je raspoloživo u poslije\n"</div><div class='del'>-"instalacijskom poglavlju od Official Mandrakelinux User's Guide."</div><div class='add'>+"instalacijskom poglavlju od Official Mandrivalinux User's Guide."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6303,12 +6303,12 @@ msgstr "Pokrećem korak `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vaš sustav je slab na resursima. Možete imati nekih problem prilikom\n"</div><div class='del'>-"instalacije Mandrakelinux-a. Ukoliko se to desi, možete probati tekstualnu\n"</div><div class='add'>+"instalacije Mandrivalinux-a. Ukoliko se to desi, možete probati tekstualnu\n"</div><div class='ctx'> "instalaciju. Za to, pritisnite `F1' kada podižete CDROM, i unesite `text'."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_gtk.pm:228 install_steps_interactive.pm:624</div><div class='hunk'>@@ -6842,9 +6842,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kontaktiram Mandrakelinux web site za dobivanje popisa raspoloživih mirrora"</div><div class='add'>+"Kontaktiram Mandrivalinux web site za dobivanje popisa raspoloživih mirrora"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7065,8 +7065,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux instalacija %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux instalacija %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9651,13 +9651,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "tinyfirewall podešavanje\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Ovo podešava osobni vatrozid za ovo Mandrakelinux računalo.\n"</div><div class='add'>+"Ovo podešava osobni vatrozid za ovo Mandrivalinux računalo.\n"</div><div class='ctx'> "Za snažno primjenjena vatrozidna rješenja, molimo pogledajte\n"</div><div class='ctx'> "specijaliziranu MandrakeSecurity Firewall distribuciju."</div><div class='ctx'> </div><div class='hunk'>@@ -13467,7 +13467,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15327,18 +15327,18 @@ msgstr "Zaustavi"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Što je Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Što je Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Dobro dosli u &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Dobro dosli u &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15347,7 +15347,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15364,9 +15364,9 @@ msgstr "Dobrodošli u Open Source svijet"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15386,7 +15386,7 @@ msgstr "&lt;b&gt;GPL licenca&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15412,10 +15412,10 @@ msgstr "&lt;b&gt;Pridružite se zajednici&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15434,8 +15434,8 @@ msgstr "&lt;B&gt;Download inačica&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15462,7 +15462,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15472,7 +15472,7 @@ msgstr "&lt;b&gt;Discovery, vaš prvi Linux dekstop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15491,13 +15491,13 @@ msgstr "&lt;b&gt;PowerPack, vrhunski Linux desktop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15509,7 +15509,7 @@ msgstr "&lt;b&gt;PowerPack+, Linux rješenje za desktope i poslužitelje&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15523,19 +15523,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -15556,61 +15556,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft proizvod (Nomad proizvodi)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva proizvod (Nomad proizvodi)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft proizvodi (Profesionalna rješenja)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva proizvodi (Profesionalna rješenja)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15648,7 +15648,7 @@ msgstr "Izaberite vaš ključ za enkriptiranje datotečnog sustava"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15669,7 +15669,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15787,7 +15787,7 @@ msgstr "&lt;b&gt;Uživajte u velikom izboru aplikacija&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16023,14 +16023,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Kontrolni Centar&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Kontrolni Centar&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16052,21 +16052,21 @@ msgstr "&lt;b&gt;Model otvorenog koda&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Online Store&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16089,20 +16089,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16121,33 +16121,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16170,32 +16170,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16495,8 +16495,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -16615,7 +16615,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16663,7 +16663,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -19226,13 +19226,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19252,8 +19252,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -19297,7 +19297,7 @@ msgstr "Čarobnjak mrežnih postavki"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19712,7 +19712,7 @@ msgstr "Pokrenuto pri podizanju"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ovo sučelje još nije podešeno.\n"</div><div class='ctx'> "Pokrenite čarobnjak za postavu u glavnom prozoru"</div><div class='hunk'>@@ -19721,7 +19721,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ovo sučelje još nije podešeno.\n"</div><div class='ctx'> "Pokrenite čarobnjak za postavu u glavnom prozoru"</div><div class='hunk'>@@ -19774,7 +19774,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -20069,7 +20069,7 @@ msgstr "Uvoz"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20588,7 +20588,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -20615,7 +20615,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Mandrake Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -23639,7 +23639,7 @@ msgstr "Promjena je izvršena, ali da bi imala učinak, morate se odlogirati"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Objašnjenja Mandrake alata"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -24146,10 +24146,10 @@ msgstr "Veza uspostavljena."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Spajanje nije uspjelo.\n"</div><div class='del'>-"Provjerite konfiguraciju u Mandrakelinux kontrolnom centru."</div><div class='add'>+"Provjerite konfiguraciju u Mandrivalinux kontrolnom centru."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -24994,8 +24994,8 @@ msgstr "Instalacija nije uspjela"</div><div class='ctx'> #~ msgstr "nisam mogao naći nijedan font.\n"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='head'>diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po<br/>index 463d451fd..1fa77f30c 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/hu.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/hu.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/hu.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/hu.po</a></div><div class='hunk'>@@ -68,7 +68,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Úgy tűnik, az USB-kulcson be van kapcsolva az írásvédelem, de az\n"</div><div class='ctx'> "eszközt jelenleg nem lehet biztonságosan eltávolítani.\n"</div><div class='hunk'>@@ -76,7 +76,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Kattintson a gombra a gép újraindításához, távolítsa el az eszközt,\n"</div><div class='ctx'> "kapcsolja ki az írásvédelmet, tegye be a kulcsot ismét, majd indítsa\n"</div><div class='del'>-"el újra a Mandrake Move rendszert."</div><div class='add'>+"el újra a Mandriva Move rendszert."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -94,7 +94,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Az USB-kulcson nincsen érvényes windowsos (FAT) partíció.\n"</div><div class='hunk'>@@ -112,7 +112,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -120,11 +120,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A rendszerben nem található USB-kulcs. Ha behelyez egy USB-kulcsot,\n"</div><div class='del'>-"akkor a Mandrake Move el tudja menteni az Ön saját könyvtárában\n"</div><div class='add'>+"akkor a Mandriva Move el tudja menteni az Ön saját könyvtárában\n"</div><div class='ctx'> "levő adatokat valamint a rendszer beállításait, amelyek\n"</div><div class='ctx'> "felhasználhatók lesznek a gép következő indításakor vagy egy másik\n"</div><div class='ctx'> "gépen. Ha most helyez be egy ilyen eszközt, várjon néhány\n"</div><div class='hunk'>@@ -260,7 +260,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -276,7 +276,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Ezt okozhatja például egy, az USB-kulcson levő sérült\n"</div><div class='ctx'> "rendszerbeállítási fájl - ebben az esetben a fájl\n"</div><div class='del'>-"eltávolítása, majd a Mandrake Move újraindítása megoldja\n"</div><div class='add'>+"eltávolítása, majd a Mandriva Move újraindítása megoldja\n"</div><div class='ctx'> "a problémát. Ehhez kattintson a megfelelő gombra.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1319,11 +1319,11 @@ msgstr "Nyelvválasztás"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A Mandrakelinux több nyelvvel is telepíthető. Jelölje ki,\n"</div><div class='add'>+"A Mandrivalinux több nyelvvel is telepíthető. Jelölje ki,\n"</div><div class='ctx'> "mely nyelveket szeretné telepíteni. Ezek a telepítés befejeződése\n"</div><div class='ctx'> "utáni újraindítást követően lesznek elérhetők."</div><div class='ctx'> </div><div class='hunk'>@@ -3761,12 +3761,12 @@ msgstr "Rádiótámogatás bekapcsolása"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mielőtt továbblépne, olvassa át alaposan a licencegyezményt, amely az\n"</div><div class='del'>-"egész Mandrakelinux disztribúcióra érvényes. Ha elfogadja az abban\n"</div><div class='add'>+"egész Mandrivalinux disztribúcióra érvényes. Ha elfogadja az abban\n"</div><div class='ctx'> "szereplő feltételeket, akkor jelölje be a(z) \"%s\" opciót.\n"</div><div class='ctx'> "Ha nem fogadja el valamelyik feltételt, akkor kattintson a(z)\n"</div><div class='ctx'> "\"%s\" gombra - ezzel újraindítja a számítógépet."</div><div class='hunk'>@@ -3947,13 +3947,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A Mandrakelinux telepítőanyag több CD-n helyezkedik el. Ha egy kiválasztott\n"</div><div class='add'>+"A Mandrivalinux telepítőanyag több CD-n helyezkedik el. Ha egy kiválasztott\n"</div><div class='ctx'> "csomag egy másik CD-n található, akkor a telepítő kiadja az\n"</div><div class='ctx'> "aktuális CD-t, és megkéri Önt, hogy helyezze be a megfelelőt.\n"</div><div class='ctx'> "Ha a szóban forgó lemez nincs kéznél, akkor kattintson a(z) \"%s\" gombra,\n"</div><div class='hunk'>@@ -3963,11 +3963,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4019,10 +4019,10 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Most meg kell adnia, mely programokat kívánja telepíteni a rendszerére.\n"</div><div class='del'>-"Több ezer program létezik Mandrakelinuxhoz; a kezelésük megkönnyítése\n"</div><div class='add'>+"Több ezer program létezik Mandrivalinuxhoz; a kezelésük megkönnyítése\n"</div><div class='ctx'> "érdekében a programok (hasonlóság alapján) csoportokba lettek sorolva.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"A Mandrakelinux rendszerben négy előredefiniált csomagkategória van\n"</div><div class='add'>+"A Mandrivalinux rendszerben négy előredefiniált csomagkategória van\n"</div><div class='ctx'> "meghatározva. A különböző kategóriákban levő csomagok keverhetők is,\n"</div><div class='ctx'> "tehát egy \"Munkaállomás\" típusú telepítés tartalmazhat olyan\n"</div><div class='ctx'> "alkalmazásokat is, amelyek csak a \"Kiszolgáló\" kategóriában vannak\n"</div><div class='hunk'>@@ -4128,10 +4128,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4162,7 +4162,7 @@ msgstr ""</div><div class='ctx'> "Ha kiszolgálócsomagok is ki lettek választva - akár közvetlenül, akár\n"</div><div class='ctx'> "bizonyos csoportok tagjaként -, a telepítő megerősítést kér Öntől arra\n"</div><div class='ctx'> "vonatkozóan, hogy valóban telepíteni kívánja-e azon kiszolgálószoftvereket.\n"</div><div class='del'>-"A Mandrakelinux rendszerben alapértelmezésben az összes feltelepített\n"</div><div class='add'>+"A Mandrivalinux rendszerben alapértelmezésben az összes feltelepített\n"</div><div class='ctx'> "szolgáltatás elindításra kerül a rendszer indulásakor. Még ha azok\n"</div><div class='ctx'> "biztonságosak is illetve nem rendelkeznek ismert problémákkal, akkor is\n"</div><div class='ctx'> "előfordulhat, hogy utóbb biztonsági problémák merülnek fel velük\n"</div><div class='hunk'>@@ -4317,7 +4317,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4372,7 +4372,7 @@ msgid ""</div><div class='ctx'> "not successful in getting the display configured."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Az X (teljes néven: X Window System) a Linux grafikus felületét nyújtó\n"</div><div class='del'>-"rendszer. A Mandrakelinuxban levő grafikus környezetek (KDE, GNOME,\n"</div><div class='add'>+"rendszer. A Mandrivalinuxban levő grafikus környezetek (KDE, GNOME,\n"</div><div class='ctx'> "AfterStep, WindowMaker, ...) ezen grafikus rendszert használják.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Egy listát fog látni az elérhető paraméterekről, amelyekkel optimalizálható\n"</div><div class='hunk'>@@ -4493,12 +4493,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4525,7 +4525,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4534,7 +4534,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4554,11 +4554,11 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ebben a lépésben kell megadni, hogy a Mandrakelinux telepítése a merevlemez\n"</div><div class='add'>+"Ebben a lépésben kell megadni, hogy a Mandrivalinux telepítése a merevlemez\n"</div><div class='ctx'> "melyik részére történjen. Ha a lemez még teljesen üres, vagy a korábban\n"</div><div class='ctx'> "telepített operációs rendszer(ek) miatt nincs elég szabad hely, akkor újra\n"</div><div class='ctx'> "kell partícionálni a lemezt. A partícionálás a lemezterület logikai\n"</div><div class='del'>-"újrafelosztását jelenti - erre a Mandrakelinux telepítéséhez szükséges\n"</div><div class='add'>+"újrafelosztását jelenti - erre a Mandrivalinux telepítéséhez szükséges\n"</div><div class='ctx'> "hely létrehozása érdekében van szükség.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "A partícionálás veszélyes művelet. Hiba esetén adatvesztéssel járhat\n"</div><div class='hunk'>@@ -4590,7 +4590,7 @@ msgstr ""</div><div class='ctx'> "Az átméretezés végrehajtható a lemezen levő adatok\n"</div><div class='ctx'> "elvesztése nélkül - feltéve, hogy azt megelőzően töredezettségmentesítve\n"</div><div class='ctx'> "lett a kérdéses partíció. Javasolt továbbá az adatok mentése is.\n"</div><div class='del'>-"Ezen módszer a javasolt abban az esetben, ha a Mandrakelinuxt és a\n"</div><div class='add'>+"Ezen módszer a javasolt abban az esetben, ha a Mandrivalinuxt és a\n"</div><div class='ctx'> "Windowst ugyanazon a gépen szeretné használni.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ha ezt a lehetőséget választja, ne feledkezzen meg arról, hogy ennek\n"</div><div class='hunk'>@@ -4710,7 +4710,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Ez a lehetőség jól használható akkor, amikor nagyobb számú azonos gépre\n"</div><div class='ctx'> "kell a rendszert feltelepíteni. Az automatikus telepítéssel\n"</div><div class='del'>-"kapcsolatban a Mandrakelinux honlapján találhatók további információk.\n"</div><div class='add'>+"kapcsolatban a Mandrivalinux honlapján találhatók további információk.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "  - \"%s\"(*): elmenti a telepítés során\n"</div><div class='ctx'> "kiválasztott csomagok listáját. Ha egy újabb telepítés alkalmával fel\n"</div><div class='hunk'>@@ -4765,7 +4765,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4787,7 +4787,7 @@ msgstr ""</div><div class='ctx'> "Kattintson a(z) \"%s\" gombra a formázások megkezdéséhez.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kattintson a(z) \"%s\" gombra, ha más partícióra szeretné telepíteni a\n"</div><div class='del'>-"Mandrakelinux operációs rendszert.\n"</div><div class='add'>+"Mandrivalinux operációs rendszert.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kattintson a(z) \"%s\" gombra, ha bizonyos partíciókat ellenőriztetni\n"</div><div class='ctx'> "kíván (hibás blokkok keresése)."</div><div class='hunk'>@@ -4804,7 +4804,7 @@ msgstr "Előző"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4816,7 +4816,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Lehetséges, hogy amikor Ön a Mandrakelinux rendszert telepíti, már\n"</div><div class='add'>+"Lehetséges, hogy amikor Ön a Mandrivalinux rendszert telepíti, már\n"</div><div class='ctx'> "frissítésre kerültek bizonyos csomagok a rendszer kiadása óta.\n"</div><div class='ctx'> "Elképzelhető, hogy bizonyos hibák ki lettek javítva, illetve\n"</div><div class='ctx'> "hogy meg lettek oldva bizonyos felmerült biztonsági problémák. Ezeket\n"</div><div class='hunk'>@@ -4848,7 +4848,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4861,7 +4861,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Ha nem biztos benne, hogy mit volna érdemes választani, akkor válassza\n"</div><div class='ctx'> "az alapértelmezés szerinti lehetőséget. A biztonsági szint később is\n"</div><div class='del'>-"módosítható a Mandrakelinux Vezérlőközpontban elérhető \"draksec\"\n"</div><div class='add'>+"módosítható a Mandrivalinux Vezérlőközpontban elérhető \"draksec\"\n"</div><div class='ctx'> "eszközzel.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "A(z) \"%s\" mezőben megadandó a biztonságért felelős személy email-címe.\n"</div><div class='hunk'>@@ -4876,7 +4876,7 @@ msgstr "Biztonsági adminisztrátor"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4946,7 +4946,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ebben a lépésben kell kiválasztani a Mandrakelinux rendszer telepítéséhez\n"</div><div class='add'>+"Ebben a lépésben kell kiválasztani a Mandrivalinux rendszer telepítéséhez\n"</div><div class='ctx'> "használni kívánt partíciókat. Ha a kívánt partíciók már létre lettek hozva\n"</div><div class='ctx'> "(egy korábbi Linux-telepítés vagy valamilyen partícionálási segédprogram\n"</div><div class='ctx'> "által), akkor felhasználhatók a már létező partíciók. Ha viszont még nem\n"</div><div class='hunk'>@@ -5039,7 +5039,7 @@ msgstr "Váltás a normál és a szakértői módok közt"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5069,7 +5069,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Egynél több microsoftos partíció van a lemezen.\n"</div><div class='ctx'> "Válassza ki azt, amelyiket át szeretné méretezni, hogy a\n"</div><div class='del'>-"Mandrakelinux feltelepíthető legyen.\n"</div><div class='add'>+"Mandrivalinux feltelepíthető legyen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "A partíciólista a következő mezőket tartalmazza: \"linuxos név\",\n"</div><div class='ctx'> "\"windowsos név\", \"kapacitás\".\n"</div><div class='hunk'>@@ -5119,7 +5119,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5128,18 +5128,18 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Erre a lépésre csak akkor kerül sor, ha a gépen már van linuxos partíció.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Most közölnie kell a telepítővel, hogy új telepítést szeretne-e végezni\n"</div><div class='del'>-"vagy pedig egy meglevő Mandrakelinux-rendszert kíván frissíteni:\n"</div><div class='add'>+"vagy pedig egy meglevő Mandrivalinux-rendszert kíván frissíteni:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "  - \"%s\": a korábbi rendszer felülírásra kerül. Attól függően, hogy\n"</div><div class='ctx'> "milyen partíciók találhatók a gépen, bizonyos partíciók (például a\n"</div><div class='hunk'>@@ -5147,13 +5147,13 @@ msgstr ""</div><div class='ctx'> "megőrizhetők. Ha szeretné módosítani a merevlemezek partícionálását\n"</div><div class='ctx'> "vagy a fájlrendszereket, akkor ezt a lehetőséget használja.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"  - \"%s\": lehetővé teszi egy korábbi Mandrakelinux-telepítés\n"</div><div class='add'>+"  - \"%s\": lehetővé teszi egy korábbi Mandrivalinux-telepítés\n"</div><div class='ctx'> "csomagjainak frissítését. A merevlemezek partícionálása változatlanul\n"</div><div class='ctx'> "marad, a felhasználók adatai sem módosulnak. A többi beállítási lépés közül\n"</div><div class='ctx'> "a legtöbb elérhető lesz - a folyamat hasonló a normál telepítéshez.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Frissítés használata akkor javasolt, ha a számítógépen\n"</div><div class='del'>-"Mandrakelinux 8.1 vagy újabb kiadás van."</div><div class='add'>+"Mandrivalinux 8.1 vagy újabb kiadás van."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5211,7 +5211,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5254,7 +5254,7 @@ msgstr ""</div><div class='ctx'> "Az UTF-8 (Unicode) szabvány támogatásáról: A Unicode egy új\n"</div><div class='ctx'> "karakterkódolási szabvány az összes létező nyelv lefedésére.\n"</div><div class='ctx'> "A Linux alatti teljes támogatása még fejlesztés alatt áll.\n"</div><div class='del'>-"A Mandrakelinux UTF-8-használatát befolyásolják a felhasználó\n"</div><div class='add'>+"A Mandrivalinux UTF-8-használatát befolyásolják a felhasználó\n"</div><div class='ctx'> "által végzett beállítások:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "  - ha olyan nyelvet választ, amelyhez erősen kapcsolódik egy\n"</div><div class='hunk'>@@ -5508,7 +5508,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5529,11 +5529,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Itt lehet nyomtatórendszert választani a gép számára. Más operációs\n"</div><div class='del'>-"rendszerekben általában csak egy van, a Mandrakelinuxban viszont kettő is.\n"</div><div class='add'>+"rendszerekben általában csak egy van, a Mandrivalinuxban viszont kettő is.\n"</div><div class='ctx'> "Mindkettőnek megvannak a maga előnyei bizonyos környezetben használva.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "  - \"%s\": \"print, do not queue\", azaz sorba tevés nélkül történő\n"</div><div class='hunk'>@@ -5558,7 +5558,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Telepítés után lehetősége lesz a nyomtatórendszer lecserélésére (ha mégsem\n"</div><div class='ctx'> "felel meg az itt kiválasztott) - ehhez a PrinterDrake programot kell\n"</div><div class='del'>-"elindítani a Mandrakelinux Vezérlőközpontban, majd rá kell kattintani a(z)\n"</div><div class='add'>+"elindítani a Mandrivalinux Vezérlőközpontban, majd rá kell kattintani a(z)\n"</div><div class='ctx'> "\"%s\" gombra."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='hunk'>@@ -5675,7 +5675,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5692,7 +5692,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5743,7 +5743,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "  - \"%s\": ha be szeretné állítani az internet vagy a helyi hálózat\n"</div><div class='ctx'> "elérését most, akkor kattintson a gombra. Információkat a nyomtatott\n"</div><div class='del'>-"dokumentációból szerezhet, vagy telepítés után a Mandrakelinux\n"</div><div class='add'>+"dokumentációból szerezhet, vagy telepítés után a Mandrivalinux\n"</div><div class='ctx'> "Vezérlőközpontban.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "  - \"%s\": lehetővé teszi a HTTP- és FTP-proxyk beállítását arra az\n"</div><div class='hunk'>@@ -5760,7 +5760,7 @@ msgstr ""</div><div class='ctx'> "beállításait, kattintson a megfelelő gombra. Elsősorban a komolyabb\n"</div><div class='ctx'> "ismeretekkel rendelkező felhasználóknak javasolt. Információkat a\n"</div><div class='ctx'> "nyomtatott dokumentációból szerezhet, vagy telepítés után a\n"</div><div class='del'>-"Mandrakelinux Vezérlőközpontban a rendszerindítónál.\n"</div><div class='add'>+"Mandrivalinux Vezérlőközpontban a rendszerindítónál.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "  - \"%s\": itt részletesen beállítható, hogy mely\n"</div><div class='ctx'> "szolgáltatások legyenek működtetve a gépen. Ha kiszolgálóként szeretné\n"</div><div class='hunk'>@@ -5821,11 +5821,11 @@ msgstr "Szolgáltatások"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Válassza ki azt a lemezt, amelyet törölni szeretne a\n"</div><div class='del'>-"Mandrakelinux-partíció létrehozásához. Figyelem: a lemezen\n"</div><div class='add'>+"Mandrivalinux-partíció létrehozásához. Figyelem: a lemezen\n"</div><div class='ctx'> "található adatok elvesznek, és később nem nyerhetők vissza!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6175,12 +6175,12 @@ msgstr "A windowsos partíció méretének meghatározása"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A windowsos partíció túlzottan töredezett. Indítsa újra a gépet Windowsszal, "</div><div class='ctx'> "majd futtassa a \"defrag\" programot. Ennek végeztével indítsa el újra a "</div><div class='del'>-"Mandrakelinux telepítését."</div><div class='add'>+"Mandrivalinux telepítését."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6296,19 +6296,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6330,7 +6330,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6338,14 +6338,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6355,7 +6355,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6375,10 +6375,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6389,11 +6389,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6409,15 +6409,15 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bevezetés\n"</div><div class='ctx'> "\n"</div><div class='del'>-"A továbbiakban az operációs rendszerre és a Mandrakelinux disztribúcióban "</div><div class='add'>+"A továbbiakban az operációs rendszerre és a Mandrivalinux disztribúcióban "</div><div class='ctx'> "elérhető\n"</div><div class='ctx'> "különféle komponensekre \"Szoftvertermékek\" néven hivatkozunk. A "</div><div class='ctx'> "Szoftvertermékek körébe - nem\n"</div><div class='del'>-"kizárólagosan - beletartoznak az operációs rendszerhez és a Mandrakelinux "</div><div class='add'>+"kizárólagosan - beletartoznak az operációs rendszerhez és a Mandrivalinux "</div><div class='ctx'> "disztribúció\n"</div><div class='ctx'> "különféle komponenseihez kapcsolódó programok, módszerek, szabályok és "</div><div class='ctx'> "dokumentáció.\n"</div><div class='hunk'>@@ -6427,7 +6427,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Kérjük, olvassa el jelen dokumentumot figyelmesen. Ezen dokumentum egy, a "</div><div class='ctx'> "Szoftvertermékekre\n"</div><div class='del'>-"vonatkozó licencegyezmény Ön és a Mandrakesoft S.A. között.\n"</div><div class='add'>+"vonatkozó licencegyezmény Ön és a Mandriva S.A. között.\n"</div><div class='ctx'> "Ha a Szoftvertermékeket bármiféle módon telepíti, sokszorosítja vagy "</div><div class='ctx'> "felhasználja,\n"</div><div class='ctx'> "azzal Ön elfogadja jelen licenc kikötéseit és feltételeit, továbbá "</div><div class='hunk'>@@ -6453,7 +6453,7 @@ msgstr ""</div><div class='ctx'> "állapotban állnak\n"</div><div class='ctx'> "rendelkezésre. Garancia nincsen azokra - a törvények által engedélyezett "</div><div class='ctx'> "mértékben.\n"</div><div class='del'>-"A Mandrakesoft S.A. - a törvények által engedélyezett mértékben - semmilyen "</div><div class='add'>+"A Mandriva S.A. - a törvények által engedélyezett mértékben - semmilyen "</div><div class='ctx'> "körülmények\n"</div><div class='ctx'> "között sem vonható felelősségre a Szoftvertermékek használatából vagy "</div><div class='ctx'> "használhatatlanságából\n"</div><div class='hunk'>@@ -6463,7 +6463,7 @@ msgstr ""</div><div class='ctx'> "pénzügyi\n"</div><div class='ctx'> "veszteség, jogi díjak illetve bírósági ítéletből származó büntetés, vagy "</div><div class='ctx'> "bármilyen\n"</div><div class='del'>-"származékos veszteség); még abban az esetben sem, ha a Mandrakesoft S.A. "</div><div class='add'>+"származékos veszteség); még abban az esetben sem, ha a Mandriva S.A. "</div><div class='ctx'> "tájékoztatva lett\n"</div><div class='ctx'> "az ilyesféle károk bekövetkezésének lehetőségéről.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6471,7 +6471,7 @@ msgstr ""</div><div class='ctx'> "BIRTOKLÁSÁVAL ILLETVE\n"</div><div class='ctx'> "HASZNÁLATÁVAL KAPCSOLATBAN\n"</div><div class='ctx'> "\n"</div><div class='del'>-"A Mandrakesoft S.A. és disztribútorai - a törvények által engedélyezett "</div><div class='add'>+"A Mandriva S.A. és disztribútorai - a törvények által engedélyezett "</div><div class='ctx'> "mértékben - semmilyen\n"</div><div class='ctx'> "körülmények között sem vonhatók felelősségre az olyan - speciális, előre nem "</div><div class='ctx'> "látott, közvetlen\n"</div><div class='hunk'>@@ -6483,7 +6483,7 @@ msgstr ""</div><div class='ctx'> "károk a\n"</div><div class='ctx'> "szoftverkomponensek birtoklásából vagy használatából illetve a helyi "</div><div class='ctx'> "törvények által\n"</div><div class='del'>-"tiltott vagy korlátozott szoftverkomponenseknek egy Mandrakelinux-címről "</div><div class='add'>+"tiltott vagy korlátozott szoftverkomponenseknek egy Mandrivalinux-címről "</div><div class='ctx'> "való\n"</div><div class='ctx'> "letöltéséből származnak.\n"</div><div class='ctx'> "Ezen korlátozott felelősség vonatkozik többek közt a Szoftvertermékekben "</div><div class='hunk'>@@ -6504,11 +6504,11 @@ msgstr ""</div><div class='ctx'> "el figyelmesen\n"</div><div class='ctx'> "a komponensre vonatkozó licenc kikötéseit és feltételeit. Egy komponens "</div><div class='ctx'> "licencére vonatkozó\n"</div><div class='del'>-"kérdést nem a Mandrakesoft céghez, hanem az adott komponens szerzőjéhez kell "</div><div class='add'>+"kérdést nem a Mandriva céghez, hanem az adott komponens szerzőjéhez kell "</div><div class='ctx'> "irányítani.\n"</div><div class='del'>-"A Mandrakesoft S.A. által fejlesztett programok a GPL licenc hatálya alá "</div><div class='add'>+"A Mandriva S.A. által fejlesztett programok a GPL licenc hatálya alá "</div><div class='ctx'> "tartoznak.\n"</div><div class='del'>-"A Mandrakesoft S.A. által írt dokumentációs anyagokra egy speciális licenc "</div><div class='add'>+"A Mandriva S.A. által írt dokumentációs anyagokra egy speciális licenc "</div><div class='ctx'> "vonatkozik.\n"</div><div class='ctx'> "További részletek a dokumentációban.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6520,12 +6520,12 @@ msgstr ""</div><div class='ctx'> "és a szoftverekre vonatkozó szellemi tulajdoni illetve szerzői jogi "</div><div class='ctx'> "(copyright) törvények\n"</div><div class='ctx'> "védelme alatt áll.\n"</div><div class='del'>-"A Mandrakesoft S.A. fenntartja a jogot arra, hogy módosítsa illetve "</div><div class='add'>+"A Mandriva S.A. fenntartja a jogot arra, hogy módosítsa illetve "</div><div class='ctx'> "átalakítsa a\n"</div><div class='ctx'> "Szoftvertermékeket - teljes egészében vagy részben, bármilyen módon illetve "</div><div class='ctx'> "bármilyen célra.\n"</div><div class='del'>-"A \"Mandrake\", a \"Mandrakelinux\" és az azokhoz tartozó logók a "</div><div class='del'>-"Mandrakesoft S.A. védjegyei.\n"</div><div class='add'>+"A \"Mandriva\", a \"Mandrivalinux\" és az azokhoz tartozó logók a "</div><div class='add'>+"Mandriva S.A. védjegyei.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Vonatkozó törvények\n"</div><div class='hunk'>@@ -6544,7 +6544,7 @@ msgstr ""</div><div class='ctx'> "megfelelő\n"</div><div class='ctx'> "párizsi (Franciaország) bíróságra kerül.\n"</div><div class='ctx'> "Ha jelen dokumentummal kapcsolatban kérdése van, vegye fel a kapcsolatot a "</div><div class='del'>-"Mandrakesoft S.A.\n"</div><div class='add'>+"Mandriva S.A.\n"</div><div class='ctx'> "céggel.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -6638,7 +6638,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6646,21 +6646,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gratulálunk; a telepítés befejeződött. Vegye ki a rendszerindítási\n"</div><div class='ctx'> "adathordozókat, majd nyomja le az Enter billentyűt a rendszer\n"</div><div class='ctx'> "újraindításához.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Az ehhez a Mandrakelinux-verzióhoz elérhető javításokról a következő\n"</div><div class='add'>+"Az ehhez a Mandrivalinux-verzióhoz elérhető javításokról a következő\n"</div><div class='ctx'> "helyen olvashat:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"A rendszer beállításával kapcsolatban a Mandrakelinux hivatalos\n"</div><div class='add'>+"A rendszer beállításával kapcsolatban a Mandrivalinux hivatalos\n"</div><div class='ctx'> "felhasználói kézikönyvében talál további információkat."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6697,12 +6697,12 @@ msgstr "A következő lépés: \"%s\"\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A rendszer gyenge erőforrásokkal rendelkezik. Előfordulhat, hogy problémái\n"</div><div class='del'>-"lesznek a Mandrakelinux telepítésével. Ha így történik, próbálkozzon\n"</div><div class='add'>+"lesznek a Mandrivalinux telepítésével. Ha így történik, próbálkozzon\n"</div><div class='ctx'> "szöveges módú telepítéssel: CD-ről való rendszerindítást követően nyomjon\n"</div><div class='ctx'> "\"F1\"-et, majd írja be azt, hogy \"text\"."</div><div class='ctx'> </div><div class='hunk'>@@ -7259,9 +7259,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kapcsolódás a Mandrakelinux webkiszolgálójához; az elérhető tükörkiszolgálók "</div><div class='add'>+"Kapcsolódás a Mandrivalinux webkiszolgálójához; az elérhető tükörkiszolgálók "</div><div class='ctx'> "listájának lekérdezése..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7490,8 +7490,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux-telepítés %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux-telepítés %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10080,14 +10080,14 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A DrakFirewall beállítása\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ezzel egy személyes felhasználásra szánt tűzfalat lehet beállítani ehhez\n"</div><div class='del'>-"a Mandrakelinuxt használó géphez. Ha egy komolyabb tűzfalmegoldást\n"</div><div class='add'>+"a Mandrivalinuxt használó géphez. Ha egy komolyabb tűzfalmegoldást\n"</div><div class='ctx'> "szeretne, szerezze be a speciális MandrakeSecurity Firewall disztribúciót."</div><div class='ctx'> </div><div class='ctx'> #: network/drakfirewall.pm:164</div><div class='hunk'>@@ -14175,12 +14175,12 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ha szeretné megosztani a lapolvasót a hálózaton, akkor használja a "</div><div class='del'>-"Scannerdrake programot (Hardver/Lapolvasók a Mandrakelinux "</div><div class='add'>+"Scannerdrake programot (Hardver/Lapolvasók a Mandrivalinux "</div><div class='ctx'> "Vezérlőközpontban).\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -16186,33 +16186,33 @@ msgstr "Leállítás"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mi a Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mi a Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Üdvözli a &lt;b&gt;Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Üdvözli a &lt;b&gt;Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A Mandrakelinux egy &lt;b&gt;Linux-disztribúció&lt;/b&gt;, amely az alaprendszeren - a "</div><div class='add'>+"A Mandrivalinux egy &lt;b&gt;Linux-disztribúció&lt;/b&gt;, amely az alaprendszeren - a "</div><div class='ctx'> "Linux kernelen alapuló &lt;b&gt;operációs rendszeren&lt;/b&gt; - kívül tartalmaz "</div><div class='ctx'> "&lt;b&gt;számos alkalmazást&lt;/b&gt; is, megfelelve ezzel minden igénynek."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"A Mandrakelinux a leginkább &lt;b&gt;felhasználóbarát&lt;/b&gt; Linux-disztribúció, "</div><div class='add'>+"A Mandrivalinux a leginkább &lt;b&gt;felhasználóbarát&lt;/b&gt; Linux-disztribúció, "</div><div class='ctx'> "továbbá az egyik &lt;b&gt;legelterjedtebb&lt;/b&gt; is."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16228,13 +16228,13 @@ msgstr "Üdvözöljük a &lt;b&gt;nyílt forráskód világában&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A Mandrakelinux a nyílt forrás-modellt alkalmazza. Ez azt jelenti, hogy ez a "</div><div class='del'>-"verzió a &lt;b&gt;Mandrakesoft fejlesztőcsapata&lt;/b&gt; és a Mandrakelinux "</div><div class='add'>+"A Mandrivalinux a nyílt forrás-modellt alkalmazza. Ez azt jelenti, hogy ez a "</div><div class='add'>+"verzió a &lt;b&gt;Mandriva fejlesztőcsapata&lt;/b&gt; és a Mandrivalinux "</div><div class='ctx'> "fejlesztésében közreműködők &lt;b&gt;világméretű közössége&lt;/b&gt; közti "</div><div class='ctx'> "&lt;b&gt;együttműködés&lt;/b&gt; eredménye."</div><div class='ctx'> </div><div class='hunk'>@@ -16256,9 +16256,9 @@ msgstr "&lt;b&gt;A GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A disztribúcióban levő legtöbb szoftver, valamint az összes Mandrakelinux-"</div><div class='add'>+"A disztribúcióban levő legtöbb szoftver, valamint az összes Mandrivalinux-"</div><div class='ctx'> "eszköz a &lt;b&gt;General Public License&lt;/b&gt; nevű licencet használja."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16290,15 +16290,15 @@ msgstr "&lt;b&gt;Csatlakozzon a közösséghez&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A Mandrakelinux rendelkezik az egyik &lt;b&gt;legnagyobb&lt;/b&gt; felhasználói és "</div><div class='add'>+"A Mandrivalinux rendelkezik az egyik &lt;b&gt;legnagyobb&lt;/b&gt; felhasználói és "</div><div class='ctx'> "fejlesztői &lt;b&gt;közösséggel&lt;/b&gt;. A közösség széles körű tevékenységet végez a "</div><div class='ctx'> "hibakereséstől kezdve az alkalmazásfejlesztésig. A közösség "</div><div class='del'>-"&lt;b&gt;kulcsszerepet&lt;/b&gt; játszik a Mandrakelinux világában."</div><div class='add'>+"&lt;b&gt;kulcsszerepet&lt;/b&gt; játszik a Mandrivalinux világában."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16320,11 +16320,11 @@ msgstr "&lt;b&gt;Letölthető verzió&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Jelenleg a &lt;b&gt;Mandrakelinux letölthető verziójának&lt;/b&gt; telepítése folyik. "</div><div class='del'>-"Ezt az ingyenes verziót a Mandrakesoft &lt;b&gt;mindenki számára elérhetően&lt;/b&gt; "</div><div class='add'>+"Jelenleg a &lt;b&gt;Mandrivalinux letölthető verziójának&lt;/b&gt; telepítése folyik. "</div><div class='add'>+"Ezt az ingyenes verziót a Mandriva &lt;b&gt;mindenki számára elérhetően&lt;/b&gt; "</div><div class='ctx'> "terjeszti."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -16354,9 +16354,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A többi Mandrakesoft-termékkel kínált &lt;b&gt;szolgáltatásokhoz&lt;/b&gt; sem lesz "</div><div class='add'>+"A többi Mandriva-termékkel kínált &lt;b&gt;szolgáltatásokhoz&lt;/b&gt; sem lesz "</div><div class='ctx'> "hozzáférési lehetőség."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -16366,8 +16366,8 @@ msgstr "&lt;b&gt;Discovery - az Ön első Linux-munkaasztala&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Ön most a &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt; terméket telepíti."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Ön most a &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt; terméket telepíti."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16389,17 +16389,17 @@ msgstr "&lt;b&gt;PowerPack - a legerősebb Linux-munkaasztal&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Ön most a &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt; terméket telepíti."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Ön most a &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt; terméket telepíti."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A PowerPack a Mandrakesoft által készített &lt;b&gt;linuxos munkaasztali termékek "</div><div class='add'>+"A PowerPack a Mandriva által készített &lt;b&gt;linuxos munkaasztali termékek "</div><div class='ctx'> "zászlóshajója&lt;/b&gt;. A PowerPack &lt;b&gt;alkalmazások ezreit&lt;/b&gt; tartalmazza - a "</div><div class='ctx'> "legnépszerűbbeket és a legfejlettebbeket."</div><div class='ctx'> </div><div class='hunk'>@@ -16410,8 +16410,8 @@ msgstr "&lt;b&gt;PowerPack+ - Linux-megoldás munkaasztalra és kiszolgálóra&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Ön most a &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt; terméket telepíti."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Ön most a &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt; terméket telepíti."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16428,22 +16428,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft-termékek&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva-termékek&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A &lt;b&gt;Mandrakesoft&lt;/b&gt; széles skálával rendelkezik &lt;b&gt;Mandrakelinux&lt;/b&gt;-"</div><div class='add'>+"A &lt;b&gt;Mandriva&lt;/b&gt; széles skálával rendelkezik &lt;b&gt;Mandrivalinux&lt;/b&gt;-"</div><div class='ctx'> "termékekből."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "A Mandrakelinux-termékek a következők:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "A Mandrivalinux-termékek a következők:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16463,76 +16463,76 @@ msgstr "\t- &lt;b&gt;PowerPack+&lt;/b&gt; - Linux-megoldás munkaasztalra és kiszolgálóra</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t- &lt;b&gt;Mandrakelinux az x86-64 architektúrához&lt;/b&gt; - a Mandrakelinux-"</div><div class='add'>+"\t- &lt;b&gt;Mandrivalinux az x86-64 architektúrához&lt;/b&gt; - a Mandrivalinux-"</div><div class='ctx'> "megoldás, amellyel a legtöbbet hozhatja ki 64 bites processzorából"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft-termékek (Nomad)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva-termékek (Nomad)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"A Mandrakesoft rendelkezik kettő olyan termékkel, amelyek lehetővé teszik a "</div><div class='del'>-"Mandrakelinux &lt;b&gt;bármely számítógépen&lt;/b&gt; való, telepítés nélküli "</div><div class='add'>+"A Mandriva rendelkezik kettő olyan termékkel, amelyek lehetővé teszik a "</div><div class='add'>+"Mandrivalinux &lt;b&gt;bármely számítógépen&lt;/b&gt; való, telepítés nélküli "</div><div class='ctx'> "használatát:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t- &lt;b&gt;Move&lt;/b&gt; - Mandrakelinux-rendszer, amely teljes mértékben egy "</div><div class='add'>+"\t- &lt;b&gt;Move&lt;/b&gt; - Mandrivalinux-rendszer, amely teljes mértékben egy "</div><div class='ctx'> "indítható CD-ről fut"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t- &lt;b&gt;GlobeTrotter&lt;/b&gt; - Mandrakelinux-rendszer előre telepítve a tömör "</div><div class='add'>+"\t- &lt;b&gt;GlobeTrotter&lt;/b&gt; - Mandrivalinux-rendszer előre telepítve a tömör "</div><div class='ctx'> "felépítésű LaCie Mobile Hard Drive lemezegységre"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft-termékek (professzionális megoldások)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva-termékek (professzionális megoldások)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"A &lt;b&gt;professzionális igények&lt;/b&gt; kielégítésére tervezett Mandrakesoft-"</div><div class='add'>+"A &lt;b&gt;professzionális igények&lt;/b&gt; kielégítésére tervezett Mandriva-"</div><div class='ctx'> "termékek:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t- &lt;b&gt;Corporate Desktop&lt;/b&gt; - az üzleti célra szánt Mandrakelinux-"</div><div class='add'>+"\t- &lt;b&gt;Corporate Desktop&lt;/b&gt; - az üzleti célra szánt Mandrivalinux-"</div><div class='ctx'> "munkaasztal"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t- &lt;b&gt;Corporate Server&lt;/b&gt; - Mandrakelinux-kiszolgálói megoldás"</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t- &lt;b&gt;Corporate Server&lt;/b&gt; - Mandrivalinux-kiszolgálói megoldás"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t- &lt;b&gt;Multi-Network Firewall&lt;/b&gt; - biztonsági megoldás Mandrakelinuxszal"</div><div class='add'>+"\t- &lt;b&gt;Multi-Network Firewall&lt;/b&gt; - biztonsági megoldás Mandrivalinuxszal"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16575,10 +16575,10 @@ msgstr "&lt;b&gt;Válassza ki a kedvenc munkaasztali környezetét&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A PowerPack rendszerben lehetősége van &lt;b&gt;grafikus asztali környezetet&lt;/b&gt; "</div><div class='del'>-"választani. A Mandrakesoft alapértelmezésként a &lt;b&gt;KDE&lt;/b&gt; környezetet "</div><div class='add'>+"választani. A Mandriva alapértelmezésként a &lt;b&gt;KDE&lt;/b&gt; környezetet "</div><div class='ctx'> "jelölte ki."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -16603,10 +16603,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A PowerPack+ rendszerben lehetősége van &lt;b&gt;grafikus asztali környezetet&lt;/b&gt; "</div><div class='del'>-"választani. A Mandrakesoft alapértelmezésként a &lt;b&gt;KDE&lt;/b&gt; környezetet "</div><div class='add'>+"választani. A Mandriva alapértelmezésként a &lt;b&gt;KDE&lt;/b&gt; környezetet "</div><div class='ctx'> "jelölte ki."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16734,10 +16734,10 @@ msgstr "&lt;b&gt;Alkalmazások széles skálája&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"A Mandrakelinux menüjében &lt;b&gt;minden feladathoz&lt;/b&gt; talál &lt;b&gt;egyszerűen "</div><div class='add'>+"A Mandrivalinux menüjében &lt;b&gt;minden feladathoz&lt;/b&gt; talál &lt;b&gt;egyszerűen "</div><div class='ctx'> "használható&lt;/b&gt; alkalmazásokat:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -17008,17 +17008,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Vezérlőközpont&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Vezérlőközpont&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A &lt;b&gt;Mandrakelinux Vezérlőközpont&lt;/b&gt; a Mandrakelinux-beli számítógép-"</div><div class='add'>+"A &lt;b&gt;Mandrivalinux Vezérlőközpont&lt;/b&gt; a Mandrivalinux-beli számítógép-"</div><div class='ctx'> "beállítási szoftvereszközök nélkülözhetetlen gyűjteménye."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -17043,17 +17043,17 @@ msgstr "&lt;b&gt;A nyílt forrás-modell&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mint mindenféle számítógép-programozás, a nyílt forráskódú szoftver "</div><div class='ctx'> "fejlesztése is &lt;b&gt;igényel időt és embereket&lt;/b&gt;. A nyílt forráskód "</div><div class='del'>-"filozófiájának tiszteletben tartásával a Mandrakesoft értéknövelt termékeket "</div><div class='del'>-"és szolgáltatásokat kínál a &lt;b&gt;Mandrakelinux fejlesztésének fenntartása&lt;/b&gt; "</div><div class='add'>+"filozófiájának tiszteletben tartásával a Mandriva értéknövelt termékeket "</div><div class='add'>+"és szolgáltatásokat kínál a &lt;b&gt;Mandrivalinux fejlesztésének fenntartása&lt;/b&gt; "</div><div class='ctx'> "érdekében. Ha szeretné &lt;b&gt;támogatni a nyílt forráskód filozófiáját&lt;/b&gt; és a "</div><div class='del'>-"Mandrakelinux fejlesztését, akkor &lt;b&gt;fontolja meg&lt;/b&gt; valamely termékünk "</div><div class='add'>+"Mandrivalinux fejlesztését, akkor &lt;b&gt;fontolja meg&lt;/b&gt; valamely termékünk "</div><div class='ctx'> "vagy szolgáltatásunk megvásárlását."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -17064,10 +17064,10 @@ msgstr "&lt;b&gt;Webes áruház&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ha információt szeretne a Mandrakesoft termékeiről és szolgáltatásairól, "</div><div class='add'>+"Ha információt szeretne a Mandriva termékeiről és szolgáltatásairól, "</div><div class='ctx'> "akkor látogassa meg &lt;b&gt;webes áruházunkat&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -17093,24 +17093,24 @@ msgstr "Látogassa meg a &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; weboldalt"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A &lt;b&gt;Mandrakeclub&lt;/b&gt; a &lt;b&gt;tökéletes kiegészítő&lt;/b&gt; az Ön Mandrakelinux-"</div><div class='add'>+"A &lt;b&gt;Mandriva Club&lt;/b&gt; a &lt;b&gt;tökéletes kiegészítő&lt;/b&gt; az Ön Mandrivalinux-"</div><div class='ctx'> "rendszeréhez."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Használja ki a Mandrakeclub-tagsággal járó &lt;b&gt;előnyöket&lt;/b&gt;, mint például:"</div><div class='add'>+"Használja ki a Mandriva Club-tagsággal járó &lt;b&gt;előnyöket&lt;/b&gt;, mint például:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17132,39 +17132,39 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t- a Mandrakelinux &lt;b&gt;felhasználói fórumainak&lt;/b&gt; használata"</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t- a Mandrivalinux &lt;b&gt;felhasználói fórumainak&lt;/b&gt; használata"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t- &lt;b&gt;korábbi és elsőbbségi hozzáférés&lt;/b&gt; - a nyilvános kiadás előtt - a "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO-fájljaihoz&lt;/b&gt;"</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO-fájljaihoz&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"A &lt;b&gt;Mandrakeonline&lt;/b&gt; egy új szolgáltatás, amelyet a Mandrakesoft büszkén "</div><div class='add'>+"A &lt;b&gt;Mandriva Online&lt;/b&gt; egy új szolgáltatás, amelyet a Mandriva büszkén "</div><div class='ctx'> "kínál vásárlóinak"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"A Mandrakeonline széles körű szolgáltatásokat nyújt Mandrakelinux-rendszerek "</div><div class='add'>+"A Mandriva Online széles körű szolgáltatásokat nyújt Mandrivalinux-rendszerek "</div><div class='ctx'> "&lt;b&gt;egyszerűen végezhető frissítésére&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -17190,41 +17190,41 @@ msgstr "\t- rugalmas, &lt;b&gt;ütemezett&lt;/b&gt; frissítések"</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t- az &lt;b&gt;összes Mandrakelinux-rendszer&lt;/b&gt; kezelése egyetlen azonosítóval"</div><div class='add'>+"\t- az &lt;b&gt;összes Mandrivalinux-rendszer&lt;/b&gt; kezelése egyetlen azonosítóval"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Segítségre&lt;/b&gt; van szüksége? A Mandrakesoft technikai szakértőit "</div><div class='add'>+"&lt;b&gt;Segítségre&lt;/b&gt; van szüksége? A Mandriva technikai szakértőit "</div><div class='ctx'> "megtalálhatja a &lt;b&gt;technikai támogatási oldalunkon&lt;/b&gt;: www.mandrakeexpert."</div><div class='ctx'> "com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A &lt;b&gt;képzett Mandrakelinux-szakértők&lt;/b&gt; segítségének köszönhetően időt "</div><div class='add'>+"A &lt;b&gt;képzett Mandrivalinux-szakértők&lt;/b&gt; segítségének köszönhetően időt "</div><div class='ctx'> "takaríthat meg."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Bármilyen, a Mandrakelinuxszal kapcsolatos kérdés esetén lehetősége van "</div><div class='add'>+"Bármilyen, a Mandrivalinuxszal kapcsolatos kérdés esetén lehetősége van "</div><div class='ctx'> "támogatási egységek vásárlására a &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; helyen."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17522,8 +17522,8 @@ msgstr "Figyelőeszközök, folyamatszámlázás, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft-varázslók"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva-varázslók"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17617,8 +17617,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "OPCIÓK:\n"</div><div class='ctx'> "  --help            - jelen segítség megjelenítése\n"</div><div class='del'>-"  --report          - programnév (a Mandrakelinux-eszközök egyike)\n"</div><div class='del'>-"  --incident        - programnév (a Mandrakelinux-eszközök egyike)"</div><div class='add'>+"  --report          - programnév (a Mandrivalinux-eszközök egyike)\n"</div><div class='add'>+"  --incident        - programnév (a Mandrivalinux-eszközök egyike)"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17673,7 +17673,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17687,7 +17687,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPCIÓK]...\n"</div><div class='del'>-"A Mandrakelinux terminálkiszolgáló (MTS) beállítása\n"</div><div class='add'>+"A Mandrivalinux terminálkiszolgáló (MTS) beállítása\n"</div><div class='ctx'> "--enable         : az MTS bekapcsolása\n"</div><div class='ctx'> "--disable        : az MTS kikapcsolása\n"</div><div class='ctx'> "--start          : az MTS elindítása\n"</div><div class='hunk'>@@ -17744,7 +17744,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17752,7 +17752,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPCIÓ]...\n"</div><div class='ctx'> "  --no-confirmation      az első megerősítési kérdés kihagyása\n"</div><div class='del'>-"                         MandrakeUpdate módban\n"</div><div class='add'>+"                         Mandriva Update módban\n"</div><div class='ctx'> "  --no-verify-rpm        a csomagaláírások ellenőrzésének kihagyása\n"</div><div class='ctx'> "  --changelog-first      a módosítási napló megjelenítése a fájllista\n"</div><div class='ctx'> "                         előtt a leírásablakban\n"</div><div class='hunk'>@@ -20542,13 +20542,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux hibabejelentő program"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux hibabejelentő program"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Vezérlőközpont"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Vezérlőközpont"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20568,8 +20568,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "MandrakeOnline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20613,8 +20613,8 @@ msgstr "Beállítási varázslók"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Adja meg a Mandrakesoft-eszközt:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Adja meg a Mandriva-eszközt:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21044,19 +21044,19 @@ msgstr "Automatikus indítás"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ez a csatoló még nem lett beállítva.\n"</div><div class='del'>-"Használja a \"Csatoló felvétele\" funkciót a Mandrakelinux Vezérlőközpontban."</div><div class='add'>+"Használja a \"Csatoló felvétele\" funkciót a Mandrivalinux Vezérlőközpontban."</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Internetkapcsolat még nem lett beállítva.\n"</div><div class='del'>-"Használja a \"%s\" funkciót a Mandrakelinux Vezérlőközpontban."</div><div class='add'>+"Használja a \"%s\" funkciót a Mandrivalinux Vezérlőközpontban."</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21106,8 +21106,8 @@ msgstr "KDM (KDE bejelentkezéskezelő)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux bejelentkezéskezelő)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux bejelentkezéskezelő)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21406,7 +21406,7 @@ msgstr "Importálás"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21415,7 +21415,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002, Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2001-2002, Mandriva.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (eredeti verzió)\n"</div><div class='hunk'>@@ -21970,14 +21970,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "DrakHelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Ez a program szabad szoftver; a GNU GPL alapján terjeszthető.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Használat: \n"</div><div class='hunk'>@@ -22006,8 +22006,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux segítségrendszer"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux segítségrendszer"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -22681,7 +22681,7 @@ msgstr ""</div><div class='ctx'> "gépbe.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"A Mandrakelinux hardver-adatbázisa a következő helyen található:\n"</div><div class='add'>+"A Mandrivalinux hardver-adatbázisa a következő helyen található:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "http://www.linux-mandrake.com/en/hardware.php3"</div><div class='hunk'>@@ -24725,7 +24725,7 @@ msgstr ""</div><div class='ctx'> "gépbe.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"A Mandrakelinux hardver-adatbázisa a következő helyen található:\n"</div><div class='add'>+"A Mandrivalinux hardver-adatbázisa a következő helyen található:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "http://www.linux-mandrake.com/en/hardware.php3"</div><div class='hunk'>@@ -25559,8 +25559,8 @@ msgstr "A módosítás megtörtént, de az érvénybe lépéséhez ki kell jelen</div><div class='ctx'> # what it did by writing to /var/log/explanations</div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux-eszközök naplói"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux-eszközök naplói"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26079,10 +26079,10 @@ msgstr "A kapcsolat létrejött."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A kapcsolódás nem sikerült.\n"</div><div class='del'>-"Ellenőrizze a beállításokat a Mandrakelinux Vezérlőközpontban."</div><div class='add'>+"Ellenőrizze a beállításokat a Mandrivalinux Vezérlőközpontban."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -27115,13 +27115,13 @@ msgstr "A telepítés hibával ért véget."</div><div class='ctx'> #~ msgstr "Hiba történt %s írásra való megnyitásánál: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "HardDrake - Mandrakelinux hardverbeállítási program.\n"</div><div class='add'>+#~ "HardDrake - Mandrivalinux hardverbeállítási program.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Verzió:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Szerző:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -27451,7 +27451,7 @@ msgstr "A telepítés hibával ért véget."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Nincs beállítva egyetlen internetkapcsolat sem.\n"</div><div class='ctx'> #~ "Kapcsolat létrehozásához használja az \"Internet-hozzáférés\"\n"</div><div class='del'>-#~ "funkciót a Mandrakelinux Vezérlőközpontban."</div><div class='add'>+#~ "funkciót a Mandrivalinux Vezérlőközpontban."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Welcome to the UPS configuration utility.\n"</div><div class='hunk'>@@ -27559,9 +27559,9 @@ msgstr "A telepítés hibával ért véget."</div><div class='ctx'> #~ "A(z) \"%s\" nyomtatót nem sikerült eltávolítani a StarOffice/OpenOffice."</div><div class='ctx'> #~ "org/GIMP programból."</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Congratulations for choosing Mandrakelinux!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Congratulations for choosing Mandrivalinux!&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "&lt;b&gt;Gratulálunk ahhoz, hogy a Mandrakelinux rendszert választotta&lt;/b&gt;"</div><div class='add'>+#~ "&lt;b&gt;Gratulálunk ahhoz, hogy a Mandrivalinux rendszert választotta&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "We would like to thank everyone who participated in the development of "</div><div class='hunk'>@@ -27656,24 +27656,24 @@ msgstr "A telepítés hibával ért véget."</div><div class='ctx'> #~ "Nézzen és szerkesszen képeket illetve fotókat a &lt;b&gt;GQview&lt;/b&gt;-val és a "</div><div class='ctx'> #~ "&lt;b&gt;GIMP&lt;/b&gt;-pel."</div><div class='ctx'> </div><div class='del'>-#~ msgid "Become a &lt;b&gt;Mandrakeclub&lt;/b&gt; member!"</div><div class='del'>-#~ msgstr "Legyen tagja a &lt;b&gt;Mandrakeclub&lt;/b&gt;nak"</div><div class='add'>+#~ msgid "Become a &lt;b&gt;Mandriva Club&lt;/b&gt; member!"</div><div class='add'>+#~ msgstr "Legyen tagja a &lt;b&gt;Mandriva Club&lt;/b&gt;nak"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Take advantage of valuable benefits, products and services by joining "</div><div class='del'>-#~ "Mandrakeclub, such as:"</div><div class='del'>-#~ msgstr "Használja ki a Mandrakeclub-tagsággal járó előnyöket:"</div><div class='add'>+#~ "Mandriva Club, such as:"</div><div class='add'>+#~ msgstr "Használja ki a Mandriva Club-tagsággal járó előnyöket:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Full access to commercial applications"</div><div class='ctx'> #~ msgstr "\t* teljes hozzáférés kereskedelmi alkalmazásokhoz"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"</div><div class='add'>+#~ "\t* Special download mirror list exclusively for Mandriva Club Members"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* letöltési tükörkiszolgálók kizárólagosan a Mandrakeclub-tagok számára"</div><div class='add'>+#~ "\t* letöltési tükörkiszolgálók kizárólagosan a Mandriva Club-tagok számára"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Voting for software to put in Mandrakelinux"</div><div class='del'>-#~ msgstr "\t* szavazás a Mandrakelinux rendszerbe felveendő alkalmazásokról"</div><div class='add'>+#~ msgid "\t* Voting for software to put in Mandrivalinux"</div><div class='add'>+#~ msgstr "\t* szavazás a Mandrivalinux rendszerbe felveendő alkalmazásokról"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Plus much more"</div><div class='ctx'> #~ msgstr "\t* ..."</div><div class='hunk'>@@ -27684,12 +27684,12 @@ msgstr "A telepítés hibával ért véget."</div><div class='ctx'> #~ msgid "Do you require assistance?"</div><div class='ctx'> #~ msgstr "Szüksége van segítségre?"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt; is the primary source for technical support."</div><div class='add'>+#~ msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt; is the primary source for technical support."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "A &lt;b&gt;Mandrakeexpert&lt;/b&gt; az elsődleges forrás a technikai támogatáshoz."</div><div class='add'>+#~ "A &lt;b&gt;Mandriva Expert&lt;/b&gt; az elsődleges forrás a technikai támogatáshoz."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "If you have Linux questions, subscribe to Mandrakeexpert at &lt;b&gt;www."</div><div class='add'>+#~ "If you have Linux questions, subscribe to Mandriva Expert at &lt;b&gt;www."</div><div class='ctx'> #~ "mandrakeexpert.com&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Ha Linuxszal kapcsolatos kérdései vannak, iratkozzon fel a "</div><div class='hunk'>@@ -27742,24 +27742,24 @@ msgstr "A telepítés hibával ért véget."</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Before continuing, you should carefully read the terms of the license. "</div><div class='ctx'> #~ "It\n"</div><div class='del'>-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "</div><div class='add'>+#~ "covers the entire Mandrivalinux distribution. If you do agree with all "</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"</div><div class='ctx'> #~ "will reboot your computer."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Mielőtt továbblépne, olvassa át alaposan a licencegyezményt, amely az\n"</div><div class='del'>-#~ "egész Mandrakelinux disztribúcióra érvényes. Ha elfogadja az abban\n"</div><div class='add'>+#~ "egész Mandrivalinux disztribúcióra érvényes. Ha elfogadja az abban\n"</div><div class='ctx'> #~ "szereplő feltételeket, akkor jelölje be a(z) \"%s\" opciót.\n"</div><div class='ctx'> #~ "Ha nem fogadja el valamelyik feltételt, akkor kattintson a(z)\n"</div><div class='ctx'> #~ "\"%s\" gombra - ezzel újraindítja a számítógépet."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+#~ "The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> #~ "selected package is located on another CD-ROM, DrakX will eject the "</div><div class='ctx'> #~ "current\n"</div><div class='ctx'> #~ "CD and ask you to insert the correct CD as required."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "A Mandrakelinux telepítőanyag több CD-n helyezkedik el. Ha egy "</div><div class='add'>+#~ "A Mandrivalinux telepítőanyag több CD-n helyezkedik el. Ha egy "</div><div class='ctx'> #~ "kiválasztott\n"</div><div class='ctx'> #~ "csomag egy másik CD-n található, akkor a telepítő kiadja az\n"</div><div class='ctx'> #~ "aktuális CD-t, és megkéri Önt, hogy helyezze be a megfelelőt."</div><div class='hunk'>@@ -27902,7 +27902,7 @@ msgstr "A telepítés hibával ért véget."</div><div class='ctx'> #~ "választani."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "At the time you are installing Mandrakelinux, it is likely that some\n"</div><div class='add'>+#~ "At the time you are installing Mandrivalinux, it is likely that some\n"</div><div class='ctx'> #~ "packages will have been updated since the initial release. Bugs may have\n"</div><div class='ctx'> #~ "been fixed, security issues resolved. To allow you to benefit from these\n"</div><div class='ctx'> #~ "updates, you are now able to download them from the Internet. Check \"%s"</div><div class='hunk'>@@ -27917,7 +27917,7 @@ msgstr "A telepítés hibával ért véget."</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "selected package(s), or \"%s\" to abort."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Lehetséges, hogy amikor Ön a Mandrakelinux rendszert telepíti, már\n"</div><div class='add'>+#~ "Lehetséges, hogy amikor Ön a Mandrivalinux rendszert telepíti, már\n"</div><div class='ctx'> #~ "frissítésre kerültek bizonyos csomagok a rendszer kiadása óta.\n"</div><div class='ctx'> #~ "Elképzelhető, hogy bizonyos hibák ki lettek javítva, illetve\n"</div><div class='ctx'> #~ "hogy meg lettek oldva bizonyos felmerült biztonsági problémák. Ezeket\n"</div><div class='hunk'>@@ -28205,10 +28205,10 @@ msgstr "A telepítés hibával ért véget."</div><div class='ctx'> #~ "alkalmazásokat tartalmaz."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='add'>+#~ "Find all Mandriva products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='ctx'> #~ "our full service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Az összes Mandrakesoft-terméket és -szolgáltatást megtalálhatja a "</div><div class='add'>+#~ "Az összes Mandriva-terméket és -szolgáltatást megtalálhatja a "</div><div class='ctx'> #~ "&lt;b&gt;MandrakeStore&lt;/b&gt; webáruházban."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "Become a &lt;b&gt;MandrakeClub&lt;/b&gt; member!"</div><div class='hunk'>@@ -28244,8 +28244,8 @@ msgstr "A telepítés hibával ért véget."</div><div class='ctx'> #~ "  --report          - paraméter: programnév (a Mandrake-eszközök egyike)\n"</div><div class='ctx'> #~ "  --incident        - paraméter: programnév (a Mandrake-eszközök egyike)"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "MandrakeOnline"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "This interface has not been configured yet.\n"</div><div class='head'>diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po<br/>index 5af3e3147..74c004c25 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/id.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/id.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/id.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/id.po</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> # Instalator Grafis Mandrake</div><div class='del'>-# Copyright (C) 1999 Mandrakesoft</div><div class='add'>+# Copyright (C) 1999 Mandriva</div><div class='ctx'> # Budi Rachmanto &lt;rac@linux-mandrake.com&gt;, 2001-2003</div><div class='ctx'> # Linux Indonesia &lt;http://www.linux.or.id&gt;, 1999-2001</div><div class='ctx'> # Mohammad DAMT &lt;mdamt@cdl2000.com&gt;, 1999-2001</div><div class='hunk'>@@ -72,7 +72,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tampaknya proteksi penulisan USB diaktifkan, tetapi USB tidak bisa dilepas "</div><div class='ctx'> "dengan\n"</div><div class='hunk'>@@ -80,7 +80,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klik tombol reboot pada komputer, lepaskan USB, hilangkan proteksinya,\n"</div><div class='del'>-"pasang kembali USB, lalu jalankan Mandrake Move lagi."</div><div class='add'>+"pasang kembali USB, lalu jalankan Mandriva Move lagi."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -98,7 +98,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB Anda tidak mempunyai partisi Windows (FAT). Diperlukan minimal\n"</div><div class='hunk'>@@ -110,14 +110,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Anda bisa melanjutkan proses tanpa USB - Anda akan tetap \n"</div><div class='del'>-"bisa menjalankan Mandrake Move seperti layaknya Sistem Operasi \n"</div><div class='add'>+"bisa menjalankan Mandriva Move seperti layaknya Sistem Operasi \n"</div><div class='ctx'> "Mandrake."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -125,11 +125,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Kami tidak mendeteksi adanya USB pada sistem Anda. Jika \n"</div><div class='del'>-"Anda memasang USB sekarang, Mandrake Move dapat \n"</div><div class='add'>+"Anda memasang USB sekarang, Mandriva Move dapat \n"</div><div class='ctx'> "menyimpan data secara tranparan ke direktori home dan\n"</div><div class='ctx'> "konfigurasi umum sistem, untuk boot selanjutnya dikomputer ini\n"</div><div class='ctx'> "atau komputer lain. Catatan:jika USB dipasang sekarang, tunggu beberapa\n"</div><div class='hunk'>@@ -137,7 +137,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Anda bisa melanjutkan proses tanpa USB - Anda akan tetap \n"</div><div class='del'>-"bisa menjalankan Mandrake Move seperti layaknya Sistem Operasi \n"</div><div class='add'>+"bisa menjalankan Mandriva Move seperti layaknya Sistem Operasi \n"</div><div class='ctx'> "Mandrake."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -263,7 +263,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -279,7 +279,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Hal ini bisa datang dari file konfigurasi sistem pada USB \n"</div><div class='ctx'> "yang terkorupsi, dalam kasus ini menghapus lalu mereboot \n"</div><div class='del'>-"Mandrake Move akan memperbaiki masalah. Untuk melakukannya\n"</div><div class='add'>+"Mandriva Move akan memperbaiki masalah. Untuk melakukannya\n"</div><div class='ctx'> "klik tombol ini.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1316,11 +1316,11 @@ msgstr "Pilihan bahasa"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux mendukung beberapa bahasa. Pilihlah\n"</div><div class='add'>+"Mandrivalinux mendukung beberapa bahasa. Pilihlah\n"</div><div class='ctx'> "bahasa yang akan diinstall. Bahasa pilihan akan ditampilkan\n"</div><div class='ctx'> "setelah proses installasi selesai dan Anda merestart sistem Anda."</div><div class='ctx'> </div><div class='hunk'>@@ -3732,12 +3732,12 @@ msgstr "aktifkan dukungan radio"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bacalah lisensi sebelum melanjutkan. Lisensi mencakup seluruh distribusi\n"</div><div class='del'>-"Mandrakelinux. Jika Anda setuju dengan semua pasal di dalamnya, klik\n"</div><div class='add'>+"Mandrivalinux. Jika Anda setuju dengan semua pasal di dalamnya, klik\n"</div><div class='ctx'> "kotak \"%s\". Jika tidak, klik pada tombol \"%s\" akan mereboot komputer "</div><div class='ctx'> "Anda."</div><div class='ctx'> </div><div class='hunk'>@@ -3918,13 +3918,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Installasi Mandrakelinux didistribusikan pada beberapa CDROM. DrakX tahu "</div><div class='add'>+"Installasi Mandrivalinux didistribusikan pada beberapa CDROM. DrakX tahu "</div><div class='ctx'> "jika paket\n"</div><div class='ctx'> "terpilih berada di CDROM lain dan akan mengeluarkan CD yang ada untuk "</div><div class='ctx'> "kemudian\n"</div><div class='hunk'>@@ -3936,11 +3936,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3993,11 +3993,11 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sekarang waktunya untuk menentukan program yang akan diinstal. Terdapat "</div><div class='ctx'> "ribuan \n"</div><div class='del'>-"pada Mandrakelinux, dan untuk mempermudah, mereka telah diletakkan pada "</div><div class='add'>+"pada Mandrivalinux, dan untuk mempermudah, mereka telah diletakkan pada "</div><div class='ctx'> "grup \n"</div><div class='ctx'> "aplikasi yang sejenis.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux mengurutkan paket dalam empat kategori. Anda bisa "</div><div class='add'>+"Mandrivalinux mengurutkan paket dalam empat kategori. Anda bisa "</div><div class='ctx'> "menggabungkan \n"</div><div class='ctx'> "menyesuaikan aplikasi dari berbagai kategori, sehingga installasi "</div><div class='ctx'> "``Workstation''\n"</div><div class='hunk'>@@ -4106,10 +4106,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4141,9 +4141,9 @@ msgstr ""</div><div class='ctx'> "!! Jika paket server terpilih dengan sengaja atau karena merupakan bagian "</div><div class='ctx'> "suatu\n"</div><div class='ctx'> "grup besar, akan ada pertanyaan konfirmasi installasi paket tersebut. Pada\n"</div><div class='del'>-"Mandrakelinux, secara default semua server terinstal dijalankan saat boot.\n"</div><div class='add'>+"Mandrivalinux, secara default semua server terinstal dijalankan saat boot.\n"</div><div class='ctx'> "Meski aman saat distribusi diluncurkan, ada kemungkinan lubang keamanan\n"</div><div class='del'>-"ditemukan setelah versi Mandrakelinux ini selesai. Jika Anda tidak tahu apa\n"</div><div class='add'>+"ditemukan setelah versi Mandrivalinux ini selesai. Jika Anda tidak tahu apa\n"</div><div class='ctx'> "yang dilakukan oleh suatu layanan atau mengapa ia diinstal, klik \"%s\".\n"</div><div class='ctx'> "Jika Anda menekan \"%s\" layanan terdaftar akan diinstal dan akan "</div><div class='ctx'> "dijalankan\n"</div><div class='hunk'>@@ -4308,7 +4308,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4364,7 +4364,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (untuk X Window System) adalah jantung dari interface grafis GNU/Linux\n"</div><div class='ctx'> "yang diperlukan oleh semua lingkungan grafis (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, dll.) yang dibundel pada Mandrakelinux.\n"</div><div class='add'>+"WindowMaker, dll.) yang dibundel pada Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Anda akan melihat daftar parameter yang berbeda untuk merubah untuk "</div><div class='ctx'> "mendapatkan\n"</div><div class='hunk'>@@ -4494,12 +4494,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4526,7 +4526,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4535,7 +4535,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4557,11 +4557,11 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sekarang Anda harus menentukan dimana Anda hendak menginstall sistem "</div><div class='ctx'> "operasi\n"</div><div class='del'>-"Mandrakelinux pada harddisk Anda. Jika harddisk Anda kosong atau jika "</div><div class='add'>+"Mandrivalinux pada harddisk Anda. Jika harddisk Anda kosong atau jika "</div><div class='ctx'> "sebuah\n"</div><div class='ctx'> "sistem operasi menggunakan semua tempat, Anda harus mempartisi drive.\n"</div><div class='ctx'> "Pada dasarnya, mempartisi harddisk berarti membaginya secara logical\n"</div><div class='del'>-"untuk membuat ruang yang diperlukan sistem Mandrakelinux baru Anda.\n"</div><div class='add'>+"untuk membuat ruang yang diperlukan sistem Mandrivalinux baru Anda.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Karena proses partisi harddisk biasanya tidak bisa dikembalikan dan bisa \n"</div><div class='ctx'> "mengacu pada kehilangan data, partisi bisa menegangkan dan membuat stress\n"</div><div class='hunk'>@@ -4598,7 +4598,7 @@ msgstr ""</div><div class='ctx'> "dengan sebelumnya Anda sudah mendefrag partisi Windows.\n"</div><div class='ctx'> "Membackup data sangat disarankan. Penggunaan opsi ini sangat "</div><div class='ctx'> "direkomendasikan jika Anda\n"</div><div class='del'>-"ingin menggunakan Mandrakelinux dan Microsoft Windows pada komputer yang "</div><div class='add'>+"ingin menggunakan Mandrivalinux dan Microsoft Windows pada komputer yang "</div><div class='ctx'> "sama.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Sebelum memilih opsi ini, harap dipahami bahwa setelah prosedur ini, "</div><div class='hunk'>@@ -4611,7 +4611,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". Jika Anda hendak menghapus seluruh data dan semua partisi yang "</div><div class='ctx'> "ada pada harddisk\n"</div><div class='del'>-"Anda dan menggantinya dengan sistem Mandrakelinux yang baru, pilih opsi ini. "</div><div class='add'>+"Anda dan menggantinya dengan sistem Mandrivalinux yang baru, pilih opsi ini. "</div><div class='ctx'> "Hati-hati, karena\n"</div><div class='ctx'> "Anda tidak bisa membatalkan opsi ini setelah Anda mengkonfirmasikan.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4780,7 +4780,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4802,7 +4802,7 @@ msgstr ""</div><div class='ctx'> "Klik pada \"%s\" ketika Anda siap memformat partisi.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klik pada \"%s\" jika Anda hendak memilih partisi lain untuk \n"</div><div class='del'>-"installasi sistem operasi Mandrakelinux baru Anda.\n"</div><div class='add'>+"installasi sistem operasi Mandrivalinux baru Anda.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klik pada \"%s\" jika Anda hendak memilih partisi yang hendak \n"</div><div class='ctx'> "diperiksa untuk block rusak pada disk."</div><div class='hunk'>@@ -4819,7 +4819,7 @@ msgstr "Sebelumnya"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4831,7 +4831,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Saat Mandrakelinux diinstal, mungkin beberapa paket telah diupdate sejak\n"</div><div class='add'>+"Saat Mandrivalinux diinstal, mungkin beberapa paket telah diupdate sejak\n"</div><div class='ctx'> "rilis awal. Beberapa kesalahan mungkin telah diperbaiki / masalah keamanan\n"</div><div class='ctx'> "dipecahkan. Untuk memanfaatkan update ini Anda dapat men-download-nya dari\n"</div><div class='ctx'> "Internet. Pilih \"%s\" jika Anda memiliki koneksi Internet, atau \"%s\" "</div><div class='hunk'>@@ -4859,7 +4859,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4872,7 +4872,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Jika Anda tidak tahu apa yang akan dipilih, gunakan opsi default. Anda\n"</div><div class='ctx'> "mampu mengubahnya menggunakan perkakas draksec, yang merupakan bagian\n"</div><div class='del'>-"dari dari Pusat Kontrol Mandrakelinux.\n"</div><div class='add'>+"dari dari Pusat Kontrol Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Isi bagian \"%s\" dengan alamat email dari orang yang bertanggung jawab\n"</div><div class='ctx'> "atas keaman. Pesan keamanan akan dikirimkan pada alamat tersebut."</div><div class='hunk'>@@ -4886,7 +4886,7 @@ msgstr "Administrator Keamanan"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4957,7 +4957,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Saat ini, Anda harus memilih partisi yang akan digunakan untuk installasi\n"</div><div class='del'>-"sistem Mandrakelinux Anda. Jika partisi telah didefinisikan, baik dari\n"</div><div class='add'>+"sistem Mandrivalinux Anda. Jika partisi telah didefinisikan, baik dari\n"</div><div class='ctx'> "installasi GNU/Linux sebelumnya atau melalui perkakas partisi lainnya,\n"</div><div class='ctx'> "Anda bisa menggunakan partisi yang ada. Jika tidak, partisi harddisk \n"</div><div class='ctx'> "harus didefinisikan.\n"</div><div class='hunk'>@@ -5041,7 +5041,7 @@ msgstr "Ubah ke modus normal/ahli"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5118,7 +5118,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5127,18 +5127,18 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tahap ini hanya aktif jika partisi GNU/Linux lama ditemukan.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX perlu tahu Anda ingin melakukan installasi baru atau upgrade sistem\n"</div><div class='del'>-"Mandrakelinux yang sudah ada:\n"</div><div class='add'>+"Mandrivalinux yang sudah ada:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "* \"%s\": Untuk sebagian besar bagian, opsi ini menghapus sistem lama.\n"</div><div class='ctx'> "Namun, bergantung pada skema partisi Anda, Anda bisa mencegah data Anda\n"</div><div class='hunk'>@@ -5147,11 +5147,11 @@ msgstr ""</div><div class='ctx'> "harus menggunakan opsi ini.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "* \"%s\": Kelas installasi ini akan mengupdate paket yang terinstall\n"</div><div class='del'>-"pada sistem Mandrakelinux Anda. Skema partisi dan data pengguna Anda\n"</div><div class='add'>+"pada sistem Mandrivalinux Anda. Skema partisi dan data pengguna Anda\n"</div><div class='ctx'> "tidak akan diubah. Sebagian besar langkah konfigurasi yang tersisa\n"</div><div class='ctx'> "serupa pada installasi standar.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Menggunakan opsi ``Upgrade'' seharusnya berjalan pada Mandrakelinux\n"</div><div class='add'>+"Menggunakan opsi ``Upgrade'' seharusnya berjalan pada Mandrivalinux\n"</div><div class='ctx'> "versi \"8.1\" keatas. Melakukan upgrade pada versi sebelum \"8.1\"\n"</div><div class='ctx'> "tidak dianjurkan."</div><div class='ctx'> </div><div class='hunk'>@@ -5210,7 +5210,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5251,7 +5251,7 @@ msgstr ""</div><div class='ctx'> "Tentang dukungan UTF-8 (unicode): Unicode adalah enkoding karakter yang\n"</div><div class='ctx'> "baru yang ditujukan untuk mencakup seluruh bahasa yang ada. Namun \n"</div><div class='ctx'> "dukungan penuh pada GNU/Linux sedang dalam pengembangan. Untuk alasan\n"</div><div class='del'>-"tersebut, penggunaan UTF-8 pada Mandrakelinux bergantung pada pilihan\n"</div><div class='add'>+"tersebut, penggunaan UTF-8 pada Mandrivalinux bergantung pada pilihan\n"</div><div class='ctx'> "pengguna:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Jika Anda memilih menggunakan bahasa dengan enkoding yang kuat (bahasa\n"</div><div class='hunk'>@@ -5485,7 +5485,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5506,11 +5506,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sekarang, waktunya memilih sistem pencetakan untuk komputer Anda. Sistem\n"</div><div class='del'>-"operasi lain mungkin menawarkan satu, tetapi Mandrakelinux menawarkan dua.\n"</div><div class='add'>+"operasi lain mungkin menawarkan satu, tetapi Mandrivalinux menawarkan dua.\n"</div><div class='ctx'> "Setiap sistem pencetakan sesuai untuk jenis konfigurasi tertentu.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" - yang merupakan akronim untuk ``print, tidak ada antrian'',\n"</div><div class='hunk'>@@ -5648,7 +5648,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5665,7 +5665,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5716,7 +5716,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": jika Anda hendak mengkonfigurasi akses jaringan Internet\n"</div><div class='ctx'> "atau lokal Anda, Anda bisa melakukannya sekarang. Lihat dokumentasi\n"</div><div class='del'>-"cetak atau gunakan Pusat Kontrol Mandrakelinux setelah installasi\n"</div><div class='add'>+"cetak atau gunakan Pusat Kontrol Mandrivalinux setelah installasi\n"</div><div class='ctx'> "selesai untuk mengambil keuntungan dari bantuannya.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": mengijinkan Anda mengkonfigurasi alamat proxy HTTP dan\n"</div><div class='hunk'>@@ -5733,7 +5733,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": jika Anda hendak merubah konfigurasi bootloader Anda, klik\n"</div><div class='ctx'> "tombol ini. Opsi ini ditujukan untuk pengguna tingkat lanjut. Lihat\n"</div><div class='ctx'> "dokumentasi cetak atau bantuan tentang konfigurasi bootloader pada \n"</div><div class='del'>-"Pusat Kontrol Mandrakelinux.\n"</div><div class='add'>+"Pusat Kontrol Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": melalui daftar ini Anda bisa menentukan layanan apa yang\n"</div><div class='ctx'> "akan dijalankan pada komputer Anda. Jika Anda berencana untuk memakai\n"</div><div class='hunk'>@@ -5795,10 +5795,10 @@ msgstr "Layanan"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pilih harddrive yang akan dihapus untuk menginstall partisi Mandrakelinux\n"</div><div class='add'>+"Pilih harddrive yang akan dihapus untuk menginstall partisi Mandrivalinux\n"</div><div class='ctx'> "baru Anda. Hati-hati, semua data pada drive ini akan hilang dan\n"</div><div class='ctx'> "tidak dapat dikembalikan seperti semula!"</div><div class='ctx'> </div><div class='hunk'>@@ -6150,11 +6150,11 @@ msgstr "Menghitung ukuran partisi Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Partisi Windows Anda terlalu terfragmen. Harap reboot komputer Anda pada "</div><div class='del'>-"Windows, jalankan utilitas ``defrag'', lalu ulangi installasi Mandrakelinux."</div><div class='add'>+"Windows, jalankan utilitas ``defrag'', lalu ulangi installasi Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6272,19 +6272,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6306,7 +6306,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6314,14 +6314,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6331,7 +6331,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6351,10 +6351,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6365,11 +6365,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6385,7 +6385,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6402,7 +6402,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6424,7 +6424,7 @@ msgstr ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6432,14 +6432,14 @@ msgstr ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6469,10 +6469,10 @@ msgstr ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6483,11 +6483,11 @@ msgstr ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Linux-Mandrake\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6503,7 +6503,7 @@ msgstr ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6593,7 +6593,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6601,13 +6601,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Selamat, installasi selesai.\n"</div><div class='ctx'> "Ambil media boot dan tekan Return/Enter untuk reboot.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Untuk informasi perbaikan yang tersedia untuk rilis Mandrakelinux\n"</div><div class='add'>+"Untuk informasi perbaikan yang tersedia untuk rilis Mandrivalinux\n"</div><div class='ctx'> "ini, silakan lihat Errata yang tersedia pada:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6615,7 +6615,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informasi tentang konfigurasi sistem tersedia pada bab Pasca\n"</div><div class='del'>-"Installasi di Panduan Pengguna Resmi Linux Mandrakelinux."</div><div class='add'>+"Installasi di Panduan Pengguna Resmi Linux Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6650,12 +6650,12 @@ msgstr "Memasuki langkah `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sumber daya sistem Anda rendah. Anda akan mengalami kesulitan\n"</div><div class='del'>-"menginstall Mandrakelinux. Jika terjadi, Anda bisa mencoba\n"</div><div class='add'>+"menginstall Mandrivalinux. Jika terjadi, Anda bisa mencoba\n"</div><div class='ctx'> "installasi berbasis teks. Untuk melakukannya, tekan `F1' saat\n"</div><div class='ctx'> "booting pada CDROM, lalu ketikkan `text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7192,8 +7192,8 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='del'>-msgstr "Menghubungi situs Mandrakelinux untuk mengambil daftar mirror..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='add'>+msgstr "Menghubungi situs Mandrivalinux untuk mengambil daftar mirror..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7416,8 +7416,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Installasi Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Installasi Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10219,13 +10219,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "konfigurator drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Program ini mengkonfigurasi firewall pribadi untuk Mandrakelinux.\n"</div><div class='add'>+"Program ini mengkonfigurasi firewall pribadi untuk Mandrivalinux.\n"</div><div class='ctx'> "Untuk membuat solusi firewall yang lebih baik, cobalah\n"</div><div class='ctx'> "distribusi khusus MandrakeSecurity Firewall"</div><div class='ctx'> </div><div class='hunk'>@@ -14264,12 +14264,12 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Jalankan Scannerdrake (Perangkat Lunak/Scanner pada Pusat Kontrol "</div><div class='del'>-"Mandrakelinux) untuk berbagi scanner pada jaringan.\n"</div><div class='add'>+"Mandrivalinux) untuk berbagi scanner pada jaringan.\n"</div><div class='ctx'> </div><div class='ctx'> #: printer/printerdrake.pm:3933</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16182,33 +16182,33 @@ msgstr "Stop"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Apa itu Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Apa itu Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Selamat Datang di &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Selamat Datang di &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux adalah sebuah &lt;b&gt;distribusi Linux&lt;/b&gt; yang menggabungkan inti "</div><div class='add'>+"Mandrivalinux adalah sebuah &lt;b&gt;distribusi Linux&lt;/b&gt; yang menggabungkan inti "</div><div class='ctx'> "sistem, yang disebut &lt;b&gt;sistem operasi&lt;/b&gt; (berbasiskan kernel Linux) dengan "</div><div class='ctx'> "&lt;b&gt;banyak aplikasi&lt;/b&gt; yang sesuai kebutuhan Anda."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux juga merupakan distribusi Linux paling &lt;b&gt;ramah pengguna&lt;/b&gt;. "</div><div class='add'>+"Mandrivalinux juga merupakan distribusi Linux paling &lt;b&gt;ramah pengguna&lt;/b&gt;. "</div><div class='ctx'> "Ia juga merupakan distribusi Linux yang &lt;b&gt;paling banyak digunakan&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16224,14 +16224,14 @@ msgstr "Selamat datang di &lt;b&gt;dunia open source&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux berkomitmen dengan model open source. Hal ini berarti rilis "</div><div class='del'>-"baru adalah hasil &lt;b&gt;kolaborasi&lt;/b&gt; antara &lt;b&gt;tim pengembang Mandrakesoft&lt;/"</div><div class='del'>-"b&gt; dengan &lt;b&gt;komunitas&lt;/b&gt; kontributor Mandrakelinux."</div><div class='add'>+"Mandrivalinux berkomitmen dengan model open source. Hal ini berarti rilis "</div><div class='add'>+"baru adalah hasil &lt;b&gt;kolaborasi&lt;/b&gt; antara &lt;b&gt;tim pengembang Mandriva&lt;/"</div><div class='add'>+"b&gt; dengan &lt;b&gt;komunitas&lt;/b&gt; kontributor Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16251,10 +16251,10 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sebagian besar perangkat lunak yang disertakan pada distribusi ini dan semua "</div><div class='del'>-"perkakas Mandrakelinux berada dibawah lisensi &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"perkakas Mandrivalinux berada dibawah lisensi &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16284,15 +16284,15 @@ msgstr "&lt;b&gt;Bergabung dengan Komunitas&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux memiliki salah satu &lt;b&gt;komunitas terbesar&lt;/b&gt; dari pengguna "</div><div class='add'>+"Mandrivalinux memiliki salah satu &lt;b&gt;komunitas terbesar&lt;/b&gt; dari pengguna "</div><div class='ctx'> "dan pengembang. Fungsi dari komunitas sangatlah luas, mulai dari pelaporan "</div><div class='ctx'> "kesalahan hingga pengembangan aplikasi baru. Komunitas memainkan &lt;b&gt;peran&lt;/"</div><div class='del'>-"b&gt; dalam dunia Mandrakelinux."</div><div class='add'>+"b&gt; dalam dunia Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16313,10 +16313,10 @@ msgstr "&lt;b&gt;Versi Download&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Saat ini Anda akan menginstall &lt;b&gt;Mandrakelinux Versi Download&lt;/b&gt;. Ini "</div><div class='add'>+"Saat ini Anda akan menginstall &lt;b&gt;Mandrivalinux Versi Download&lt;/b&gt;. Ini "</div><div class='ctx'> "merupakan versi gratis yang &lt;b&gt;tersedia untuk semua&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -16348,10 +16348,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Anda tidak akan mendapatkan akses ke &lt;b&gt;layanan yang disertakan&lt;/b&gt; pada "</div><div class='del'>-"produk Mandrakesoft lainnya."</div><div class='add'>+"produk Mandriva lainnya."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16360,8 +16360,8 @@ msgstr "&lt;b&gt;Discovery, Desktop Linux Pertama Anda&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Anda sekarang akan menginstall &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Anda sekarang akan menginstall &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16383,17 +16383,17 @@ msgstr "&lt;b&gt;PowerPack, Desktop Linux Handal&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Anda akan menginstall &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Anda akan menginstall &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack adalah produk &lt;b&gt;desktop Linux khusus&lt;/b&gt; Mandrakesoft. PowerPack "</div><div class='add'>+"PowerPack adalah produk &lt;b&gt;desktop Linux khusus&lt;/b&gt; Mandriva. PowerPack "</div><div class='ctx'> "menyertakan &lt;b&gt;ribuan aplikasi&lt;/b&gt; - semua dari yang paling populer hingga "</div><div class='ctx'> "yang paling canggih."</div><div class='ctx'> </div><div class='hunk'>@@ -16404,8 +16404,8 @@ msgstr "&lt;b&gt;PowerPack+, Solusi Linux untuk Desktop dan Server&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Anda akan menginstall &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Anda akan menginstall &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16421,22 +16421,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produk Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produk Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; telah mengembangkan produk &lt;b&gt;Mandrakelinux&lt;/b&gt; yang "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; telah mengembangkan produk &lt;b&gt;Mandrivalinux&lt;/b&gt; yang "</div><div class='ctx'> "luas."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Produk Mandrakelinux adalah:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Produk Mandrivalinux adalah:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16456,72 +16456,72 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, Solusi Linux untuk Desktop dan Server."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux untuk x86-64&lt;/b&gt;, Solusi Mandrakelinux untuk "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux untuk x86-64&lt;/b&gt;, Solusi Mandrivalinux untuk "</div><div class='ctx'> "memaksimalkan prosesor 64-bit Anda."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produk Mandrakesoft (Produk Nomad)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produk Mandriva (Produk Nomad)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft telah mengembangan dua produk yang mengijinkan Anda menggunakan "</div><div class='del'>-"Mandrakelinux &lt;b&gt;pada sembarang komputer&lt;/b&gt; dan tanpa harus menginstallnya:"</div><div class='add'>+"Mandriva telah mengembangan dua produk yang mengijinkan Anda menggunakan "</div><div class='add'>+"Mandrivalinux &lt;b&gt;pada sembarang komputer&lt;/b&gt; dan tanpa harus menginstallnya:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, distribusi Mandrakelinux yang berjalan sepenuhnya melalui "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, distribusi Mandrivalinux yang berjalan sepenuhnya melalui "</div><div class='ctx'> "CD-ROM bootable."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, distribusi Mandrakelinux yang terinstall pada ultra-"</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, distribusi Mandrivalinux yang terinstall pada ultra-"</div><div class='ctx'> "compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produk Mandrakesoft (Solusi Professional)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produk Mandriva (Solusi Professional)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Dibawah ini adalah produk Mandrakesoft yang didesain untuk memenuhi "</div><div class='add'>+"Dibawah ini adalah produk Mandriva yang didesain untuk memenuhi "</div><div class='ctx'> "&lt;b&gt;kebutuhan professional&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Desktop Mandrakelinux untuk Bisnis."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Desktop Mandrivalinux untuk Bisnis."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Solusi Server Mandrakelinux."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Solusi Server Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Solusi Keamanan Mandrakelinux."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Solusi Keamanan Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16564,10 +16564,10 @@ msgstr "&lt;b&gt;Pilih Lingkungan Desktop Favorit Anda&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dengan PowerPack, Anda akan memiliki pilihan untuk &lt;b&gt;lingkungan desktop "</div><div class='del'>-"grafis&lt;/b&gt;. Mandrakesoft telah memilih &lt;b&gt;KDE&lt;/b&gt; sebagai default."</div><div class='add'>+"grafis&lt;/b&gt;. Mandriva telah memilih &lt;b&gt;KDE&lt;/b&gt; sebagai default."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16591,10 +16591,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dengan PowerPack+, Anda akan memiliki pilihan untuk &lt;b&gt;lingkungan desktop "</div><div class='del'>-"grafis&lt;/b&gt;. Mandrakesoft telah memilih &lt;b&gt;KDE&lt;/b&gt; sebagai default."</div><div class='add'>+"grafis&lt;/b&gt;. Mandriva telah memilih &lt;b&gt;KDE&lt;/b&gt; sebagai default."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16720,10 +16720,10 @@ msgstr "&lt;b&gt;Menikmati Aplikasi yang Luas&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pada menu Mandrakelinux Anda akan menemukan aplikasi &lt;b&gt;mudah digunakan&lt;/b&gt; "</div><div class='add'>+"Pada menu Mandrivalinux Anda akan menemukan aplikasi &lt;b&gt;mudah digunakan&lt;/b&gt; "</div><div class='ctx'> "untuk &lt;b&gt;semua tugas Anda&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16989,18 +16989,18 @@ msgstr "\t* &lt;b&gt;Postfix&lt;/b&gt; dan &lt;b&gt;Sendmail&lt;/b&gt;: server mail paling populer."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Pusat Kontrol Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Pusat Kontrol Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Pusat Kontrol Mandrakelinux&lt;/b&gt; adalah kumpulan koleksi penting dari "</div><div class='del'>-"utilitas khusus Mandrakelinux yang didesain untuk mempermudah konfigurasi "</div><div class='add'>+"&lt;b&gt;Pusat Kontrol Mandrivalinux&lt;/b&gt; adalah kumpulan koleksi penting dari "</div><div class='add'>+"utilitas khusus Mandrivalinux yang didesain untuk mempermudah konfigurasi "</div><div class='ctx'> "komputer Anda."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -17024,16 +17024,16 @@ msgstr "&lt;b&gt;Model Open Source&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Seperti semua pemrograman komputer, perangkat lunak open source "</div><div class='ctx'> "&lt;b&gt;membutuhkan waktu dan orang&lt;/b&gt; untuk pengembangan. Untuk menghargai "</div><div class='del'>-"filosofi open source, Mandrakesoft menjual produk dan layanan yang bernilai "</div><div class='del'>-"lebih untuk &lt;b&gt;meningkatkan Mandrakelinux&lt;/b&gt;. Jika Anda ingin &lt;b&gt;mendukung "</div><div class='del'>-"filosofi open source&lt;/b&gt; dan pengembangan dari Mandrakelinux, &lt;b&gt;silahkan&lt;/"</div><div class='add'>+"filosofi open source, Mandriva menjual produk dan layanan yang bernilai "</div><div class='add'>+"lebih untuk &lt;b&gt;meningkatkan Mandrivalinux&lt;/b&gt;. Jika Anda ingin &lt;b&gt;mendukung "</div><div class='add'>+"filosofi open source&lt;/b&gt; dan pengembangan dari Mandrivalinux, &lt;b&gt;silahkan&lt;/"</div><div class='ctx'> "b&gt; mempertimbangkan untuk membeli salah satu produk atau layanan kami!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -17044,10 +17044,10 @@ msgstr "&lt;b&gt;Toko Online&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Untuk mempelajari tentang produk dan layanan Mandrakesoft, Anda bisa "</div><div class='add'>+"Untuk mempelajari tentang produk dan layanan Mandriva, Anda bisa "</div><div class='ctx'> "mengujungi &lt;b&gt;platform e-commerce&lt;/b&gt; kami."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -17073,25 +17073,25 @@ msgstr "Berkunjunglah sekarang pada &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; adalah &lt;b&gt;pelengkap sempurna&lt;/b&gt; untuk produk "</div><div class='del'>-"Mandrakelinux Anda..."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; adalah &lt;b&gt;pelengkap sempurna&lt;/b&gt; untuk produk "</div><div class='add'>+"Mandrivalinux Anda..."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ambil keuntungan dari &lt;b&gt;keuntungan bernilai&lt;/b&gt; dengan bergabung dengan "</div><div class='del'>-"Mandrakeclub, seperti:"</div><div class='add'>+"Mandriva Club, seperti:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17112,40 +17112,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Partisipasi pada &lt;b&gt;forum pengguna&lt;/b&gt; Mandrakelinux."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Partisipasi pada &lt;b&gt;forum pengguna&lt;/b&gt; Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Akses cepat dan khusus&lt;/b&gt;, sebelum rilis publik, untuk &lt;b&gt;citra ISO&lt;/"</div><div class='del'>-"b&gt; Mandrakelinux."</div><div class='add'>+"b&gt; Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; adalah layanan premium baru yang diperkenalkan "</div><div class='del'>-"Mandrakesoft bagi konsumennya!."</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; adalah layanan premium baru yang diperkenalkan "</div><div class='add'>+"Mandriva bagi konsumennya!."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline menawarkan layanan yang luas untuk &lt;b&gt;kemudahan update&lt;/b&gt; "</div><div class='del'>-"dari sistem Mandrakelinux Anda:"</div><div class='add'>+"Mandriva Online menawarkan layanan yang luas untuk &lt;b&gt;kemudahan update&lt;/b&gt; "</div><div class='add'>+"dari sistem Mandrivalinux Anda:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17169,40 +17169,40 @@ msgstr "\t* Update &lt;b&gt;terjadwal&lt;/b&gt; yang fleksibel."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Pengelolaan &lt;b&gt;semua sistem Mandrakelinux Anda&lt;/b&gt; dengan satu account."</div><div class='add'>+"\t* Pengelolaan &lt;b&gt;semua sistem Mandrivalinux Anda&lt;/b&gt; dengan satu account."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Apakah Anda membutuhkan &lt;b&gt;asisten?&lt;/b&gt; Temukan teknisi ahli Mandrakesoft "</div><div class='add'>+"Apakah Anda membutuhkan &lt;b&gt;asisten?&lt;/b&gt; Temukan teknisi ahli Mandriva "</div><div class='ctx'> "pada &lt;b&gt;platform dukungan teknis kami&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Terima kasih kepada bantuan dari &lt;b&gt;ahli berkualitas Mandrakelinux&lt;/b&gt;, Anda "</div><div class='add'>+"Terima kasih kepada bantuan dari &lt;b&gt;ahli berkualitas Mandrivalinux&lt;/b&gt;, Anda "</div><div class='ctx'> "akan menghemat banyak waktu."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Untuk sembarang pertanyaan yang berhubungan dengan Mandrakelinux, Anda "</div><div class='add'>+"Untuk sembarang pertanyaan yang berhubungan dengan Mandrivalinux, Anda "</div><div class='ctx'> "memiliki kesempatan untuk membeli dukungan insiden pada &lt;b&gt;store."</div><div class='ctx'> "mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='hunk'>@@ -17503,8 +17503,8 @@ msgstr "Perkakas pengawasan, akuntasi proses, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Wizard Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Wizard Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17652,7 +17652,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17723,14 +17723,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPSI]...\n"</div><div class='del'>-"  --no-confirmation      tidak ada konfirmasi awal pada mode MandrakeUpdate\n"</div><div class='add'>+"  --no-confirmation      tidak ada konfirmasi awal pada mode Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        tidak ada verifikasi tandatangan paket\n"</div><div class='ctx'> "  --changelog-first      tampilkan changelog sebelum filelist di window "</div><div class='ctx'> "penjelasan\n"</div><div class='hunk'>@@ -20493,13 +20493,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Perkakas Pelapor Kesalahan Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Perkakas Pelapor Kesalahan Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Pusat Kontrol Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Pusat Kontrol Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20519,8 +20519,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20564,8 +20564,8 @@ msgstr "Wizard Konfigurasi"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Pilih Perkakas Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Pilih Perkakas Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20990,19 +20990,19 @@ msgstr "Dijalankan saat boot"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Antarmuka ini belum terkonfigurasi.\n"</div><div class='del'>-"Jalankan asisten \"Tambahkan antarmuka\" dari Pusat Kontrol Mandrakelinux"</div><div class='add'>+"Jalankan asisten \"Tambahkan antarmuka\" dari Pusat Kontrol Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Anda tidak memiliki koneksi Internet yang terkonfigurasi.\n"</div><div class='del'>-"Jalankan asisten \"%s\" dari Pusat Kontrol Mandrakelinux"</div><div class='add'>+"Jalankan asisten \"%s\" dari Pusat Kontrol Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21052,8 +21052,8 @@ msgstr "KDM (KDE Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21351,7 +21351,7 @@ msgstr "Import"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21360,7 +21360,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Hak Cipta (C) 2001-2002 oleh Mandrakesoft \n"</div><div class='add'>+"Hak Cipta (C) 2001-2002 oleh Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (versi orisinal)\n"</div><div class='hunk'>@@ -21904,14 +21904,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Hak Cipta (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Hak Cipta (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Ini merupakan free software dan dapat didistribusikan ulang dibawah aturan "</div><div class='ctx'> "GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21941,8 +21941,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Pusat Bantuan Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Pusat Bantuan Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25473,8 +25473,8 @@ msgstr "Perubahan selesai, tetapi agar efektif, Anda harus logout"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Log Perkakas Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Log Perkakas Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25997,10 +25997,10 @@ msgstr "Koneksi selesai."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Koneksi gagal.\n"</div><div class='del'>-"Periksa konfigurasi Anda pada Pusat Kontrol Mandrakelinux."</div><div class='add'>+"Periksa konfigurasi Anda pada Pusat Kontrol Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -27486,8 +27486,8 @@ msgstr "Installasi gagal"</div><div class='ctx'> #~ "  --report          - program harus berupa perkakas mandrake\n"</div><div class='ctx'> #~ "  --incident        - program harus berupa perkakas mandrake"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Connection failed.\n"</div><div class='head'>diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po<br/>index 7b66d6e16..eb9473d14 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/is.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/is.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/is.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/is.po</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # translation of DrakX-is.po to Icelandic</div><div class='ctx'> # Translation file for Mandrake graphic install, DrakX</div><div class='ctx'> # Copyright (C) 1999,2003, 2005 Free Software Foundation, Inc.</div><div class='del'>-# Copyright (C) 1999 Mandrakesoft</div><div class='add'>+# Copyright (C) 1999 Mandriva</div><div class='ctx'> # Jóhann Þorvarðarson &lt;johann.torvardarson@lais.is&gt;, 1999-2000.</div><div class='ctx'> # Þórarinn (Tony) R. Einarsson &lt;thori@mindspring.com&gt;, 1999-2000.</div><div class='ctx'> # Pjetur G. Hjaltason &lt;pjetur@pjetur.net&gt;, 2003, 2005.</div><div class='hunk'>@@ -72,14 +72,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB lykillinn virðist vera með virka ritvörn, en við getum ekki aftengt\n"</div><div class='ctx'> "hann með öryggi núna.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Smelltu á hnappinn til að endurræsa vélina, aftengdu lykilinn, fjarlægðu\n"</div><div class='del'>-"ritvörnina, tengdu lykilin aftur og ræstu Mandrake Move aftur."</div><div class='add'>+"ritvörnina, tengdu lykilin aftur og ræstu Mandriva Move aftur."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -97,7 +97,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB lykillinn þinn inniheldur ekki neinar gildar Windows (FAT) disksneiðar.\n"</div><div class='hunk'>@@ -108,13 +108,13 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Þú getur einnig haldið áfram án USB lykils - þú getur samt notað\n"</div><div class='del'>-"Mandrake Move eins og venjulegt Mandrake stýrikerfi."</div><div class='add'>+"Mandriva Move eins og venjulegt Mandrake stýrikerfi."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -122,18 +122,18 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Við fundum engan USB lykil á kerfinu þínu. Ef þú tengir USB\n"</div><div class='del'>-"lykil núna, þá mun Mandrake Move vista gögnin þín á þínu\n"</div><div class='add'>+"lykil núna, þá mun Mandriva Move vista gögnin þín á þínu\n"</div><div class='ctx'> "heimasvæði auk kerfisuppsetninga, þær varðveitast þá þegar\n"</div><div class='ctx'> "þú ræsir aftur á þessari tölvu, eða annari. Athugið: ef þú stingur\n"</div><div class='ctx'> "inn lykli núna, bíddu þá í nokkrar sekúndur áður en þú reynir aftur.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Þú getur einnig haldið áfram án USB lykils - þú getur samt notað\n"</div><div class='del'>-"Mandrake Move eins og venjulegt Mandrake stýrikerfi."</div><div class='add'>+"Mandriva Move eins og venjulegt Mandrake stýrikerfi."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -257,7 +257,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -273,7 +273,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Þetta getur verið vegna gallaðra kerfisuppsetningarskráa\n"</div><div class='ctx'> "á USB lyklinum, ef sú er raunin, reynið þá að fjarlægja þær og\n"</div><div class='del'>-"enduræsing Mandrake Move mun leysa málið. Til að gera\n"</div><div class='add'>+"enduræsing Mandriva Move mun leysa málið. Til að gera\n"</div><div class='ctx'> "það, smelltu á viðeigandi hnapp.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1298,11 +1298,11 @@ msgstr "Tungumálaval"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux getur stutt mörg tungumál.  Veldu tungumál\n"</div><div class='add'>+"Mandrivalinux getur stutt mörg tungumál.  Veldu tungumál\n"</div><div class='ctx'> "sem þú vilt setja upp stuðning fyrir.  Þau verða tiltæk þegar\n"</div><div class='ctx'> "uppsetningu er lokið. og þú endurræsir kerfið."</div><div class='ctx'> </div><div class='hunk'>@@ -3712,12 +3712,12 @@ msgstr "virkja útvarps stuðning"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Áður en þú heldur áfram, ættir þú að lesa vandlega leyfisskilmálana. Þeir\n"</div><div class='del'>-"taka yfir alla Mandrakelinux dreifinguna. Ef þú er samþykk(ur) öllum þeim\n"</div><div class='add'>+"taka yfir alla Mandrivalinux dreifinguna. Ef þú er samþykk(ur) öllum þeim\n"</div><div class='ctx'> "skilmáum sem þar standa, krossaðu þá við í \"%s\" reitinn, ef ekki\n"</div><div class='ctx'> "smelltu þá á \"%s\" hnappinn sem mun endurræsa tölvuna þína."</div><div class='ctx'> </div><div class='hunk'>@@ -3897,13 +3897,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux uppsetningunni er dreift á nokkra geisladiska. Ef valinn\n"</div><div class='add'>+"Mandrivalinux uppsetningunni er dreift á nokkra geisladiska. Ef valinn\n"</div><div class='ctx'> "pakki er á öðrum geisladiski, þá mun DrakX spýta út núverandi diski\n"</div><div class='ctx'> "og biðja þig um að setja inn rétta diskinn. Ef þú hefur ekki rétta diskinn "</div><div class='ctx'> "við\n"</div><div class='hunk'>@@ -3914,11 +3914,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3971,10 +3971,10 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nú er tími til að skilgreina hvaða forrit þú vilt að séu sett upp á kerfinu "</div><div class='ctx'> "þínu.\n"</div><div class='del'>-"Það eru þúsundir pakka til fyrir Mandrakelinux, og til að einfalda\n"</div><div class='add'>+"Það eru þúsundir pakka til fyrir Mandrivalinux, og til að einfalda\n"</div><div class='ctx'> "umsjón pakkanna hafa þeir verið flokkaðir í hópa af svipuðum forritum.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux skiptir pökkunum í fjóra flokka. Þú getur blandað saman\n"</div><div class='add'>+"Mandrivalinux skiptir pökkunum í fjóra flokka. Þú getur blandað saman\n"</div><div class='ctx'> "pökkum úr mismunandi flokkkum svo að ``Vinnustöðvar'' uppsetning\n"</div><div class='ctx'> "getur innihaldið forrit úr ``Miðlara'' flokknum.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4080,10 +4080,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4114,7 +4114,7 @@ msgstr ""</div><div class='ctx'> "!! Ef miðlara-pakki hefur verið valinn, annað hvort af því að þú valdir "</div><div class='ctx'> "stakan\n"</div><div class='ctx'> "pakka eða hann var hluti af hóp, verður þú beðinn um að staðfesta að\n"</div><div class='del'>-"þú viljir fá þessa miðlara uppsetta. Sjálfgefið mun Mandrakelinux ræsa "</div><div class='add'>+"þú viljir fá þessa miðlara uppsetta. Sjálfgefið mun Mandrivalinux ræsa "</div><div class='ctx'> "allar\n"</div><div class='ctx'> "uppsettar þjónustur og miðlara við kerfisræsingu. Jafnvel þó að þeir séu\n"</div><div class='ctx'> "öruggir og engar þekktar villur þegar kerfinu var dreift þá er möguleiki að\n"</div><div class='hunk'>@@ -4276,7 +4276,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4390,12 +4390,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4422,7 +4422,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4431,7 +4431,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4560,7 +4560,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4578,7 +4578,7 @@ msgstr "Fyrra"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4607,7 +4607,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4623,7 +4623,7 @@ msgstr "Öryggisfulltrúi"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4710,7 +4710,7 @@ msgstr "Víxla milli venjulegs/sérfræðings-hams"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4741,7 +4741,7 @@ msgstr ""</div><div class='ctx'> "Fleiri en ein Microsoft disksneið hefur fundist á harða disknum.\n"</div><div class='ctx'> "Vinsamlega veldu hverja þeirra þú vilt breyta stærðinni á til að geta sett "</div><div class='ctx'> "upp\n"</div><div class='del'>-"nýja Mandrakelinux stýrikerfið.\n"</div><div class='add'>+"nýja Mandrivalinux stýrikerfið.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Hver sneið á listanum inniheldur \"Linux nafn\", \"Windows nafn\" \"Diskrýmd"</div><div class='ctx'> "\".\n"</div><div class='hunk'>@@ -4787,7 +4787,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4796,13 +4796,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4843,7 +4843,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5002,7 +5002,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5023,7 +5023,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5146,7 +5146,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5163,7 +5163,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5285,11 +5285,11 @@ msgstr "Þjónustur"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Veldu harða diskinn sem þú vilt hreinsa allt af til að setja upp nýja\n"</div><div class='del'>-"Mandrakelinux disksneið.  Varúð, öllum gögnum á disknum verður\n"</div><div class='add'>+"Mandrivalinux disksneið.  Varúð, öllum gögnum á disknum verður\n"</div><div class='ctx'> "eytt, og það er ekki hægt að sækja þau aftur!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -5632,7 +5632,7 @@ msgstr "Reikna stærð Windows disksneiðar"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5751,19 +5751,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5785,7 +5785,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5793,14 +5793,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5810,7 +5810,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5830,10 +5830,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5844,11 +5844,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5864,7 +5864,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5921,7 +5921,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5929,21 +5929,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Til hamingju! Innsetningu er lokið.\n"</div><div class='ctx'> "Taktu disklinginn eða geisladiskinn úr drifinu og sláðu á ENTER.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "viðbætur og/eða lagfæringar á göllum sem gætu verið til\n"</div><div class='del'>-"staðar í þessari útgáfu af Mandrakelinux má finna á \n"</div><div class='add'>+"staðar í þessari útgáfu af Mandrivalinux má finna á \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Frekari upplýsingar um hvernig á að stilla vélina eftir innsetninguna er að\n"</div><div class='del'>-"finna í viðeigandi kafla í Official Mandrakelinux User's Guide bókinni."</div><div class='add'>+"finna í viðeigandi kafla í Official Mandrivalinux User's Guide bókinni."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -5978,7 +5978,7 @@ msgstr "Hef skref `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -6516,9 +6516,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Hef samband við Mandrakelinux vefinn til að sækja lista yfir fáanlega "</div><div class='add'>+"Hef samband við Mandrivalinux vefinn til að sækja lista yfir fáanlega "</div><div class='ctx'> "spegla..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6738,8 +6738,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux innsetning %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux innsetning %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9321,13 +9321,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall stillingar\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Þessi eining stillir prívat eldvegg fyrir þessa Mandrakelinux vél\n"</div><div class='add'>+"Þessi eining stillir prívat eldvegg fyrir þessa Mandrivalinux vél\n"</div><div class='ctx'> "Fyrir öruggan og aflmikinn eldvegg líttu á hina sértæku\n"</div><div class='ctx'> "Mandrake eldveggs útgáfu."</div><div class='ctx'> </div><div class='hunk'>@@ -13015,7 +13015,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14763,18 +14763,18 @@ msgstr "Stöðva"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Velkomin(n) í &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Velkomin(n) í &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14783,7 +14783,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14800,9 +14800,9 @@ msgstr "Velkomin í &lt;b&gt;heim opins hugbúnaðar&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14822,7 +14822,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14848,10 +14848,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14870,8 +14870,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14898,7 +14898,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14908,7 +14908,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14927,13 +14927,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14945,7 +14945,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14959,19 +14959,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft vörur&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva vörur&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14992,61 +14992,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15084,7 +15084,7 @@ msgstr "&lt;b&gt;Veldu uppáhalds gluggaumhverfið þitt&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15105,7 +15105,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15222,7 +15222,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15457,14 +15457,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Stjórnborð&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Stjórnborð&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15486,9 +15486,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15500,7 +15500,7 @@ msgstr "&lt;b&gt;Vefverslun&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15523,20 +15523,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15555,33 +15555,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Mandrake beint&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -15604,32 +15604,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15926,8 +15926,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft Álfar"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva Álfar"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16022,7 +16022,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16070,7 +16070,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -16078,7 +16078,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      Ekki biðja um staðfestingu í upphafi "</div><div class='del'>-"MandrakeUpdate\n"</div><div class='add'>+"Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        Ekki staðfesta undiskriftir pakka\n"</div><div class='ctx'> "  --changelog-first      Birta breytingalista á undan skráarlista í "</div><div class='ctx'> "lýsingaglugga\n"</div><div class='hunk'>@@ -18553,13 +18553,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux villutilkynningar-tól"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux villutilkynningar-tól"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Stjórnborð"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Stjórnborð"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18579,7 +18579,7 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr "Mandrake beint"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -18624,7 +18624,7 @@ msgstr "Stilli-álfar"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19041,19 +19041,19 @@ msgstr "Virkjað við ræsingu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Þetta nettengi hefur ekki verið stillt enn.\n"</div><div class='del'>-"Keyrið \"Bæta við tengingu\" aðstoðarálfinn frá Mandrakelinux stjórnborðinu"</div><div class='add'>+"Keyrið \"Bæta við tengingu\" aðstoðarálfinn frá Mandrivalinux stjórnborðinu"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Þú hefur ekki skilgreint neina internettengingu.\n"</div><div class='del'>-"Keyrið \"%s\" aðstoðarálfinn frá Mandrakelinux stjórnborðinu"</div><div class='add'>+"Keyrið \"%s\" aðstoðarálfinn frá Mandrivalinux stjórnborðinu"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -19103,8 +19103,8 @@ msgstr "KDM (KDE gluggastjóri)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux gluggastjóri)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux gluggastjóri)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19405,7 +19405,7 @@ msgstr "Flytja inn"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19414,7 +19414,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Höfundaréttur (C) 2001-2002 hjá Mandrakesoft \n"</div><div class='add'>+"Höfundaréttur (C) 2001-2002 hjá Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (upprunaleg útgáfa)\n"</div><div class='hunk'>@@ -19917,14 +19917,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Höfundaréttur (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Höfundaréttur (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "þetta er frjáls hugbúnaður og má dreifa samakvæmt skilmálum GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Notkun: \n"</div><div class='hunk'>@@ -19949,8 +19949,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux hjálp"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux hjálp"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -23226,8 +23226,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux tólaannálar"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux tólaannálar"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -23737,10 +23737,10 @@ msgstr "Tenging uppsett."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tenging mistókst\n"</div><div class='del'>-"Athugaðu uppsetninguna í Mandrakelinux stjórnborði."</div><div class='add'>+"Athugaðu uppsetninguna í Mandrivalinux stjórnborði."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24606,8 +24606,8 @@ msgstr "Innsetning mistókst"</div><div class='ctx'> #~ msgstr "Þú hefur ekki valið neitt letur"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Mandrakesoft Álfar"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Mandriva Álfar"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "No browser is installed on your system, Please install one if you want to "</div><div class='hunk'>@@ -24704,13 +24704,13 @@ msgstr "Innsetning mistókst"</div><div class='ctx'> #~ msgstr "Villa við að opna %s til skriftar: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Þetta er HardDrake, vélbúnaðarstillitól Mandrakelinux.\n"</div><div class='add'>+#~ "Þetta er HardDrake, vélbúnaðarstillitól Mandrivalinux.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Útgáfa:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Höfundur:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -25095,7 +25095,7 @@ msgstr "Innsetning mistókst"</div><div class='ctx'> #~ msgid "mkraid failed"</div><div class='ctx'> #~ msgstr "mkraid mistókst"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='ctx'> #~ msgstr "Mandrake beint"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='head'>diff --git a/perl-install/share/po/it.po b/perl-install/share/po/it.po<br/>index 9aaff733a..b47e0ccb9 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/it.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/it.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/it.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/it.po</a></div><div class='hunk'>@@ -72,14 +72,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "La chiave USB sembra essere protetta in scrittura, ma non può\n"</div><div class='ctx'> "essere estratta senza rischi in questo momento.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Premi il tasto di riavvio del computer, estrai la chiave, togli la\n"</div><div class='del'>-"protezione, inserisci di nuovo la chiave e riavvia Mandrake Move."</div><div class='add'>+"protezione, inserisci di nuovo la chiave e riavvia Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -97,7 +97,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "La chiave USB non ha partizioni Windows (FAT) valide. Ne serve\n"</div><div class='hunk'>@@ -108,14 +108,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Puoi anche proseguire senza una chiave USB e utilizzare\n"</div><div class='del'>-"Mandrake Move come un normale sistema operativo\n"</div><div class='add'>+"Mandriva Move come un normale sistema operativo\n"</div><div class='ctx'> "Mandrake \"live\"."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -123,11 +123,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Non è stata rilevata nessuna chiave USB su questo computer.\n"</div><div class='del'>-"Se ne inserisci una adesso, Mandrake Move sarà in grado di salvare "</div><div class='add'>+"Se ne inserisci una adesso, Mandriva Move sarà in grado di salvare "</div><div class='ctx'> "automaticamente i dati della tua home directory e le\n"</div><div class='ctx'> "configurazioni del sistema, per un futuro boot su questo PC\n"</div><div class='ctx'> "o su un altro. Tieni presente che, se inserisci ora una chiave,\n"</div><div class='hunk'>@@ -136,7 +136,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Puoi anche proseguire senza una chiave USB e continuare\n"</div><div class='del'>-"ad utilizzare Mandrake Move come un normale sistema\n"</div><div class='add'>+"ad utilizzare Mandriva Move come un normale sistema\n"</div><div class='ctx'> "operativo Mandrake \"live\"."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -263,7 +263,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -279,7 +279,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Può derivare da file di configurazione danneggiati sulla\n"</div><div class='ctx'> "chiave USB. Se così fosse, cancellarli e riavviare\n"</div><div class='del'>-"Mandrake Move potrebbe risolvere il problema.\n"</div><div class='add'>+"Mandriva Move potrebbe risolvere il problema.\n"</div><div class='ctx'> "Per farlo basta premere l'apposito pulsante.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1322,11 +1322,11 @@ msgstr "Scelta della lingua"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux può gestire più di una lingua.\n"</div><div class='add'>+"Mandrivalinux può gestire più di una lingua.\n"</div><div class='ctx'> "Seleziona le lingue da installare. Esse saranno disponibili\n"</div><div class='ctx'> "quando riavvierai il sistema alla fine dell'installazione."</div><div class='ctx'> </div><div class='hunk'>@@ -3757,12 +3757,12 @@ msgstr "abilita il supporto radio"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Prima di proseguire dovresti leggere con attenzione le condizioni d'uso che\n"</div><div class='del'>-"riguardano l'intera distribuzione Mandrakelinux. Se sei d'accordo con\n"</div><div class='add'>+"riguardano l'intera distribuzione Mandrivalinux. Se sei d'accordo con\n"</div><div class='ctx'> "tutti i termini della licenza clicca sul pulsante \"%s\". In caso contrario\n"</div><div class='ctx'> "ti basterà un clic sul pulsante \"%s\" per riavviare il computer."</div><div class='ctx'> </div><div class='hunk'>@@ -3947,13 +3947,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"La distribuzione Mandrakelinux è suddivisa su più CD-ROM. Se uno dei\n"</div><div class='add'>+"La distribuzione Mandrivalinux è suddivisa su più CD-ROM. Se uno dei\n"</div><div class='ctx'> "pacchetti selezionati si trova su un CD-ROM diverso da quello attualmente\n"</div><div class='ctx'> "inserito nel lettore, DrakX provvederà a espellerlo e a chiedervi di\n"</div><div class='ctx'> "inserire quello corretto. Se non avete a portata di mano il CD richiesto,\n"</div><div class='hunk'>@@ -3966,11 +3966,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4023,7 +4023,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Adesso è il momento di indicare i programmi che volete siano installati sul\n"</div><div class='ctx'> "vostro sistema. Ci sono migliaia di pacchetti disponibili per\n"</div><div class='del'>-"Mandrakelinux, e sono stati suddivisi in gruppi in base al loro campo di\n"</div><div class='add'>+"Mandrivalinux, e sono stati suddivisi in gruppi in base al loro campo di\n"</div><div class='ctx'> "utilizzo, in modo da facilitarne la gestione.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "I gruppi sono a loro volta suddivisi in quattro categorie. Potete\n"</div><div class='hunk'>@@ -4138,10 +4138,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4173,11 +4173,11 @@ msgstr ""</div><div class='ctx'> "!! Se avete selezionato un pacchetto che offre un servizio come server\n"</div><div class='ctx'> "(intenzionalmente, oppure perché faceva parte di un gruppo), vi verrà\n"</div><div class='ctx'> "chiesta conferma per la sua effettiva installazione. Come opzione\n"</div><div class='del'>-"predefinita, in Mandrakelinux tutti i servizi installati vengono attivati\n"</div><div class='add'>+"predefinita, in Mandrivalinux tutti i servizi installati vengono attivati\n"</div><div class='ctx'> "automaticamente all'avvio. Sebbene si tratti di servizi sicuri ed esenti da\n"</div><div class='ctx'> "problemi noti al momento del rilascio della distribuzione, non è escluso\n"</div><div class='ctx'> "che possano essere scoperte falle di sicurezza al loro interno dopo la\n"</div><div class='del'>-"pubblicazione di questa versione di Mandrakelinux. Quindi, se non avete\n"</div><div class='add'>+"pubblicazione di questa versione di Mandrivalinux. Quindi, se non avete\n"</div><div class='ctx'> "idea di cosa faccia un particolare servizio o del perché debba essere\n"</div><div class='ctx'> "installato, cliccate su \"%s\". Scegliendo \"%s\", invece, i servizi\n"</div><div class='ctx'> "elencati saranno installati e attivati in automatico all'avvio del sistema.\n"</div><div class='hunk'>@@ -4345,7 +4345,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4401,7 +4401,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (abbreviazione per \"X Window System\") è il cuore dell'interfaccia\n"</div><div class='ctx'> "grafica di GNU/Linux, sul quale sono basati tutti gli ambienti grafici\n"</div><div class='del'>-"inclusi in Mandrakelinux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"</div><div class='add'>+"inclusi in Mandrivalinux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Vi verrà mostrata una lista dei parametri da configurare in modo da avere\n"</div><div class='ctx'> "la miglior visualizzazione possibile:\n"</div><div class='hunk'>@@ -4529,12 +4529,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4561,7 +4561,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4570,7 +4570,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4591,12 +4591,12 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A questo punto dovete scegliere in quali punti del vostro disco rigido\n"</div><div class='del'>-"installare il sistema operativo Mandrakelinux. Se il disco è vuoto, o se\n"</div><div class='add'>+"installare il sistema operativo Mandrivalinux. Se il disco è vuoto, o se\n"</div><div class='ctx'> "tutto lo spazio disponibile è occupato da un altro sistema operativo già\n"</div><div class='ctx'> "installato, allora dovrete creare o modificare le partizioni. In breve,\n"</div><div class='ctx'> "partizionare un disco rigido consiste nel suddividerlo logicamente in più\n"</div><div class='ctx'> "zone in maniera da creare lo spazio necessario all'installazione di\n"</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Dato che gli effetti del partizionamento sono di solito irreversibili, e\n"</div><div class='ctx'> "possono causare la perdita di dati, questa operazione può intimidire e\n"</div><div class='hunk'>@@ -4627,7 +4627,7 @@ msgstr ""</div><div class='ctx'> "dati, a patto che prima di procedere la partizione Windows sia stata\n"</div><div class='ctx'> "deframmentata. Vi consigliamo caldamente di fare comunque una copia di\n"</div><div class='ctx'> "sicurezza dei vostri dati. Questa è la soluzione consigliata se desiderate\n"</div><div class='del'>-"usare sia Mandrakelinux che Microsoft Windows sullo stesso computer.\n"</div><div class='add'>+"usare sia Mandrivalinux che Microsoft Windows sullo stesso computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Prima di scegliere questa opzione, tenete presente che le dimensioni\n"</div><div class='ctx'> "della partizione su cui risiede Windows saranno ridotte rispetto a quelle\n"</div><div class='hunk'>@@ -4636,7 +4636,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": se desiderate cancellare tutti i dati e tutte le partizioni\n"</div><div class='ctx'> "presenti sul vostro disco rigido e rimpiazzarli con il vostro nuovo sistema\n"</div><div class='del'>-"Mandrakelinux, potete selezionare questa opzione. Fate molta attenzione,\n"</div><div class='add'>+"Mandrivalinux, potete selezionare questa opzione. Fate molta attenzione,\n"</div><div class='ctx'> "perché dopo aver dato conferma non potrete più tornare indietro.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! Se scegliete questa opzione tutti i dati sul vostro disco saranno\n"</div><div class='hunk'>@@ -4809,7 +4809,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4831,7 +4831,7 @@ msgstr ""</div><div class='ctx'> "Cliccate su \"%s\" quando siete pronti ad avviare la formattazione.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cliccate su \"%s\" se desiderate installare il vostro nuovo sistema\n"</div><div class='del'>-"operativo Mandrakelinux su partizioni diverse da quelle selezionate.\n"</div><div class='add'>+"operativo Mandrivalinux su partizioni diverse da quelle selezionate.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cliccate su \"%s\" se desiderate selezionare alcune delle partizioni\n"</div><div class='ctx'> "affinché venga controllata la presenza di eventuali blocchi danneggiati su\n"</div><div class='hunk'>@@ -4851,7 +4851,7 @@ msgstr "Indietro"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4863,7 +4863,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"È molto probabile che, al momento in cui installate Mandrakelinux, alcuni\n"</div><div class='add'>+"È molto probabile che, al momento in cui installate Mandrivalinux, alcuni\n"</div><div class='ctx'> "pacchetti siano stati aggiornati rispetto alla versione iniziale;\n"</div><div class='ctx'> "potrebbero essere stati corretti degli errori, o risolti eventuali problemi\n"</div><div class='ctx'> "relativi alla sicurezza. Per permettervi di beneficiare di questi\n"</div><div class='hunk'>@@ -4897,7 +4897,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4912,7 +4912,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Se non sapete quale scelta fare, utilizzate l'impostazione predefinita.\n"</div><div class='ctx'> "Potrete comunque cambiare in seguito il livello di sicurezza usando\n"</div><div class='del'>-"draksec, uno strumento del Mandrakelinux Control Center.\n"</div><div class='add'>+"draksec, uno strumento del Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Nel campo \"%s\" inserite l'indirizzo email dell'utente che sarà\n"</div><div class='ctx'> "responsabile per la sicurezza: tutti i messaggi relativi alla sicurezza\n"</div><div class='hunk'>@@ -4929,7 +4929,7 @@ msgstr "Amministratore per la sicurezza"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -5000,7 +5000,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A questo punto, dovete decidere quali partizioni devono essere usate per\n"</div><div class='del'>-"l'installazione del vostro sistema Mandrakelinux. Se sono già state\n"</div><div class='add'>+"l'installazione del vostro sistema Mandrivalinux. Se sono già state\n"</div><div class='ctx'> "definite delle partizioni, grazie a una precedente installazione di\n"</div><div class='ctx'> "GNU/Linux o usando un altro programma di partizionamento, potete utilizzare\n"</div><div class='ctx'> "quelle. In caso contrario, sarà necessario creare o modificare le\n"</div><div class='hunk'>@@ -5096,7 +5096,7 @@ msgstr "Scambio tra modo normale e esperto"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5126,7 +5126,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sul vostro disco rigido è stata individuata più di una partizione\n"</div><div class='ctx'> "Microsoft. Scegliete quella che deve essere ridimensionata in modo da poter\n"</div><div class='del'>-"installare il vostro nuovo sistema operativo Mandrakelinux.\n"</div><div class='add'>+"installare il vostro nuovo sistema operativo Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ogni partizione è elencata in questo modo: \"nome Linux\", \"nome Windows\"\n"</div><div class='ctx'> "\"Dimensione\".\n"</div><div class='hunk'>@@ -5178,7 +5178,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5187,19 +5187,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Questo passo viene eseguito soltanto se sulla vostra macchina viene trovata\n"</div><div class='ctx'> "una partizione GNU/Linux preesistente.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "A questo punto DrakX ha bisogno di sapere se intendete effettuare una nuova\n"</div><div class='del'>-"installazione o un aggiornamento di un sistema Mandrakelinux esistente:\n"</div><div class='add'>+"installazione o un aggiornamento di un sistema Mandrivalinux esistente:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": nella maggior parte dei casi cancella completamente il vecchio\n"</div><div class='ctx'> "sistema. Tuttavia, in base allo schema di partizionamento usato, potete\n"</div><div class='hunk'>@@ -5209,14 +5209,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": questo tipo di installazione vi permette di effettuare un\n"</div><div class='ctx'> "semplice aggiornamento dei pacchetti già installati sul vostro sistema\n"</div><div class='del'>-"Mandrakelinux. Tutte le partizioni attuali del disco rigido vengono\n"</div><div class='add'>+"Mandrivalinux. Tutte le partizioni attuali del disco rigido vengono\n"</div><div class='ctx'> "conservate, come pure le configurazioni e i dati individuali degli utenti.\n"</div><div class='ctx'> "La maggior parte degli altri passi relativi alla configurazione restano\n"</div><div class='ctx'> "disponibili, come per una installazione normale.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "L'opzione \"Aggiornamento\" non dovrebbe comportare difficoltà per sistemi\n"</div><div class='del'>-"Mandrakelinux a partire dalla versione \"8.1\", mentre non è consigliabile\n"</div><div class='del'>-"utilizzarla per aggiornare versioni di Mandrakelinux precedenti la \"8.1\"."</div><div class='add'>+"Mandrivalinux a partire dalla versione \"8.1\", mentre non è consigliabile\n"</div><div class='add'>+"utilizzarla per aggiornare versioni di Mandrivalinux precedenti la \"8.1\"."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml</div><div class='hunk'>@@ -5279,7 +5279,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5323,7 +5323,7 @@ msgstr ""</div><div class='ctx'> "Riguardo al supporto UTF-8 (Unicode): Unicode è un nuovo standard per la\n"</div><div class='ctx'> "codifica dei caratteri, progettato per supportare tutte le lingue\n"</div><div class='ctx'> "esistenti. Il suo supporto su GNU/Linux è ancora in fase di sviluppo, e per\n"</div><div class='del'>-"questo motivo la sua attivazione su Mandrakelinux dipenderà dalle scelte\n"</div><div class='add'>+"questo motivo la sua attivazione su Mandrivalinux dipenderà dalle scelte\n"</div><div class='ctx'> "effettuate dall'utente:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * se scegliete lingue fortemente legate alle vecchie codifiche (lingue del\n"</div><div class='hunk'>@@ -5586,7 +5586,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5607,11 +5607,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Qui potrete scegliere il sistema di stampa da usare con il vostro computer;\n"</div><div class='del'>-"altri sistemi operativi ve ne offrono uno, ma Mandrakelinux ve ne offre ben\n"</div><div class='add'>+"altri sistemi operativi ve ne offrono uno, ma Mandrivalinux ve ne offre ben\n"</div><div class='ctx'> "due. Ciascuno di essi è adatto a un particolare tipo di configurazione.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- che sta per \"\"print, do not queue\"\" (\"stampa, non mettere\n"</div><div class='hunk'>@@ -5635,7 +5635,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Se fate una scelta adesso e successivamente cambiate idea, potrete sempre\n"</div><div class='ctx'> "scegliere un diverso sistema di stampa avviando PrinterDrake dal\n"</div><div class='del'>-"Mandrakelinux Control Center e cliccando sul pulsante \"%s\"."</div><div class='add'>+"Mandrivalinux Control Center e cliccando sul pulsante \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5764,7 +5764,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5781,7 +5781,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5835,7 +5835,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": se desiderate configurare l'accesso a Internet o a una rete\n"</div><div class='ctx'> "locale potete farlo adesso. Consultate la documentazione stampata, oppure\n"</div><div class='del'>-"utilizzate il Mandrakelinux Control Center una volta terminata\n"</div><div class='add'>+"utilizzate il Mandrivalinux Control Center una volta terminata\n"</div><div class='ctx'> "l'installazione per avere a vostra disposizione un aiuto in linea completo.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": vi permette di configurare gli indirizzi di proxy HTTP e FTP,\n"</div><div class='hunk'>@@ -5853,7 +5853,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": cliccate su questo pulsante per cambiare la configurazione del\n"</div><div class='ctx'> "bootloader. Questa opzione dovrebbe essere utilizzata solo dagli utenti più\n"</div><div class='ctx'> "esperti. Consultate la documentazione stampata o l'aiuto in linea del\n"</div><div class='del'>-"Mandrakelinux Control Center riguardo la configurazione del bootloader.\n"</div><div class='add'>+"Mandrivalinux Control Center riguardo la configurazione del bootloader.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": qui potrete stabilire in dettaglio quali servizi saranno\n"</div><div class='ctx'> "attivati sul vostro sistema. Se pensate di utilizzare il computer come\n"</div><div class='hunk'>@@ -5916,11 +5916,11 @@ msgstr "Servizi"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Scegli il disco rigido che vuoi cancellare per poter preparare le nuove\n"</div><div class='del'>-"partizioni per Mandrakelinux. Attenzione! tutti i dati sul disco andranno\n"</div><div class='add'>+"partizioni per Mandrivalinux. Attenzione! tutti i dati sul disco andranno\n"</div><div class='ctx'> "perduti e non saranno più recuperabili!"</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -6275,12 +6275,12 @@ msgstr "Sto calcolando la dimensione della partizione Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "La partizione Windows è troppo frammentata. Bisogna riavviare il computer "</div><div class='ctx'> "sotto Windows, lanciare \"defrag\" e poi ricominciare l'installazione di "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6399,19 +6399,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6433,7 +6433,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6441,14 +6441,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6458,7 +6458,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6478,10 +6478,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6492,11 +6492,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6512,23 +6512,23 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Introduzione\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Nel seguito intendiamo con \"Software\" il sistema operativo e le diverse "</div><div class='ctx'> "componenti disponibili\n"</div><div class='del'>-"nella distribuzione Mandrakelinux. Il Software include, ma non è limitato "</div><div class='add'>+"nella distribuzione Mandrivalinux. Il Software include, ma non è limitato "</div><div class='ctx'> "all'insieme di\n"</div><div class='ctx'> "programmi, metodi, regole e documentazione relativi al sistema operativo e "</div><div class='ctx'> "alle diverse componenti\n"</div><div class='del'>-"della distribuzione Mandrakelinux.\n"</div><div class='add'>+"della distribuzione Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Licenza\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Per favore leggete con attenzione questo documento.\n"</div><div class='del'>-"Questo documento costituisce un contratto tra voi e la Mandrakesoft S.A. per "</div><div class='add'>+"Questo documento costituisce un contratto tra voi e la Mandriva S.A. per "</div><div class='ctx'> "quanto riguarda l'uso del Software. L'azione di installare, duplicare o "</div><div class='ctx'> "usare in qualsiasi modo il Software implica l'esplicita accettazione e il "</div><div class='ctx'> "pieno consenso ad adeguarsi ai termini e alle condizioni di questa Licenza. "</div><div class='hunk'>@@ -6546,27 +6546,27 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Il Software e la documentazione allegata sono forniti \"come sono\", senza "</div><div class='ctx'> "nessuna garanzia, nei limiti permessi dalla legge. In nessun caso, e nei "</div><div class='del'>-"limiti permessi dalla legge, la Mandrakesoft S.A. potrà essere ritenuta "</div><div class='add'>+"limiti permessi dalla legge, la Mandriva S.A. potrà essere ritenuta "</div><div class='ctx'> "responsabile per un qualsiasi danno, speciale, accidentale, diretto o "</div><div class='ctx'> "indiretto (inclusi, senza limitazioni, danni dovuti alla perdita di attività "</div><div class='ctx'> "commerciali, interruzioni dell'attività commerciale, perdite finanziarie, "</div><div class='ctx'> "oneri legali e sanzioni pecuniarie che derivino da sentenze giudiziarie, o "</div><div class='ctx'> "qualsiasi altra perdita conseguente), dovuto all'utilizzo o "</div><div class='ctx'> "all'impossibilità di utilizzo del Software, anche nel caso in cui "</div><div class='del'>-"Mandrakesoft S.A. sia stata avvertita della possibilità che si verificassero "</div><div class='add'>+"Mandriva S.A. sia stata avvertita della possibilità che si verificassero "</div><div class='ctx'> "tali danni.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "RESPONSABILITÀ LIMITATA IN RELAZIONE AL POSSESSO O ALL'USO DI SOFTWARE "</div><div class='ctx'> "PROIBITO IN ALCUNE NAZIONI\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Nei limiti di legge, in nessun caso Mandrakesoft S.A. o i suoi distributori "</div><div class='add'>+"Nei limiti di legge, in nessun caso Mandriva S.A. o i suoi distributori "</div><div class='ctx'> "potranno essere ritenuti responsabili per un qualsiasi danno, speciale, "</div><div class='ctx'> "accidentale, diretto o indiretto (inclusi, senza limitazioni, danni dovuti "</div><div class='ctx'> "alla perdita di attività commerciali, interruzioni dell'attività "</div><div class='ctx'> "commerciale, perdite finanziarie, oneri legali e sanzioni pecuniarie che "</div><div class='ctx'> "derivino da sentenze giudiziarie, o qualsiasi altra perdita conseguente), "</div><div class='ctx'> "dovuto al possesso e all'uso di componenti software, o derivante dall'aver "</div><div class='del'>-"scaricato componenti software da uno dei siti di Mandrakelinux, che "</div><div class='add'>+"scaricato componenti software da uno dei siti di Mandrivalinux, che "</div><div class='ctx'> "risultino proibiti o soggetti a limitazioni d'uso in alcune nazioni per "</div><div class='ctx'> "effetto di leggi locali. Questa limitazione di responsabilità si applica, ma "</div><div class='ctx'> "non è limitata, alle componenti di crittografia sicura incluse nel "</div><div class='hunk'>@@ -6583,9 +6583,9 @@ msgstr ""</div><div class='ctx'> "Per favore, si leggano con attenzione i termini e le condizioni della "</div><div class='ctx'> "licenza relativi a ciascuna componente prima di utilizzarla. Qualsiasi "</div><div class='ctx'> "domanda relativa alla licenza di una componente software dovrebbe essere "</div><div class='del'>-"indirizzata all'autore di tale componente, e non alla Mandrakesoft. I "</div><div class='del'>-"programmi sviluppati dalla Mandrakesoft S.A. sono soggetti alla licenza GPL."</div><div class='del'>-"La documentazione scritta dalla Mandrakesoft S.A. è soggetta ad una licenza "</div><div class='add'>+"indirizzata all'autore di tale componente, e non alla Mandriva. I "</div><div class='add'>+"programmi sviluppati dalla Mandriva S.A. sono soggetti alla licenza GPL."</div><div class='add'>+"La documentazione scritta dalla Mandriva S.A. è soggetta ad una licenza "</div><div class='ctx'> "specifica. Per favore si consulti la documentazione per ulteriori dettagli.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6594,10 +6594,10 @@ msgstr ""</div><div class='ctx'> "Tutti i diritti relativi alle componenti del Software appartengono ai "</div><div class='ctx'> "rispettivi autori e sono protetti dalle leggi che disciplinano la proprietà "</div><div class='ctx'> "intellettuale e il copyright applicabili ai programmi software. La "</div><div class='del'>-"Mandrakesoft S.A. si riserva il diritto di modificare o adattare il "</div><div class='add'>+"Mandriva S.A. si riserva il diritto di modificare o adattare il "</div><div class='ctx'> "Software, in parte o in tutto, con ogni mezzo e per qualsiasi scopo."</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" e i relativi logo sono proprietà della "</div><div class='del'>-"Mandrakesoft S.A.\n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" e i relativi logo sono proprietà della "</div><div class='add'>+"Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Disposizioni diverse\n"</div><div class='hunk'>@@ -6610,7 +6610,7 @@ msgstr ""</div><div class='ctx'> "merito ai termini di questa licenza verrà risolta preferibilmente per via "</div><div class='ctx'> "extra-giudiziaria. Come ultima risorsa, la disputa verrà portata "</div><div class='ctx'> "all'attenzione del Tribunale competente di Parigi - Francia. Per qualsiasi "</div><div class='del'>-"domanda riguardo questo documento, per favore si contatti Mandrakesoft S.A.\n"</div><div class='add'>+"domanda riguardo questo documento, per favore si contatti Mandriva S.A.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6704,7 +6704,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6712,21 +6712,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Congratulazioni, l'installazione è completa.\n"</div><div class='ctx'> "Rimuovi il disco di avvio e premi Invio per riavviare il sistema.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Per informazioni su correzioni disponibili per questa versione di Linux\n"</div><div class='del'>-"Mandrakelinux, consulta gli \"Errata\" che trovi su\n"</div><div class='add'>+"Mandrivalinux, consulta gli \"Errata\" che trovi su\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Altre informazioni sulla configurazione del sistema sono nel capitolo\n"</div><div class='del'>-"sulla post-installazione del \"Manuale dell'Utente\" di Mandrakelinux."</div><div class='add'>+"sulla post-installazione del \"Manuale dell'Utente\" di Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6761,12 +6761,12 @@ msgstr "Avvio della fase \"%s\"\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Il sistema ha risorse scarse. Potrebbero verificarsi problemi installando\n"</div><div class='del'>-"Mandrakelinux. In tal caso, puoi tentare un'installazione testuale. \n"</div><div class='add'>+"Mandrivalinux. In tal caso, puoi tentare un'installazione testuale. \n"</div><div class='ctx'> "Per farlo, premi \"F1\" all'avvio da CDROM e poi digita \"text\"."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_gtk.pm:228 install_steps_interactive.pm:624</div><div class='hunk'>@@ -7308,9 +7308,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Connessione al sito Mandrakelinux per ricevere l'elenco dei mirror "</div><div class='add'>+"Connessione al sito Mandrivalinux per ricevere l'elenco dei mirror "</div><div class='ctx'> "disponibili..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7536,8 +7536,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Installazione di Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Installazione di Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10124,13 +10124,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Configuratore di drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Configura un firewall personale per questo sistema Mandrakelinux.\n"</div><div class='add'>+"Configura un firewall personale per questo sistema Mandrivalinux.\n"</div><div class='ctx'> "Per una soluzione firewall potente e dedicata, affidati alla\n"</div><div class='ctx'> "distribuzione specializzata MandrakeSecurity Firewall."</div><div class='ctx'> </div><div class='hunk'>@@ -14211,11 +14211,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Puoi lanciare Scannerdrake (Hardware/Scanner in Mandrakelinux Control "</div><div class='add'>+"Puoi lanciare Scannerdrake (Hardware/Scanner in Mandrivalinux Control "</div><div class='ctx'> "Center) per condividere in rete questo scanner.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -16165,23 +16165,23 @@ msgstr "Stop"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Cos'è Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Cos'è Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Benvenuto in &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Benvenuto in &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux è una &lt;b&gt;distribuzione Linux&lt;/b&gt; formata da una parte "</div><div class='add'>+"Mandrivalinux è una &lt;b&gt;distribuzione Linux&lt;/b&gt; formata da una parte "</div><div class='ctx'> "centrale, chiamata &lt;b&gt;sistema operativo&lt;/b&gt; (che si basa sul kernel Linux) a "</div><div class='ctx'> "cui sono aggiunte &lt;b&gt;una marea di applicazioni&lt;/b&gt; che soddisfano ogni "</div><div class='ctx'> "esigenza tu possa pensare di avere."</div><div class='hunk'>@@ -16189,10 +16189,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux è attualmente la distribuzione Linux più &lt;b&gt;facile da usare&lt;/"</div><div class='add'>+"Mandrivalinux è attualmente la distribuzione Linux più &lt;b&gt;facile da usare&lt;/"</div><div class='ctx'> "b&gt;. Essa è anche una delle distribuzioni &lt;b&gt;più diffuse&lt;/b&gt; a livello "</div><div class='ctx'> "mondiale!"</div><div class='ctx'> </div><div class='hunk'>@@ -16209,16 +16209,16 @@ msgstr "Benvenuto nel &lt;b&gt;mondo dell'open source&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux è impegnata nel modello di sviluppo a codice sorgente aperto "</div><div class='add'>+"Mandrivalinux è impegnata nel modello di sviluppo a codice sorgente aperto "</div><div class='ctx'> "ed applica sempre la General Public License. Questa nuova release è il "</div><div class='ctx'> "risultato della &lt;b&gt;collaborazione&lt;/b&gt; tra il &lt;b&gt;team di sviluppo della "</div><div class='del'>-"Mandrakesoft &lt;/b&gt; e la &lt;b&gt;comunità internazionale&lt;/b&gt; di chi contribuisce a "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"Mandriva &lt;/b&gt; e la &lt;b&gt;comunità internazionale&lt;/b&gt; di chi contribuisce a "</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16238,10 +16238,10 @@ msgstr "&lt;b&gt;La GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gran parte dei software inclusi nella distribuzione e tutti gli strumenti "</div><div class='del'>-"Mandrakelinux sono rilasciati sotto la &lt;b&gt;General Public License&lt;/b&gt;"</div><div class='add'>+"Mandrivalinux sono rilasciati sotto la &lt;b&gt;General Public License&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16273,15 +16273,15 @@ msgstr "&lt;b&gt;Unisciti alla Comunità&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux ha una delle &lt;b&gt;più grandi comunità&lt;/b&gt; di utenti e "</div><div class='add'>+"Mandrivalinux ha una delle &lt;b&gt;più grandi comunità&lt;/b&gt; di utenti e "</div><div class='ctx'> "sviluppatori. Il ruolo di questa comunità è molto ampio, va dalla "</div><div class='ctx'> "segnalazione di bug allo sviluppo di nuove applicazioni. La comunità svolge "</div><div class='del'>-"un &lt;b&gt;ruolo chiave&lt;/b&gt; nel mondo di Mandrakelinux."</div><div class='add'>+"un &lt;b&gt;ruolo chiave&lt;/b&gt; nel mondo di Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16302,11 +16302,11 @@ msgstr "&lt;b&gt;Versione scaricabile&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Stai per installare &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Questa è la versione "</div><div class='del'>-"gratuita che Mandrakesoft vuol mantenere &lt;b&gt;disponibile per tutti&lt;/b&gt;."</div><div class='add'>+"Stai per installare &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Questa è la versione "</div><div class='add'>+"gratuita che Mandriva vuol mantenere &lt;b&gt;disponibile per tutti&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16336,10 +16336,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Non potrai neppure accedere ai &lt;b&gt;servizi inclusi&lt;/b&gt; negli altri prodotti "</div><div class='del'>-"Mandrakesoft."</div><div class='add'>+"Mandriva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16348,8 +16348,8 @@ msgstr "&lt;b&gt;Discovery, il tuo primo desktop Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Stai per installare &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Stai per installare &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16371,17 +16371,17 @@ msgstr "&lt;b&gt;PowerPack, il desktop Linux ideale&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Stai per installare &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Stai per installare &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack è il &lt;b&gt;desktop Linux di punta&lt;/b&gt; della Mandrakesoft. PowerPack "</div><div class='add'>+"PowerPack è il &lt;b&gt;desktop Linux di punta&lt;/b&gt; della Mandriva. PowerPack "</div><div class='ctx'> "include &lt;b&gt;migliaia di applicazioni&lt;/b&gt;, dalle più popolari alle più "</div><div class='ctx'> "tecniche."</div><div class='ctx'> </div><div class='hunk'>@@ -16392,8 +16392,8 @@ msgstr "&lt;b&gt;PowerPack+, La soluzione Linux per desktop e server&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Stai per installare &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Stai per installare &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16409,22 +16409,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Prodotti Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Prodotti Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; ha sviluppato un'ampia gamma di prodotti "</div><div class='del'>-"&lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; ha sviluppato un'ampia gamma di prodotti "</div><div class='add'>+"&lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "I prodotti Mandrakelinux sono:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "I prodotti Mandrivalinux sono:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16445,76 +16445,76 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux per x86-64&lt;/b&gt; - La soluzione Mandrakelinux per "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux per x86-64&lt;/b&gt; - La soluzione Mandrivalinux per "</div><div class='ctx'> "sfruttare al massimo un processore a 64-bit."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Prodotti Mandrakesoft per \"nomadi\"&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Prodotti Mandriva per \"nomadi\"&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft ha sviluppato due prodotti che ti permettono di utilizzare "</div><div class='del'>-"Mandrakelinux &lt;b&gt;su tutti i computer&lt;/b&gt; e senza alcun bisogno di "</div><div class='add'>+"Mandriva ha sviluppato due prodotti che ti permettono di utilizzare "</div><div class='add'>+"Mandrivalinux &lt;b&gt;su tutti i computer&lt;/b&gt; e senza alcun bisogno di "</div><div class='ctx'> "installarlo:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt; - una distribuzione Mandrakelinux che gira completamente da "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt; - una distribuzione Mandrivalinux che gira completamente da "</div><div class='ctx'> "un CD-ROM avviabile."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt; - una distribuzione Mandrakelinux pre-installata su "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt; - una distribuzione Mandrivalinux pre-installata su "</div><div class='ctx'> "un “LaCie Mobile Hard Drive” ultra-compatto."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Prodotti Mandrakesoft (soluzioni professionali)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Prodotti Mandriva (soluzioni professionali)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Questi sono i prodotti Mandrakesoft progettati per soddisfare le &lt;b&gt;esigenze "</div><div class='add'>+"Questi sono i prodotti Mandriva progettati per soddisfare le &lt;b&gt;esigenze "</div><div class='ctx'> "professionali&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt; - L'ambiente di lavoro aziendale di "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt; - La soluzione Mandrakelinux per i server."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt; - La soluzione Mandrivalinux per i server."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt; - La soluzione Mandrakelinux per la "</div><div class='add'>+"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt; - La soluzione Mandrivalinux per la "</div><div class='ctx'> "sicurezza."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -16559,10 +16559,10 @@ msgstr "&lt;b&gt;Scegli l'ambiente di lavoro che preferisci!&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Con PowerPack, puoi scegliere &lt;b&gt;l'ambiente grafico di lavoro&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft ha impostato &lt;b&gt;KDE&lt;/b&gt; come predefinito."</div><div class='add'>+"Mandriva ha impostato &lt;b&gt;KDE&lt;/b&gt; come predefinito."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16586,10 +16586,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Con PowerPack, puoi scegliere &lt;b&gt;l'ambiente grafico di lavoro&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft ha impostato &lt;b&gt;KDE&lt;/b&gt; come predefinito."</div><div class='add'>+"Mandriva ha impostato &lt;b&gt;KDE&lt;/b&gt; come predefinito."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16717,10 +16717,10 @@ msgstr "&lt;b&gt;Sfrutta l'ampia gamma di applicazioni&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Nel menu di Mandrakelinux troverai &lt;b&gt;agevoli&lt;/b&gt; strumenti per realizzare "</div><div class='add'>+"Nel menu di Mandrivalinux troverai &lt;b&gt;agevoli&lt;/b&gt; strumenti per realizzare "</div><div class='ctx'> "&lt;b&gt;ogni compito&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16987,18 +16987,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Il Centro di Controllo Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Il Centro di Controllo Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Il &lt;b&gt;Centro di Controllo Mandrakelinux&lt;/b&gt; è un'importante raccolta di "</div><div class='del'>-"strumenti specifici di Mandrakelinux studiati per semplificare la "</div><div class='add'>+"Il &lt;b&gt;Centro di Controllo Mandrivalinux&lt;/b&gt; è un'importante raccolta di "</div><div class='add'>+"strumenti specifici di Mandrivalinux studiati per semplificare la "</div><div class='ctx'> "configurazione del computer."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -17022,16 +17022,16 @@ msgstr "&lt;b&gt;Il modello Open Source&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Come tutta la programmazione, anche il software a codice sorgente aperto "</div><div class='ctx'> "&lt;b&gt;richiede tempo e personale&lt;/b&gt;. Nel rispetto della filosofia open source, "</div><div class='del'>-"Mandrakesoft vende prodotti a valore aggiunto e servizi per &lt;b&gt;continuare a "</div><div class='del'>-"sviluppare Mandrakelinux&lt;/b&gt;. Se vuoi &lt;b&gt;supportare la filosofia open "</div><div class='del'>-"source&lt;/b&gt; e lo sviluppo di Mandrakelinux, dovresti prendere in "</div><div class='add'>+"Mandriva vende prodotti a valore aggiunto e servizi per &lt;b&gt;continuare a "</div><div class='add'>+"sviluppare Mandrivalinux&lt;/b&gt;. Se vuoi &lt;b&gt;supportare la filosofia open "</div><div class='add'>+"source&lt;/b&gt; e lo sviluppo di Mandrivalinux, dovresti prendere in "</div><div class='ctx'> "considerazione l'idea di acquistare uno dei nostri prodotti o servizi!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -17042,10 +17042,10 @@ msgstr "&lt;b&gt;Il negozio online&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Per saperne di più sui prodotti e i servizi di Mandrakesoft puoi visitare la "</div><div class='add'>+"Per saperne di più sui prodotti e i servizi di Mandriva puoi visitare la "</div><div class='ctx'> "nostra &lt;b&gt;piattaforma e-commerce&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -17071,23 +17071,23 @@ msgstr "Fermati oggi stesso a &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; è il &lt;b&gt;perfetto completamento&lt;/b&gt; del tuo Mandrakelinux."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; è il &lt;b&gt;perfetto completamento&lt;/b&gt; del tuo Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Associandoti al Mandrakeclub usufruirai di &lt;b&gt;concreti benefici&lt;/b&gt;, quali:"</div><div class='add'>+"Associandoti al Mandriva Club usufruirai di &lt;b&gt;concreti benefici&lt;/b&gt;, quali:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17109,40 +17109,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* participazione ai &lt;b&gt;forum degli utenti&lt;/b&gt; Mandrakelinux;"</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* participazione ai &lt;b&gt;forum degli utenti&lt;/b&gt; Mandrivalinux;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;accesso privilegiato e anticipato&lt;/b&gt;, prima del rilascio al "</div><div class='del'>-"pubblico, alle &lt;b&gt;immagini ISO&lt;/b&gt; di Mandrakelinux."</div><div class='add'>+"pubblico, alle &lt;b&gt;immagini ISO&lt;/b&gt; di Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; è un nuovo straordinario servizio che Mandrakesoft è "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; è un nuovo straordinario servizio che Mandriva è "</div><div class='ctx'> "orgogliosa di offrire!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline fornisce un'ampia gamma di preziosi servizi per &lt;b&gt;aggiornare "</div><div class='del'>-"facilmente&lt;/b&gt; i tuoi sistemi Mandrakelinux:"</div><div class='add'>+"Mandriva Online fornisce un'ampia gamma di preziosi servizi per &lt;b&gt;aggiornare "</div><div class='add'>+"facilmente&lt;/b&gt; i tuoi sistemi Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17168,42 +17168,42 @@ msgstr "\t* aggiornamenti flessibili e &lt;b&gt;programmati&lt;/b&gt;;"</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* gestione di &lt;b&gt;tutti i tuoi sistemi Mandrakelinux&lt;/b&gt; con un solo "</div><div class='add'>+"\t* gestione di &lt;b&gt;tutti i tuoi sistemi Mandrivalinux&lt;/b&gt; con un solo "</div><div class='ctx'> "account."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ti serve &lt;b&gt;assistenza?&lt;/b&gt; Incontra gli esperti tecnici di Mandrakesoft "</div><div class='add'>+"Ti serve &lt;b&gt;assistenza?&lt;/b&gt; Incontra gli esperti tecnici di Mandriva "</div><div class='ctx'> "sulla &lt;b&gt;nostra piattaforma per il supporto tecnico&lt;/b&gt; www.mandrakeexpert."</div><div class='ctx'> "com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Grazie all'aiuto di &lt;b&gt;esperti qualificati su Mandrakelinux&lt;/b&gt;, "</div><div class='add'>+"Grazie all'aiuto di &lt;b&gt;esperti qualificati su Mandrivalinux&lt;/b&gt;, "</div><div class='ctx'> "risparmierai moltissimo tempo."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Per risolvere ogni problema relativo a Mandrakelinux, puoi comprare su "</div><div class='add'>+"Per risolvere ogni problema relativo a Mandrivalinux, puoi comprare su "</div><div class='ctx'> "&lt;b&gt;store.mandrakesoft.com&lt;/b&gt; degli interventi di supporto."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17503,8 +17503,8 @@ msgstr "Strumenti di monitoraggio, accounting dei processi, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Procedure guidate Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Procedure guidate Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17656,7 +17656,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17670,7 +17670,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPZIONI]...\n"</div><div class='del'>-"Configuratore del Mandrakelinux Terminal Server\n"</div><div class='add'>+"Configuratore del Mandrivalinux Terminal Server\n"</div><div class='ctx'> "--enable         : abilita MTS\n"</div><div class='ctx'> "--disable        : disabilita MTS\n"</div><div class='ctx'> "--start          : avvia MTS\n"</div><div class='hunk'>@@ -17727,7 +17727,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17735,7 +17735,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPZIONE]...\n"</div><div class='ctx'> "  --no-confirmation      non chiedere prima una conferma in modalità "</div><div class='del'>-"MandrakeUpdate\n"</div><div class='add'>+"Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        non verificare le firme dei pacchetti\n"</div><div class='ctx'> "  --changelog-first      mostra nella finestra delle descrizioni il log dei "</div><div class='ctx'> "cambiamenti prima della lista dei file\n"</div><div class='hunk'>@@ -20522,13 +20522,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Procedura Mandrakelinux per segnalare bug"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Procedura Mandrivalinux per segnalare bug"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Centro di Controllo Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Centro di Controllo Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20548,8 +20548,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20593,8 +20593,8 @@ msgstr "Assistenti di configurazione"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Scegli uno degli strumenti Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Scegli uno degli strumenti Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21020,20 +21020,20 @@ msgstr "Attivato al boot"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Questa interfaccia non è stata ancora configurata.\n"</div><div class='del'>-"Lancia l'assistente \"Aggiungi un'interfaccia\" dal Mandrakelinux Control "</div><div class='add'>+"Lancia l'assistente \"Aggiungi un'interfaccia\" dal Mandrivalinux Control "</div><div class='ctx'> "Center"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Non è stata configurata nessuna interfaccia Internet.\n"</div><div class='del'>-"Lancia l'assistente \"%s\" dal Centro di controllo Mandrakelinux."</div><div class='add'>+"Lancia l'assistente \"%s\" dal Centro di controllo Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21083,8 +21083,8 @@ msgstr "KDM (KDE Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21383,7 +21383,7 @@ msgstr "Importa"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21392,7 +21392,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 di Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 di Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (versione originale)\n"</div><div class='hunk'>@@ -21940,14 +21940,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Questo è software libero e può essere ridistributo nei termini fissati dalla "</div><div class='ctx'> "GPL di GNU.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21976,8 +21976,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Centro di aiuto Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Centro di aiuto Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25511,8 +25511,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Log dei programmi Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Log dei programmi Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26024,10 +26024,10 @@ msgstr "Connessione completata."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Connessione non riuscita.\n"</div><div class='del'>-"Verifica la configurazione dal Centro di Controllo Mandrakelinux."</div><div class='add'>+"Verifica la configurazione dal Centro di Controllo Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po<br/>index 5caa193d2..b7499573d 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/ja.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/ja.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/ja.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ja.po</a></div><div class='hunk'>@@ -70,14 +70,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USBキーに書き込みプロテクトがかかっているようですが、安全に取り外す\n"</div><div class='ctx'> "ことができません\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "再起動ボタンをクリックし、プラグを抜いて書き込みプロテクトを外してから\n"</div><div class='del'>-"再度キーを差し込んで Mandrake Move を起動してください。"</div><div class='add'>+"再度キーを差し込んで Mandriva Move を起動してください。"</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "お使いのUSBキーには有効なWindows(FAT)パーティションがありません。\n"</div><div class='hunk'>@@ -104,14 +104,14 @@ msgstr ""</div><div class='ctx'> "移動・読込が可能になります)\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrake MoveはUSBキーなしで使用することもできます。\n"</div><div class='add'>+"Mandriva MoveはUSBキーなしで使用することもできます。\n"</div><div class='ctx'> "その場合は通常のライブOSになります。"</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -119,7 +119,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "システムにUSBキーを検出できませんでした。USBキーを使うと\n"</div><div class='hunk'>@@ -128,7 +128,7 @@ msgstr ""</div><div class='ctx'> "注意: キーを差し込んでから検出するまでに数秒かかります。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrake MoveはUSBキーなしで使用することもできます。\n"</div><div class='add'>+"Mandriva MoveはUSBキーなしで使用することもできます。\n"</div><div class='ctx'> "その場合は通常のライブOSになります。"</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -253,7 +253,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -269,7 +269,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "USBキーに保存されているシステム設定ファイルが壊れている\n"</div><div class='ctx'> "可能性があります。その場合は、設定ファイルを削除し再度\n"</div><div class='del'>-"Mandrake Moveを起動すると解決できます。そうするには\n"</div><div class='add'>+"Mandriva Moveを起動すると解決できます。そうするには\n"</div><div class='ctx'> "アクションに対応したボタンをクリックしてください。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1304,11 +1304,11 @@ msgstr "言語の選択"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinuxでは複数の言語を使うことができます。\n"</div><div class='add'>+"Mandrivalinuxでは複数の言語を使うことができます。\n"</div><div class='ctx'> "お使いになりたい言語を選んでください。\n"</div><div class='ctx'> "インストール後に再選択することも可能です。"</div><div class='ctx'> </div><div class='hunk'>@@ -3706,11 +3706,11 @@ msgstr "ラジオサポートを有効にする"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"先に進む前にライセンスをよく読んでください。これはMandrakelinux\n"</div><div class='add'>+"先に進む前にライセンスをよく読んでください。これはMandrivalinux\n"</div><div class='ctx'> "全体に適用されます。全ての項目に同意する場合は \"%s\" を押してください。\n"</div><div class='ctx'> "そうでない場合は \"%s\" をクリックしてコンピュータを再起動してください。"</div><div class='ctx'> </div><div class='hunk'>@@ -3880,13 +3880,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinuxのインストールは数枚のCD-ROMから行ないます。\n"</div><div class='add'>+"Mandrivalinuxのインストールは数枚のCD-ROMから行ないます。\n"</div><div class='ctx'> "選択したパッケージが別のCD-ROMの中にあると、DrakXは現在のCDを\n"</div><div class='ctx'> "イジェクトして別のCDを入れるよう促します。\n"</div><div class='ctx'> "指示されたCDをお持ちでない場合は %s をクリックしてください。"</div><div class='hunk'>@@ -3895,11 +3895,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3950,11 +3950,11 @@ msgid ""</div><div class='ctx'> "command-line interface. The total size of this installation is about 65\n"</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='del'>-"ここではインストールするプログラムを選びます。Mandrakelinuxには数千 \n"</div><div class='add'>+"ここではインストールするプログラムを選びます。Mandrivalinuxには数千 \n"</div><div class='ctx'> "ものパッケージが用意されています。それらは管理し易いように類似した\n"</div><div class='ctx'> "アプリケーションごとにグループ化されています 。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinuxではこのグループをさらに四つのカテゴリーに分類しています。\n"</div><div class='add'>+"Mandrivalinuxではこのグループをさらに四つのカテゴリーに分類しています。\n"</div><div class='ctx'> "パッケージの選択に際しては、複数のカテゴリーからグループを選ぶことが\n"</div><div class='ctx'> "できます。つまり、「ワークステーション」としてのインストールに「サーバ」\n"</div><div class='ctx'> "カテゴリーのグループを加えることもできます。\n"</div><div class='hunk'>@@ -4059,10 +4059,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4092,7 +4092,7 @@ msgstr ""</div><div class='ctx'> "注意!! 選択されたグループにサーバ用のパッケージが含まれていたり、または\n"</div><div class='ctx'> "個別にそれを選択されると、本当にインストールしてよいか確認を促す\n"</div><div class='ctx'> "メッセージが出ます。\n"</div><div class='del'>-"Mandrakelinuxのデフォルトの設定では、インストールされたサービスはすべて\n"</div><div class='add'>+"Mandrivalinuxのデフォルトの設定では、インストールされたサービスはすべて\n"</div><div class='ctx'> "起動時に自動的に開始されます。ディストリビューションがリリースされた時点\n"</div><div class='ctx'> "で既知の問題がなく安全だとされていても、リリース後にセキュリティホールが\n"</div><div class='ctx'> "発見される可能性はあります。\n"</div><div class='hunk'>@@ -4240,7 +4240,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4295,7 +4295,7 @@ msgid ""</div><div class='ctx'> "not successful in getting the display configured."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X(X Window System)はGNU/Linuxのグラフィカルインターフェースの中心となる\n"</div><div class='del'>-"部分でMandrakelinuxに収録されている様々なグラフィカル環境(KDE/GNOME/\n"</div><div class='add'>+"部分でMandrivalinuxに収録されている様々なグラフィカル環境(KDE/GNOME/\n"</div><div class='ctx'> "AfterStep/WindowMakerなど)は全てこれに依存しています。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "最適なグラフィック表示を得るために調整可能ないくつかの設定項目が\n"</div><div class='hunk'>@@ -4404,12 +4404,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4436,7 +4436,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4445,7 +4445,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4465,10 +4465,10 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"ここではMandrakelinuxをハードドライブのどこにインストールするかを\n"</div><div class='add'>+"ここではMandrivalinuxをハードドライブのどこにインストールするかを\n"</div><div class='ctx'> "選択します。ハードドライブが空であったり既存のOSが全ての領域を使用して\n"</div><div class='ctx'> "いたりする場合は、パーティションを設定しなければなりません。\n"</div><div class='del'>-"基本的に、Mandrakelinuxをインストールするには、ハードドライブを\n"</div><div class='add'>+"基本的に、Mandrivalinuxをインストールするには、ハードドライブを\n"</div><div class='ctx'> "論理分割して領域を確保することが必要です。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "パーティションの設定は、たいていの場合復元不可能なうえ、データの消失に\n"</div><div class='hunk'>@@ -4495,7 +4495,7 @@ msgstr ""</div><div class='ctx'> "Microsoft WindowsのFATまたはNTFSパーティションのサイズを変更します。\n"</div><div class='ctx'> "サイズ変更は、Windowsのパーティションがあらかじめデフラグ(最適化)されて\n"</div><div class='ctx'> "いれば、データを失うことなく実行できます。(必ずデータのバックアップを\n"</div><div class='del'>-"しておいてください) MandrakelinuxとMicrosoft Windowsを両方使われる場合は\n"</div><div class='add'>+"しておいてください) MandrivalinuxとMicrosoft Windowsを両方使われる場合は\n"</div><div class='ctx'> "このオプションを選んでください。(Windowsを消去される場合は次を参照して\n"</div><div class='ctx'> "ください: ディスク全体を消去)\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4505,7 +4505,7 @@ msgstr ""</div><div class='ctx'> "なりますので注意してください。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * %s: ハードドライブのすべてのデータとパーティション\n"</div><div class='del'>-"を削除しMandrakelinuxシステムに入れ替える場合はこのオプションを選んで\n"</div><div class='add'>+"を削除しMandrivalinuxシステムに入れ替える場合はこのオプションを選んで\n"</div><div class='ctx'> "ください。確認後は取り消しできませんので十分注意してください。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! このオプションを選ぶとディスク上の全データが消去されます !!\n"</div><div class='hunk'>@@ -4661,7 +4661,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4679,7 +4679,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "パーティションをフォーマットする準備ができたら %s をクリックしてください。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinuxを別のパーティションに新規にインストールする場合は %s\n"</div><div class='add'>+"Mandrivalinuxを別のパーティションに新規にインストールする場合は %s\n"</div><div class='ctx'> "をクリックしてください。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "ディスクの不良ブロックを検証するパーティションを選ぶには %s を\n"</div><div class='hunk'>@@ -4697,7 +4697,7 @@ msgstr "戻る"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4709,7 +4709,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinuxのリリース後に、バグの修正、あるいはセキュリティ問題を解決\n"</div><div class='add'>+"Mandrivalinuxのリリース後に、バグの修正、あるいはセキュリティ問題を解決\n"</div><div class='ctx'> "するために更新されたパッケージがあるかもしれません。これらのパッケージを\n"</div><div class='ctx'> "インターネットからダウンロードしてシステムを更新することができます。すでに\n"</div><div class='ctx'> "インターネットに接続されていれば %s にチェックを入れてください。\n"</div><div class='hunk'>@@ -4736,7 +4736,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4748,7 +4748,7 @@ msgstr ""</div><div class='ctx'> "しかしセキュリティレベルを高くすると一般的には使い勝手が悪くなります。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "何を選択してよいか分からない場合はデフォルトのままにしておいてください。\n"</div><div class='del'>-"設定は後で変更できます。Mandrakelinuxコントロールセンタには draksec\n"</div><div class='add'>+"設定は後で変更できます。Mandrivalinuxコントロールセンタには draksec\n"</div><div class='ctx'> "というそのためのツールが用意されています。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s にセキュリティ管理者のメールアドレスを入力してください。\n"</div><div class='hunk'>@@ -4763,7 +4763,7 @@ msgstr "セキュリティ管理者"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4833,7 +4833,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"ここではどのパーティションにMandrakelinuxをインストールするかを選びます。\n"</div><div class='add'>+"ここではどのパーティションにMandrivalinuxをインストールするかを選びます。\n"</div><div class='ctx'> "以前にインストールしたGNU/Linuxシステムが残っていたり、別のツールを使って\n"</div><div class='ctx'> "既にパーティションが定義されている場合は、既存のパーティションを利用する\n"</div><div class='ctx'> "ことができます。そうでない場合はハードドライブのパーティションを定義しな\n"</div><div class='hunk'>@@ -4918,7 +4918,7 @@ msgstr "標準/エキスパートモードの切り替え"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4947,7 +4947,7 @@ msgid ""</div><div class='ctx'> "disk or partition is called \"C:\")."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ハードドライブにMicrosoftのパーティションがいくつか検出されました。\n"</div><div class='del'>-"Mandrakelinuxをインストールするためにリサイズするパーティションを\n"</div><div class='add'>+"Mandrivalinuxをインストールするためにリサイズするパーティションを\n"</div><div class='ctx'> "選んでください。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "パーティションは次のように表示されます: \"Linux name\", \"Windows name\"\n"</div><div class='hunk'>@@ -4995,7 +4995,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5004,18 +5004,18 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "このステップは既存のGNU/Linuxパーティションが検出された時にのみ表示\n"</div><div class='ctx'> "されます。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"DrakXは既存のMandrakelinuxシステムを更新するかそれとも新規にインストール\n"</div><div class='add'>+"DrakXは既存のMandrivalinuxシステムを更新するかそれとも新規にインストール\n"</div><div class='ctx'> "するかを尋ねます:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * %s: 基本的には古いシステムを完全に消去してしまいます。\n"</div><div class='hunk'>@@ -5023,10 +5023,10 @@ msgstr ""</div><div class='ctx'> "\"home\" ディレクトリ)を残すことができます。パーティションの設定やファイル\n"</div><div class='ctx'> "システムを変更される場合はこのオプションをお使いください。\n"</div><div class='ctx'> "\n"</div><div class='del'>-" * %s: これは既にMandrakelinuxにインストールされている\n"</div><div class='add'>+" * %s: これは既にMandrivalinuxにインストールされている\n"</div><div class='ctx'> "パッケージをアップデートします。現在のパーティションの設定やユーザデータは\n"</div><div class='ctx'> "変更されません。その他の設定の大部分は標準のインストールと同様に行えます。\n"</div><div class='del'>-"「アップグレード」はMandrakelinuxのバージョンが\"8.1\"以降であれば問題ない\n"</div><div class='add'>+"「アップグレード」はMandrivalinuxのバージョンが\"8.1\"以降であれば問題ない\n"</div><div class='ctx'> "はずです。\"8.1\"より古いバージョンにはお勧めできません。"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -5078,7 +5078,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5117,7 +5117,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "ユニコード(UTF-8)サポートについて: ユニコードは世界中のすべての言語を\n"</div><div class='ctx'> "カバーします。しかしながら、GNU/Linux環境でのユニコードサポートはまだ開発\n"</div><div class='del'>-"途上にあります。そのため、Mandrakelinuxではユーザの選択に応じてその使用を\n"</div><div class='add'>+"途上にあります。そのため、Mandrivalinuxではユーザの選択に応じてその使用を\n"</div><div class='ctx'> "制限しています:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * レガシーなエンコードを使用する言語(latin1/ロシア語/日本語/中国語/\n"</div><div class='hunk'>@@ -5345,7 +5345,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5366,11 +5366,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ここでは、コンピュータの印刷システムを選択します。他のOSには一種類しか\n"</div><div class='del'>-"ありませんが、Mandrakelinuxには二種類の印刷システムがあります。それぞれ\n"</div><div class='add'>+"ありませんが、Mandrivalinuxには二種類の印刷システムがあります。それぞれ\n"</div><div class='ctx'> "利点と欠点がありますので、より適したものを選んでください。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * %s - 'Print, Do not Queue(印刷する。キューはしない)'の略。\n"</div><div class='hunk'>@@ -5388,7 +5388,7 @@ msgstr ""</div><div class='ctx'> "%s には印刷/プリンタオプションの選択/プリンタの管理などのための\n"</div><div class='ctx'> "グラフィカルフロントエンドがあります。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"選択した印刷システムを後で変更する場合は、Mandrakelinuxコントロールセンタ\n"</div><div class='add'>+"選択した印刷システムを後で変更する場合は、Mandrivalinuxコントロールセンタ\n"</div><div class='ctx'> "のPrinterDrakeで %s をクリックしてください。"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='hunk'>@@ -5506,7 +5506,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5523,7 +5523,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5567,7 +5567,7 @@ msgstr ""</div><div class='ctx'> "%s をクリックして設定し直してください。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * %s: インターネットとローカルネットワークの設定。\n"</div><div class='del'>-"マニュアルを参照するか、もしくはインストール完了後にMandrakelinux\n"</div><div class='add'>+"マニュアルを参照するか、もしくはインストール完了後にMandrivalinux\n"</div><div class='ctx'> "コントロールセンターのヘルプにしたがって行なってください。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * %s: あなたのマシンがプロキシサーバの背後にあれば\n"</div><div class='hunk'>@@ -5582,7 +5582,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * %s: ブートローダの設定を変更する時はこのボタンを\n"</div><div class='ctx'> "押してください。(注意:これは上級者向きです) 印刷されたドキュメントまたは\n"</div><div class='del'>-"Mandrakelinuxコントロールセンターのブートローダに関するヘルプを参照して\n"</div><div class='add'>+"Mandrivalinuxコントロールセンターのブートローダに関するヘルプを参照して\n"</div><div class='ctx'> "ください。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * %s: ここではどのサービスを有効にするかを細かく設定できます。\n"</div><div class='hunk'>@@ -5643,10 +5643,10 @@ msgstr "サービス"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinuxをインストールするためにフォーマットするハードドライブを\n"</div><div class='add'>+"Mandrivalinuxをインストールするためにフォーマットするハードドライブを\n"</div><div class='ctx'> "選んでください。注意: このドライブのデータは全て失われ、回復すること\n"</div><div class='ctx'> "はできません。"</div><div class='ctx'> </div><div class='hunk'>@@ -5996,11 +5996,11 @@ msgstr "Windowsパーティションのサイズを計算"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Windowsパーティションが断片化しすぎています。再起動してWindowsを立ち上げ、\n"</div><div class='del'>-"デフラグを実行してください。その後再起動してMandrakelinuxをインストール\n"</div><div class='add'>+"デフラグを実行してください。その後再起動してMandrivalinuxをインストール\n"</div><div class='ctx'> "してください。"</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6114,19 +6114,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6148,7 +6148,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6156,14 +6156,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6173,7 +6173,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6193,10 +6193,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6207,11 +6207,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6227,14 +6227,14 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "序文\n"</div><div class='ctx'> "\n"</div><div class='del'>-"オペレーティング・システムとMandrakelinuxディストリビューションに\n"</div><div class='add'>+"オペレーティング・システムとMandrivalinuxディストリビューションに\n"</div><div class='ctx'> "含まれる様々なコンポーネントを、以下「ソフトウェア製品」と呼びます。\n"</div><div class='ctx'> "ソフトウェア製品には、オペレーティング・システムに関連するプログラム\n"</div><div class='del'>-"一式・方法・ルール・ドキュメントとMandrakelinuxディストリビューション\n"</div><div class='add'>+"一式・方法・ルール・ドキュメントとMandrivalinuxディストリビューション\n"</div><div class='ctx'> "の様々なコンポーネントが含まれます。但し、これらに限定されるものでは\n"</div><div class='ctx'> "ありません。\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6242,7 +6242,7 @@ msgstr ""</div><div class='ctx'> "1. 使用承諾契約\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "この文書をよくお読みください。この文書はソフトウェア製品に適用される\n"</div><div class='del'>-"お客様とMandrakesoft S.A.との間の使用承諾契約です。方法の如何にかかわ\n"</div><div class='add'>+"お客様とMandriva S.A.との間の使用承諾契約です。方法の如何にかかわ\n"</div><div class='ctx'> "らず、ソフトウェア製品をインストール・コピーまたは使用することによって\n"</div><div class='ctx'> "お客様は使用承諾契約の規約に従うことに同意されたものとします。使用承諾\n"</div><div class='ctx'> "契約に少しでも同意できない部分がある場合は、ソフトウェア製品をインスト\n"</div><div class='hunk'>@@ -6255,21 +6255,21 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "2. 限定保証\n"</div><div class='ctx'> "\n"</div><div class='del'>-"法律で認められる範囲内で、Mandrakesoft S.A.はソフトウェア製品と付属の\n"</div><div class='add'>+"法律で認められる範囲内で、Mandriva S.A.はソフトウェア製品と付属の\n"</div><div class='ctx'> "ドキュメントを「保証なし」で提供しています。法律で認められる範囲内で、\n"</div><div class='del'>-"Mandrakesoft S.A.はいかなる状況においてもソフトウェア製品の使用または\n"</div><div class='add'>+"Mandriva S.A.はいかなる状況においてもソフトウェア製品の使用または\n"</div><div class='ctx'> "使用不能によって生じた特殊・偶発的・直接的・間接的な損害に対して責任を\n"</div><div class='ctx'> "負いません。これらの損害には、取引上の損失・事業の中断・経済的損失・\n"</div><div class='ctx'> "裁判の判決によって発生した訴訟費用ならびに罰金、その他の間接的な損失を\n"</div><div class='del'>-"無制限に含みます。Mandrakesoft S.A.はこのような損害またはその可能性を\n"</div><div class='add'>+"無制限に含みます。Mandriva S.A.はこのような損害またはその可能性を\n"</div><div class='ctx'> "報告された場合も責任を負いかねます。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "いくつかの国で禁止されているソフトウェアの所持・使用に関する限定保証\n"</div><div class='ctx'> "\n"</div><div class='del'>-"法律で認められる範囲内で、Mandrakesoft S.A.またはその製品を配布する者\n"</div><div class='add'>+"法律で認められる範囲内で、Mandriva S.A.またはその製品を配布する者\n"</div><div class='ctx'> "は、いかなる状況においてもソフトウェア製品のコンポーネントの所持・使用\n"</div><div class='ctx'> "またはいくつかの国の法律によって禁止・制限されているソフトウェアを\n"</div><div class='del'>-"Mandrakelinuxのウェブサイトからダウンロードしたことによって生じた特殊・\n"</div><div class='add'>+"Mandrivalinuxのウェブサイトからダウンロードしたことによって生じた特殊・\n"</div><div class='ctx'> "偶発的・直接的・間接的な損害に対して責任を負いません。これらの損害には\n"</div><div class='ctx'> "取引上の損失・事業の中断・経済的損失・裁判の判決によって発生した訴訟\n"</div><div class='ctx'> "費用ならびに罰金、その他の間接的な損失を無制限に含みます。この限定保証\n"</div><div class='hunk'>@@ -6284,9 +6284,9 @@ msgstr ""</div><div class='ctx'> "これらのライセンスの多くは対象となるコンポーネントの使用・コピー・改作\n"</div><div class='ctx'> "または再配布を認めています。各コンポーネントを使用する前に、それぞれの\n"</div><div class='ctx'> "使用承諾契約の規約をよくお読みください。各コンポーネントのライセンスに\n"</div><div class='del'>-"関し不明な点があれば、Mandrakesoftではなくコンポーネントの作者へお問い\n"</div><div class='del'>-"合わせください。Mandrakesoft S.A.が開発したプログラムはGPLライセンスに\n"</div><div class='del'>-"準拠します。Mandrakesoft S.A.が作成したドキュメントについては、特別な\n"</div><div class='add'>+"関し不明な点があれば、Mandrivaではなくコンポーネントの作者へお問い\n"</div><div class='add'>+"合わせください。Mandriva S.A.が開発したプログラムはGPLライセンスに\n"</div><div class='add'>+"準拠します。Mandriva S.A.が作成したドキュメントについては、特別な\n"</div><div class='ctx'> "ライセンスに準拠します。詳しくはドキュメントをご参照ください。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6294,9 +6294,9 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "ソフトウェア製品に含まれるコンポーネントのすべての権利はそれぞれの作者\n"</div><div class='ctx'> "に属し、ソフトウェア・プログラムに適用される知的財産法・著作権法によって\n"</div><div class='del'>-"保護されています。Mandrakesoft S.A.は方法・目的の如何にかかわらずソフト\n"</div><div class='add'>+"保護されています。Mandriva S.A.は方法・目的の如何にかかわらずソフト\n"</div><div class='ctx'> "ウェア製品を全面的・部分的に改変する権利を留保しています。Mandrakeと\n"</div><div class='del'>-"Mandrakelinux、ならびに関連するロゴはMandrakesoft S.A.の登録商標です。\n"</div><div class='add'>+"Mandrivalinux、ならびに関連するロゴはMandriva S.A.の登録商標です。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. 準拠法\n"</div><div class='hunk'>@@ -6307,7 +6307,7 @@ msgstr ""</div><div class='ctx'> "承諾契約の規約はフランス共和国の法律に準拠しています。この使用承諾契約\n"</div><div class='ctx'> "の条項に関する争議は法廷外で解決されることが望まれますが、解決できない\n"</div><div class='ctx'> "場合は最後の手段としてパリ(フランス共和国)の適切な法廷に持ち込みます。\n"</div><div class='del'>-"この文書に関し不明な点があれば、Mandrakesoft S.A.までご連絡ください。\n"</div><div class='add'>+"この文書に関し不明な点があれば、Mandriva S.A.までご連絡ください。\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6393,7 +6393,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6401,7 +6401,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "おめでとうございます。インストールが完了しました。\n"</div><div class='ctx'> "起動用メディアを抜き、[Enter]を押して再起動してください。\n"</div><div class='hunk'>@@ -6413,7 +6413,7 @@ msgstr ""</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"システム設定に関する詳細については Mandrakelinux User's Guide を\n"</div><div class='add'>+"システム設定に関する詳細については Mandrivalinux User's Guide を\n"</div><div class='ctx'> "ご覧ください。"</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6448,11 +6448,11 @@ msgstr "%s を開始\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='del'>-"リソースが足りません。Mandrakelinuxをインストール中に問題が発生する\n"</div><div class='add'>+"リソースが足りません。Mandrivalinuxをインストール中に問題が発生する\n"</div><div class='ctx'> "可能性があります。\n"</div><div class='ctx'> "別の方法として、テキストモードでインストールすることもできます。\n"</div><div class='ctx'> "その場合は、CD-ROMから起動した時に[F1]を押し、続いて'text'と入力\n"</div><div class='hunk'>@@ -6993,8 +6993,8 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='del'>-msgstr "Mandrakelinuxのサイトに接続してミラーのリストを取得しています"</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='add'>+msgstr "Mandrivalinuxのサイトに接続してミラーのリストを取得しています"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7217,8 +7217,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinuxのインストール %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinuxのインストール %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9802,7 +9802,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13810,13 +13810,13 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "お使いのスキャナをネットワークで共有するにはScannerdrakeを実行してくださ"</div><div class='ctx'> "い。\n"</div><div class='del'>-"(Mandrakelinuxコントロールセンターのハードウェア-&gt;スキャナを選択)\n"</div><div class='add'>+"(Mandrivalinuxコントロールセンターのハードウェア-&gt;スキャナを選択)\n"</div><div class='ctx'> </div><div class='ctx'> #: printer/printerdrake.pm:3933</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15703,33 +15703,33 @@ msgstr "停止"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux とは？"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "Mandrivalinux とは？"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Mandrakelinux へようこそ"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Mandrivalinux へようこそ"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux は Linux カーネルを核にしたオペレーティングシステムと、あらゆる"</div><div class='add'>+"Mandrivalinux は Linux カーネルを核にしたオペレーティングシステムと、あらゆる"</div><div class='ctx'> "ニーズを満たす多くのアプリケーションからなる Linux ディストリビューションで"</div><div class='ctx'> "す。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"MandrakelinuxはユーザーフレンドリーなLinux ディストリビューションです。世界中"</div><div class='add'>+"MandrivalinuxはユーザーフレンドリーなLinux ディストリビューションです。世界中"</div><div class='ctx'> "で最も広く使われているディストリビューションのひとつです。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -15745,13 +15745,13 @@ msgstr "オープンソースの世界へようこそ"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux はオープンソースモデルに力を注いでいます。この新しいリリースは "</div><div class='del'>-"Mandrakesoft の開発チームと Mandrakelinux のコントリビュータが生み出した世界"</div><div class='add'>+"Mandrivalinux はオープンソースモデルに力を注いでいます。この新しいリリースは "</div><div class='add'>+"Mandriva の開発チームと Mandrivalinux のコントリビュータが生み出した世界"</div><div class='ctx'> "規模のコミュニティによるコラボレーションの成果です。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='hunk'>@@ -15770,9 +15770,9 @@ msgstr "GPL"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"このディストリビューションに含まれるほとんどのソフトウェアと Mandrakelinux の"</div><div class='add'>+"このディストリビューションに含まれるほとんどのソフトウェアと Mandrivalinux の"</div><div class='ctx'> "ツールは、 General Public License でライセンスされています。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15803,14 +15803,14 @@ msgstr "コミュニティへの参加"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux はユーザと開発者から成る世界規模のコミュニティを生み出しまし"</div><div class='add'>+"Mandrivalinux はユーザと開発者から成る世界規模のコミュニティを生み出しまし"</div><div class='ctx'> "た。このコミュニティは様々な役割を果たしています。新しいアプリケーションの開"</div><div class='del'>-"発に際してはバグを報告し問題の解決を助けます。コミュニティは Mandrakelinux "</div><div class='add'>+"発に際してはバグを報告し問題の解決を助けます。コミュニティは Mandrivalinux "</div><div class='ctx'> "World で中心的な役割を担っています。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15832,11 +15832,11 @@ msgstr "ダウンロードバージョン"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"これは Mandrakesoft が無償で提供するダウンロードバージョンです。 "</div><div class='del'>-"Mandrakesoft は今後もすべての人が利用できる無償版の提供を続けていきたいと思っ"</div><div class='add'>+"これは Mandriva が無償で提供するダウンロードバージョンです。 "</div><div class='add'>+"Mandriva は今後もすべての人が利用できる無償版の提供を続けていきたいと思っ"</div><div class='ctx'> "ています。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15866,8 +15866,8 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='del'>-msgstr "Mandrakesoft の有償製品に含まれているサービスはご利用になれません。"</div><div class='add'>+"Mandriva products either."</div><div class='add'>+msgstr "Mandriva の有償製品に含まれているサービスはご利用になれません。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15876,8 +15876,8 @@ msgstr "Discovery: 初めての Linux デスクトップ"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Mandrakelinux Discovery をインストールします。"</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Mandrivalinux Discovery をインストールします。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15899,17 +15899,17 @@ msgstr "PowerPack: Linux デスクトップの決定版"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Mandrakelinux PowerPack をインストールします。"</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Mandrivalinux PowerPack をインストールします。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack は Mandrakesoft のプレミアム製品です。最も人気の高いものから最先端"</div><div class='add'>+"PowerPack は Mandriva のプレミアム製品です。最も人気の高いものから最先端"</div><div class='ctx'> "に至るまで、 PowerPack には数千のアプリケーションがぎっしり詰まっています。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:13</div><div class='hunk'>@@ -15919,8 +15919,8 @@ msgstr "PowerPack+: デスクトップ/サーバ向け Linux ソリューショ�</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Mandrakelinux PowerPack+ をインストールします。"</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Mandrivalinux PowerPack+ をインストールします。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15936,20 +15936,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakesoft の製品"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "Mandriva の製品"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='del'>-msgstr "Mandrakesoft は幅広い Mandrakelinux 製品を開発しています。"</div><div class='add'>+msgstr "Mandriva は幅広い Mandrivalinux 製品を開発しています。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinuxの製品:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinuxの製品:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15969,69 +15969,69 @@ msgstr "\t* PowerPack+: デスクトップ/サーバ向け Linux ソリューシ</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='del'>-msgstr "\t* Mandrakelinux for x86-64: 64-bitプロセッサのための Mandrakelinux"</div><div class='add'>+msgstr "\t* Mandrivalinux for x86-64: 64-bitプロセッサのための Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakesoft の製品 - 行動派のあなたに"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "Mandriva の製品 - 行動派のあなたに"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft は Mandrakelinux をインストールすることなしにどのコンピュータで"</div><div class='add'>+"Mandriva は Mandrivalinux をインストールすることなしにどのコンピュータで"</div><div class='ctx'> "もお使い頂けるよう、ふたつの製品を開発しました。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Move: ブータブルCD一枚で稼動できる Mandrakelinux ディストリビューション"</div><div class='add'>+"\t* Move: ブータブルCD一枚で稼動できる Mandrivalinux ディストリビューション"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* GlobeTrotter: 超コンパクトな LaCie Mobile ハードドライブにプリインストー"</div><div class='del'>-"ルされた Mandrakelinux ディストリビューション"</div><div class='add'>+"ルされた Mandrivalinux ディストリビューション"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakesoftの製品 - プロフェッショナル・ユースに"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "Mandrivaの製品 - プロフェッショナル・ユースに"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft はプロフェッショナルなニーズを満たすため、次の製品を開発しまし"</div><div class='add'>+"Mandriva はプロフェッショナルなニーズを満たすため、次の製品を開発しまし"</div><div class='ctx'> "た。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr "\t* Corporate Desktop: ビジネス向けデスクトップ"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* Corporate Server: Mandrakelinux サーバ・ソリューション"</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* Corporate Server: Mandrivalinux サーバ・ソリューション"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* Multi-Network Firewall: Mandrakelinux セキュリティ・ソリューション"</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* Multi-Network Firewall: Mandrivalinux セキュリティ・ソリューション"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16074,10 +16074,10 @@ msgstr "お好きなデスクトップ環境を選んでください"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PowerPack にはいくつものグラフィカルデスクトップ環境が用意されています。 "</div><div class='del'>-"Mandrakesoft は KDE をデフォルトに選びました。"</div><div class='add'>+"Mandriva は KDE をデフォルトに選びました。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16101,10 +16101,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PowerPack にはいくつものグラフィカルデスクトップ環境が用意されています。 "</div><div class='del'>-"Mandrakesoft は KDE をデフォルトに選びました。"</div><div class='add'>+"Mandriva は KDE をデフォルトに選びました。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16226,10 +16226,10 @@ msgstr "幅広いアプリケーション"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux のメニューにはあらゆる用途に合った使い易いアプリケーションが"</div><div class='add'>+"Mandrivalinux のメニューにはあらゆる用途に合った使い易いアプリケーションが"</div><div class='ctx'> "ぎっしり詰まってます:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16474,18 +16474,18 @@ msgstr "\t* Postfix と Sendmail: 強力で人気のあるメールサーバ"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux コントロールセンタ"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "Mandrivalinux コントロールセンタ"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux コントロールセンタは、コンピュータの設定を簡単に行えるよう考案"</div><div class='del'>-"された Mandrakelinux 独自のツール群です。"</div><div class='add'>+"Mandrivalinux コントロールセンタは、コンピュータの設定を簡単に行えるよう考案"</div><div class='add'>+"された Mandrivalinux 独自のツール群です。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16508,15 +16508,15 @@ msgstr "オープンソースモデル"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "オープンソースソフトウェアも他のソフトウェアと同様に開発には時間と人が必要で"</div><div class='del'>-"す。オープンソースの理念を尊重するために、 Mandrakesoft は付加価値商品やサー"</div><div class='del'>-"ビスを販売して Mandrakelinux の改良を続けています。オープンソースの理念と "</div><div class='del'>-"Mandrakelinux の開発を支援して下さるのであれば、ぜひ当社の製品またはサービス"</div><div class='add'>+"す。オープンソースの理念を尊重するために、 Mandriva は付加価値商品やサー"</div><div class='add'>+"ビスを販売して Mandrivalinux の改良を続けています。オープンソースの理念と "</div><div class='add'>+"Mandrivalinux の開発を支援して下さるのであれば、ぜひ当社の製品またはサービス"</div><div class='ctx'> "の購入をご検討ください。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16527,10 +16527,10 @@ msgstr "オンラインストア"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft の製品とサービスについては当社の E-コマース をご利用ください。"</div><div class='add'>+"Mandriva の製品とサービスについては当社の E-コマース をご利用ください。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16553,21 +16553,21 @@ msgstr "store.mandrakesoft.com にぜひお立ち寄りください。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakeclub"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "Mandriva Club"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='del'>-msgstr "Mandrakelinux 製品に合わせて Mandrakeclub へのご入会をお勧めします。 "</div><div class='add'>+msgstr "Mandrivalinux 製品に合わせて Mandriva Club へのご入会をお勧めします。 "</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='del'>-msgstr "Mandrakeclub にご入会いただくと次のような特典をお楽しみいただけます:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='add'>+msgstr "Mandriva Club にご入会いただくと次のような特典をお楽しみいただけます:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16585,37 +16585,37 @@ msgstr "\t* NVIDIA®/ATI™ をはじめとする商用アプリケーション�</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Mandrakelinux ユーザ・フォーラムへの参加"</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Mandrivalinux ユーザ・フォーラムへの参加"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='del'>-msgstr "\t* 公式リリースに先立つ Mandrakelinux ISO イメージの早期ダウンロード"</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+msgstr "\t* 公式リリースに先立つ Mandrivalinux ISO イメージの早期ダウンロード"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline は Mandrakesoft が自信をもってご提案する新しいプリミアムサービ"</div><div class='add'>+"Mandriva Online は Mandriva が自信をもってご提案する新しいプリミアムサービ"</div><div class='ctx'> "スです。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline は Mandrakelinux システムを簡単に更新して頂けるよう幅広いサー"</div><div class='add'>+"Mandriva Online は Mandrivalinux システムを簡単に更新して頂けるよう幅広いサー"</div><div class='ctx'> "ビスをご提供します。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16638,38 +16638,38 @@ msgstr "\t* 更新スケジュールをフレキシブルに設定できます"</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* ひとつのアカウントでお使いのすべての Mandrakelinux システムを管理して頂け"</div><div class='add'>+"\t* ひとつのアカウントでお使いのすべての Mandrivalinux システムを管理して頂け"</div><div class='ctx'> "ます。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakeexpert"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "Mandriva Expert"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "お困りのことがあれば当社のテクニカルサポート www.mandrakeexpert.com で "</div><div class='del'>-"Mandrakesoft のテクニカルエキスパートに相談してみてください。"</div><div class='add'>+"Mandriva のテクニカルエキスパートに相談してみてください。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"経験豊富な Mandrakelinux エキスパートに手助けしてもらえば、大切な時間を節約で"</div><div class='add'>+"経験豊富な Mandrivalinux エキスパートに手助けしてもらえば、大切な時間を節約で"</div><div class='ctx'> "きるでしょう。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr "store.mandrakesoft.com でサポートチケットをご購入頂くこともできます。"</div><div class='ctx'> </div><div class='hunk'>@@ -16964,8 +16964,8 @@ msgstr "モニタリングツール/プロセス管理/tcpdump/nmap..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoftウィザード"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandrivaウィザード"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17059,8 +17059,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "オプション:\n"</div><div class='ctx'> "  --help            - このヘルプを表示\n"</div><div class='del'>-"  --report          - プログラムはMandrakelinuxのツールに限ります\n"</div><div class='del'>-"  --incident        - プログラムはMandrakelinuxのツールに限ります"</div><div class='add'>+"  --report          - プログラムはMandrivalinuxのツールに限ります\n"</div><div class='add'>+"  --incident        - プログラムはMandrivalinuxのツールに限ります"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17114,7 +17114,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17128,7 +17128,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinuxターミナルサーバ設定ツール\n"</div><div class='add'>+"Mandrivalinuxターミナルサーバ設定ツール\n"</div><div class='ctx'> "--enable         : MTSを有効にする\n"</div><div class='ctx'> "--disable        : MTSを無効にする\n"</div><div class='ctx'> "--start          : MTSを開始する\n"</div><div class='hunk'>@@ -17183,14 +17183,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]..\n"</div><div class='del'>-"  --no-confirmation      MandrakeUpdateで最初の確認メッセージを表示しない\n"</div><div class='add'>+"  --no-confirmation      Mandriva Updateで最初の確認メッセージを表示しない\n"</div><div class='ctx'> "  --no-verify-rpm        パッケージのサインを確認しない\n"</div><div class='ctx'> "  --changelog-first      説明欄で変更ログをファイルリストより先に表示\n"</div><div class='ctx'> "  --merge-all-rpmnew     検出した全ての.rpmnew/.rpmsaveファイルをマージ"</div><div class='hunk'>@@ -19945,13 +19945,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinuxバグ報告ツール"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinuxバグ報告ツール"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinuxコントロールセンタ"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinuxコントロールセンタ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19971,7 +19971,7 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr "Mandrakeオンライン"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -20016,8 +20016,8 @@ msgstr "設定ウィザード"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Mandrakesoftのツールを選択:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Mandrivaのツールを選択:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20441,20 +20441,20 @@ msgstr "起動時に開始"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "このインターフェースはまだ設定されていません。\n"</div><div class='del'>-"Mandrakelinuxコントロールセンタの \"インターフェースを追加\" を実行してくださ"</div><div class='add'>+"Mandrivalinuxコントロールセンタの \"インターフェースを追加\" を実行してくださ"</div><div class='ctx'> "い"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "インターネットの接続が設定されていません。\n"</div><div class='del'>-"Mandrakelinuxコントロールセンタの \"%s\" を実行してください。"</div><div class='add'>+"Mandrivalinuxコントロールセンタの \"%s\" を実行してください。"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20504,8 +20504,8 @@ msgstr "KDM (KDEディスプレイマネージャ)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinuxディスプレイマネージャ)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinuxディスプレイマネージャ)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20806,7 +20806,7 @@ msgstr "インポート"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20815,7 +20815,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21350,14 +21350,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21385,8 +21385,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinuxヘルプセンタ"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinuxヘルプセンタ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24883,8 +24883,8 @@ msgstr "設定を変更しました。有効にするにはログアウトして</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinuxツールのログ"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinuxツールのログ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25396,10 +25396,10 @@ msgstr "接続完了"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "接続に失敗しました。\n"</div><div class='del'>-"Mandrakelinuxコントロールセンタの設定を確認してください。"</div><div class='add'>+"Mandrivalinuxコントロールセンタの設定を確認してください。"</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26283,8 +26283,8 @@ msgstr "インストール失敗"</div><div class='ctx'> #~ msgid "Save and close"</div><div class='ctx'> #~ msgstr "保存して閉じる"</div><div class='ctx'> </div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Mandrakesoftウィザード"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Mandrivaウィザード"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "ブラウザがありません。インストールしてください。"</div><div class='head'>diff --git a/perl-install/share/po/ko.po b/perl-install/share/po/ko.po<br/>index d60ffbea5..59b2703a7 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/ko.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/ko.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/ko.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ko.po</a></div><div class='hunk'>@@ -60,7 +60,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -79,7 +79,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -87,7 +87,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +221,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1231,7 +1231,7 @@ msgstr "미얀마"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "설치후 다른 다른 언어를 선택할수 있습니다."</div><div class='hunk'>@@ -3509,7 +3509,7 @@ msgstr "라디오 지원"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3657,7 +3657,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3672,11 +3672,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3820,10 +3820,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3946,7 +3946,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4050,12 +4050,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4082,7 +4082,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4091,7 +4091,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4320,7 +4320,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4361,7 +4361,7 @@ msgstr "이전"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4390,7 +4390,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4417,7 +4417,7 @@ msgstr "보안 관리자 (로그인 또는 이메일)"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4561,7 +4561,7 @@ msgstr "일반 모드로 전환"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4635,7 +4635,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4644,13 +4644,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4701,7 +4701,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4884,7 +4884,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4905,7 +4905,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5032,7 +5032,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5049,7 +5049,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5111,7 +5111,7 @@ msgstr "서비스"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "맨드레이크 리눅스 파티션을 만들기 위해서 삭제할 하드디스클르 선택하세요.\n"</div><div class='hunk'>@@ -5456,7 +5456,7 @@ msgstr "윈도우즈 파티션의 빈 공간 사용하세요."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "윈도우즈 파티션이 심하게 조각나 있습니다. 먼저 ``디스크 조각 모음''을 하세요."</div><div class='hunk'>@@ -5573,19 +5573,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5607,7 +5607,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5615,14 +5615,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5632,7 +5632,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5652,10 +5652,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5666,11 +5666,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5686,7 +5686,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5743,7 +5743,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5751,7 +5751,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "축하합니다. 설치가 성공적으로 끝났습니다.\n"</div><div class='ctx'> "부트 미디어를 제거하고 리턴을 눌러서 리부팅 하세요.\n"</div><div class='hunk'>@@ -5798,7 +5798,7 @@ msgstr "%s 단계로 넘어갑니다.\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -6322,7 +6322,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr "유효한 미러 목록을 받기 위해 맨드레이크 리눅스 웹사이트에 접속 중..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6539,7 +6539,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr "리눅스-맨드레이크 설치 %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -9111,7 +9111,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12781,7 +12781,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14585,18 +14585,18 @@ msgstr "중지"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "맨드레이크 온라인에 잘 오셨습니다."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14605,7 +14605,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14622,9 +14622,9 @@ msgstr "공개 소스 세계에 오신 것을 환영합니다."</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14644,7 +14644,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14670,10 +14670,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14692,8 +14692,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14720,7 +14720,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14730,7 +14730,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14749,13 +14749,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14767,7 +14767,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14781,19 +14781,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "맨드레이크 제어 센터"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14814,61 +14814,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14906,7 +14906,7 @@ msgstr "파일 시스템 암호화 키 선택"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14927,7 +14927,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15044,7 +15044,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15279,14 +15279,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;맨드레이크 제어 센터&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15308,9 +15308,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15322,7 +15322,7 @@ msgstr "맨드레이크 제어 센터"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15345,20 +15345,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;맨드레이크 온라인&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15377,33 +15377,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;맨드레이크 온라인&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -15426,32 +15426,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr "맨드레이크 제어 센터"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15746,7 +15746,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "맨드레이크 제어 센터"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -15842,7 +15842,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15890,7 +15890,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -18366,12 +18366,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "맨드레이크 버그 보고 도구"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "맨드레이크 제어 센터"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -18392,7 +18392,7 @@ msgstr "하드 드레이크"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr "맨드레이크 온라인"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -18437,7 +18437,7 @@ msgstr "설정 마법사"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18847,14 +18847,14 @@ msgstr "부팅시 시작됨"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "인터넷 연결이 없습니다.\n"</div><div class='ctx'> "「설정」을 눌러 먼저 연결을 설정하세요."</div><div class='hunk'>@@ -18907,7 +18907,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -19197,7 +19197,7 @@ msgstr "연결"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19676,7 +19676,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -19703,7 +19703,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "맨드레이크 제어 센터"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -22695,7 +22695,7 @@ msgstr "변경이 완료 되었지만, 적용되기 위해서는 재로그인해</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "맨드레이크 도구 설명"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -23202,7 +23202,7 @@ msgstr "연결 속도"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -24034,7 +24034,7 @@ msgstr "설치 실패."</div><div class='ctx'> #~ msgstr "폰트를 찾을 수 없었습니다.\n"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='ctx'> #~ msgstr "맨드레이크 제어 센터"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='hunk'>@@ -24370,7 +24370,7 @@ msgstr "설치 실패."</div><div class='ctx'> #~ msgid "mkraid failed"</div><div class='ctx'> #~ msgstr "mkraid 실패"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='ctx'> #~ msgstr "맨드레이크 온라인"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "The package %s is needed. Install it?"</div><div class='head'>diff --git a/perl-install/share/po/ky.po b/perl-install/share/po/ky.po<br/>index ba9edf9a1..70241b603 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/ky.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/ky.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/ky.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ky.po</a></div><div class='hunk'>@@ -68,7 +68,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB-ачкычта жазуудан коргонуу орнотулса керек,\n"</div><div class='ctx'> "бирок азыр аны чыгаруу кооптуу.\n"</div><div class='hunk'>@@ -76,7 +76,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Машинени кайра жүктөтүүчү түймөнү басыңыз, ачкычты чыгарып алыңыз,\n"</div><div class='ctx'> "жазуудан коргонуусун алыңыз дагы, ачкычты кайра салыңыз, андан соң\n"</div><div class='del'>-"Mandrake Move'ни кайра жүктөңүз."</div><div class='add'>+"Mandriva Move'ни кайра жүктөңүз."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -94,7 +94,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Сиздин USB-ачкычта бир дагы туура Windows (FAT) бөлүмү жок.\n"</div><div class='hunk'>@@ -105,14 +105,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Сиз USB-ачкычы жок эле ишти улантсаңыз боло берет - мындай\n"</div><div class='del'>-"учурда сиз Mandrake Move'ду кадимки live Mandrake операциондук\n"</div><div class='add'>+"учурда сиз Mandriva Move'ду кадимки live Mandriva операциондук\n"</div><div class='ctx'> "системасы катары колдоно аласыз."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -120,11 +120,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Сиздин системада эч бир USB-ачкычы табылган жок. Эгерде\n"</div><div class='del'>-"сиз USB-ачкычын азыр орнотсоңуз, Mandrake Move ушул же башка\n"</div><div class='add'>+"сиз USB-ачкычын азыр орнотсоңуз, Mandriva Move ушул же башка\n"</div><div class='ctx'> "компьютерде келечектеги жүктөлүүсүндө пайдалана алгыдай кылып\n"</div><div class='ctx'> "беримдерди өздүк каталогуңузга жана бүтүндөй системанын конфигурациясын\n"</div><div class='ctx'> "так сактап алуу мүмкүнчүлүгүн алат. Эскертүү: эгер ачкычты жаңы\n"</div><div class='hunk'>@@ -132,7 +132,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Учурда сиз USB-ачкычы жок эле ишти улантсаңыз болот - мындай\n"</div><div class='del'>-"учурда сиз Mandrake Move'ду кадимки Mandrake операциондук системасы\n"</div><div class='add'>+"учурда сиз Mandriva Move'ду кадимки Mandrake операциондук системасы\n"</div><div class='ctx'> "катары колдоно аласыз."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -260,7 +260,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -276,7 +276,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Мунун себеби USB-ачкычынындагы системалык конфигурациялык\n"</div><div class='ctx'> "файлдардын жабырланышында болушу мүмкүн, бул учурда\n"</div><div class='del'>-"көйгөйдү чечүү үчүн ачкычты сууруп салып Mandrake Move'ни\n"</div><div class='add'>+"көйгөйдү чечүү үчүн ачкычты сууруп салып Mandriva Move'ни\n"</div><div class='ctx'> "кайра жүктөө жетиштүү. Ал үчүн тиешелүү түймөнү басыңыз.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1319,11 +1319,11 @@ msgstr "Тилди тандоо"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux көп тилдүүлүктү колдойт. Орнотуу үчүн\n"</div><div class='add'>+"Mandrivalinux көп тилдүүлүктү колдойт. Орнотуу үчүн\n"</div><div class='ctx'> "каалаган тилди тандаңыз. Орнотуу процесси бүтүп,\n"</div><div class='ctx'> "системаңызды кайра жүктөгөн соң алар колдонууга даяр болот."</div><div class='ctx'> </div><div class='hunk'>@@ -3746,12 +3746,12 @@ msgstr "радиону колдоону иштетүү"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Мындан ары улантуу үчүн сиз лицензия шартын көңүл коюп окууңуз керек.\n"</div><div class='del'>-"Ал Mandrakelinux'тун бардык дистрибутивдерине таратылат. Эгер сиз анын\n"</div><div class='add'>+"Ал Mandrivalinux'тун бардык дистрибутивдерине таратылат. Эгер сиз анын\n"</div><div class='ctx'> "ичиндеги бардык шарттарга көнбөсөңүз, \"%s\" рамкасын тандаңыз. Андай\n"</div><div class='ctx'> "болбосо, \"%s\" баскычын бассаңыз сиздин компьютер кайра жүктөлөт."</div><div class='ctx'> </div><div class='hunk'>@@ -3931,13 +3931,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux орнотулушу бир нече CD-ROMго бөлүнүп жайгаштырылган. Эгерде\n"</div><div class='add'>+"Mandrivalinux орнотулушу бир нече CD-ROMго бөлүнүп жайгаштырылган. Эгерде\n"</div><div class='ctx'> "тандалган пакет башка CD-ROMдо жатса, DrakX учурдагы CDни чыгарып\n"</div><div class='ctx'> "керектелип жаткан тийишүү CDни салууңузду сурайт. Эгерде Сизде тийиштүү\n"</div><div class='ctx'> "CD кол алдыңызда жок болсо, жөн гана \"%s\" түймөсүн чертиңиз, бул учурда\n"</div><div class='hunk'>@@ -3947,11 +3947,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4003,12 +4003,12 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Эми системаңызга кайсы программаларды орнотууну кааларыңызды аныктоого\n"</div><div class='del'>-"убакыт келип жетти. Mandrakelinux менен кошо миңдеген пакеттер сунуш "</div><div class='add'>+"убакыт келип жетти. Mandrivalinux менен кошо миңдеген пакеттер сунуш "</div><div class='ctx'> "кылынат,\n"</div><div class='ctx'> "тандоону жеңилдетүү үчүн алар жакындыгынакарата топторго бөлүнгөн.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Пакеттер машинаңыздын колдонуу спецификасына дал келе тургандай\n"</div><div class='del'>-"болуп топторго иреттелген. Mandrakelinux'та пакетер төрт категория\n"</div><div class='add'>+"болуп топторго иреттелген. Mandrivalinux'та пакетер төрт категория\n"</div><div class='ctx'> "боюнча иреттелет. Сиз ар түрдүү категорияларда жайгашкан тиркемелерди\n"</div><div class='ctx'> "аралаштырып же айкалыштыра аласыз, мисалы ``Иш станциясы'' орнотуу варианты\n"</div><div class='ctx'> "``Иштеп түзүү'' категорясындагы тиркемелерди да камтышы мүмкүн.\n"</div><div class='hunk'>@@ -4113,10 +4113,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4146,11 +4146,11 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Эгерде кандайдыр бир сервердик пакет тандалса, сиз аны атайын\n"</div><div class='ctx'> "тандасаңыз же ал башка пакеттин бөлүгү болсо, сиз аны чынында эле\n"</div><div class='del'>-"ал серверлерди орнотууну каалагандыгыңызды сурайт. Mandrakelinux\n"</div><div class='add'>+"ал серверлерди орнотууну каалагандыгыңызды сурайт. Mandrivalinux\n"</div><div class='ctx'> "бардык орнотулган серверлерлерди жүктөө убагында алдынала ишке\n"</div><div class='ctx'> "киргизилет. Дистрибутив чыгарылып жаткан убакта алар коопсуздук\n"</div><div class='ctx'> "боюнча белгилүү проблемалары жок болгону менен, аларда бул\n"</div><div class='del'>-"Mandrakelinux версиясы чыгарылгандан кийин да, кооптуу болгон\n"</div><div class='add'>+"Mandrivalinux версиясы чыгарылгандан кийин да, кооптуу болгон\n"</div><div class='ctx'> "жылчыктар табылышы мүмкүн. Эгер сиз берилген кызмат эмне үчүн\n"</div><div class='ctx'> "колдонорун жана эмне иш кыларын билбесеңиз \"%s\" басыңыз.\n"</div><div class='ctx'> "Эгер сиз \"%s\" бассаңыз тизмедеги бардык кызматтар орнотулуп\n"</div><div class='hunk'>@@ -4301,7 +4301,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4356,7 +4356,7 @@ msgid ""</div><div class='ctx'> "not successful in getting the display configured."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (X Window системасы үчүн) GNU/Linux графикалык интерфейсинин\n"</div><div class='del'>-"жүрөгү, анын негизинде Mandrakelinux-ка кирген бардык графикалык\n"</div><div class='add'>+"жүрөгү, анын негизинде Mandrivalinux-ка кирген бардык графикалык\n"</div><div class='ctx'> "чөйрөлөр (KDE, GNOME, AfterStep, WindowMaker, ж.б.д.у.с.) иштейт.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Оптималдык графикалык көрүнүштү алуу үчүн, сизге ар түрдүү\n"</div><div class='hunk'>@@ -4472,12 +4472,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4504,7 +4504,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4513,7 +4513,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4533,11 +4533,11 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Бул кадамда, Mandrakelinux аркеттер системасын сиздин катуу дисктин\n"</div><div class='add'>+"Бул кадамда, Mandrivalinux аркеттер системасын сиздин катуу дисктин\n"</div><div class='ctx'> "кайсы жерине орнотууну чечүүңүзгө туура келет. Эгер сиздин катуу диск бош\n"</div><div class='ctx'> "болсо же орнотулган аракеттери системасы дисктин бардыгын ээлесе, сизге\n"</div><div class='ctx'> "дискиңизди кайра бөлүүгө туура келет. Негизинен дискти бөлүү сиздин\n"</div><div class='del'>-"жаңы Mandrakelinux системасын орнотуу үчүн дисктен логикалык түрдө\n"</div><div class='add'>+"жаңы Mandrivalinux системасын орнотуу үчүн дисктен логикалык түрдө\n"</div><div class='ctx'> "орун бөлүүдө турат.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Эгерде дискте орнотулган аракеттер системасы болсо, дискти бөлүү кайра\n"</div><div class='hunk'>@@ -4563,7 +4563,7 @@ msgstr ""</div><div class='ctx'> "Windows FAT же NTFS бөлүмдөрүнүн өлчөмдөрүн өзгөртсөңүз болот.\n"</div><div class='ctx'> "Өлчөмүн өзгөртүү процессин маалыматтарды жоготпой жасаса да болот, өзгөчө\n"</div><div class='ctx'> "Windows бөлүмү дефрагментация кылынгандан кийин. Маалыматтарыңыздын\n"</div><div class='del'>-"резервдик копиясын түзүү көптөн-көп сунуш кылынат.Эгер сиз Mandrakelinux\n"</div><div class='add'>+"резервдик копиясын түзүү көптөн-көп сунуш кылынат.Эгер сиз Mandrivalinux\n"</div><div class='ctx'> "жана Microsoft Windows бир компьютерде колдонгуңуз келсе, бул опцияны\n"</div><div class='ctx'> "тандаңыз.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4572,7 +4572,7 @@ msgstr ""</div><div class='ctx'> "берилиштерин жана жаңы программаларды орнотуу үчүн бош орун азыраак болот.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" эгер сиз катуу дискиңиздеги бардык маалыматтарды жоготуп ордуна\n"</div><div class='del'>-"Mandrakelinux орнотууну кааласаңыз, бул опцияны тандаңыз. Бул чечимди\n"</div><div class='add'>+"Mandrivalinux орнотууну кааласаңыз, бул опцияны тандаңыз. Бул чечимди\n"</div><div class='ctx'> "тандоодо этият болуңуз, себеби муну тастыктаган соң бардыгын мурда\n"</div><div class='ctx'> "болгондой кылып калыбына келтире албайсыз.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4733,7 +4733,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4758,7 +4758,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Бөлүмдөрдү форматтого даяр болгондон кийин \"%s\" баскычын басыңыз.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Эгер сиз Mandrakelinux системасын башка бөлүмгө орноткуңуз келсе \"%s\"\n"</div><div class='add'>+"Эгер сиз Mandrivalinux системасын башка бөлүмгө орноткуңуз келсе \"%s\"\n"</div><div class='ctx'> "баскычын басыңыз.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Эгер сиз начар делген блокторду (bad blocks) текшерүүгө бөлүмдөрдү\n"</div><div class='hunk'>@@ -4776,7 +4776,7 @@ msgstr "Мурунку"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4788,7 +4788,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux орнотуу убагында баштапкы релиздин кээ бир пакеттерин\n"</div><div class='add'>+"Mandrivalinux орнотуу убагында баштапкы релиздин кээ бир пакеттерин\n"</div><div class='ctx'> "жаңы чыкандары менен жаңыласаңыз жакшы болот. Кээ бир багдар\n"</div><div class='ctx'> "оңдолушу жана коопсуздук проблемалары чечилиши мүмкүн. Бул\n"</div><div class='ctx'> "жаңылоолордон пайда алуу үчүн аларды сиз азыр Интернеттен жүктөп\n"</div><div class='hunk'>@@ -4817,7 +4817,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4845,7 +4845,7 @@ msgstr "Коопсуздук администратору"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4931,7 +4931,7 @@ msgstr "Нормалдык/эксперттик режимдерин алмаш�</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4976,7 +4976,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4985,13 +4985,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -5032,7 +5032,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5191,7 +5191,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5212,7 +5212,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5312,7 +5312,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5329,7 +5329,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5391,7 +5391,7 @@ msgstr "Кызматтар"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5728,7 +5728,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5832,19 +5832,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5866,7 +5866,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5874,14 +5874,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5891,7 +5891,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5911,10 +5911,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5925,11 +5925,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5945,7 +5945,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -6002,7 +6002,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6010,7 +6010,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6042,7 +6042,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -6544,7 +6544,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6749,7 +6749,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -9311,7 +9311,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12873,7 +12873,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14537,18 +14537,18 @@ msgstr "Стоп"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux&lt;/b&gt;'ка кош келиңиз!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux&lt;/b&gt;'ка кош келиңиз!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14557,7 +14557,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14574,9 +14574,9 @@ msgstr ""</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14596,7 +14596,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14622,10 +14622,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14644,8 +14644,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14672,7 +14672,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14682,7 +14682,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14701,13 +14701,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14719,7 +14719,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14733,20 +14733,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux Updates апплети"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux Updates апплети"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -14766,61 +14766,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14858,7 +14858,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14879,7 +14879,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14909,7 +14909,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/15.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Kontact&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/15.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -14996,7 +14996,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15231,14 +15231,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15260,9 +15260,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15274,7 +15274,7 @@ msgstr "&lt;b&gt;Серверлер&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15297,20 +15297,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15329,33 +15329,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -15378,32 +15378,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15710,8 +15710,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -15806,7 +15806,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15854,7 +15854,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -18304,13 +18304,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Башкаруу Борбору"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Башкаруу Борбору"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18330,8 +18330,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18375,7 +18375,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18783,14 +18783,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -18841,7 +18841,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -19126,7 +19126,7 @@ msgstr ""</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19584,7 +19584,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -19611,8 +19611,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux Башкаруу Борбору"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux Башкаруу Борбору"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -22670,7 +22670,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Mandrake куралдарынын журналдары"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -23186,7 +23186,7 @@ msgstr "Туташуу ишке ашты."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Туташуу ишке ашпады.\n"</div><div class='ctx'> "Mandrake Башкаруу Борборунан конфигурацияны текшериңиз."</div><div class='head'>diff --git a/perl-install/share/po/lt.po b/perl-install/share/po/lt.po<br/>index 1ec07e2c8..bafb1abd7 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/lt.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/lt.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/lt.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/lt.po</a></div><div class='hunk'>@@ -57,7 +57,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -76,7 +76,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +84,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -92,7 +92,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -218,7 +218,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1223,7 +1223,7 @@ msgstr "Vanuatu"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "Tu gali pasirinkti kitas kalbas, kurios bus prieinamos po įdiegimo"</div><div class='hunk'>@@ -3505,7 +3505,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3655,7 +3655,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3666,11 +3666,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3777,10 +3777,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3902,7 +3902,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4000,12 +4000,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4032,7 +4032,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4041,7 +4041,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4062,10 +4062,10 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dabar tu turi nuspręsti, kurioje savo kietojo disko vietoje nori įdiegti\n"</div><div class='del'>-"Mandrakelinux operacijų sistemą. Jei jis yra tuščias arba jau esanti\n"</div><div class='add'>+"Mandrivalinux operacijų sistemą. Jei jis yra tuščias arba jau esanti\n"</div><div class='ctx'> "operacijų sistema naudoja visą vietą jame, tau reikės sudalinti jį. Kietojo\n"</div><div class='ctx'> "disko sudalinimas į skirsnius tiesiog yra jo logiškas padalinimas taip, kad\n"</div><div class='del'>-"atsirastų laisvos vietos įdiegti tavo naujajai Mandrakelinux sistemai.\n"</div><div class='add'>+"atsirastų laisvos vietos įdiegti tavo naujajai Mandrivalinux sistemai.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kadangi sudalinimo skirsniais padariniai dažniausiai yra negrįžtami,\n"</div><div class='hunk'>@@ -4096,7 +4096,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "* Išvalyti visą diską: jei tu nori sunaikinti visus duomenis ir skirsnius, "</div><div class='ctx'> "esančius kietajame diske, ir pakeisti juos\n"</div><div class='del'>-"  nauja Mandrakelinux sistema, gali pasirinkti šį variantą. Būk atsargus su "</div><div class='add'>+"  nauja Mandrivalinux sistema, gali pasirinkti šį variantą. Būk atsargus su "</div><div class='ctx'> "šiuo sprendimu, nes jei sutiksi,\n"</div><div class='ctx'> "  nebegalėsi apsigalvoti ir sugrįžti.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4109,7 +4109,7 @@ msgstr ""</div><div class='ctx'> "sprendimus) arba pakeisti Windows skirsnio\n"</div><div class='ctx'> "  dydį. Dydžio pakeitimas gali būti atliktas be duomenų praradimo. Šis "</div><div class='ctx'> "sprendimas yra rekomenduojamas, jei\n"</div><div class='del'>-"  tu nori naudoti tiek Mandrakelinux, tiek Microsoft Windows tame pačiame "</div><div class='add'>+"  tu nori naudoti tiek Mandrivalinux, tiek Microsoft Windows tame pačiame "</div><div class='ctx'> "kompiuteryje.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4235,7 +4235,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4264,7 +4264,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Spausk \"Atšaukti\", jei nori pasirinkti kitus skirsnius, į kuriuos įdiegti\n"</div><div class='del'>-"Mandrakelinux sistemą."</div><div class='add'>+"Mandrivalinux sistemą."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434</div><div class='ctx'> #: interactive/newt.pm:318 printer/printerdrake.pm:3676</div><div class='hunk'>@@ -4278,7 +4278,7 @@ msgstr "Ankstesnis"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4307,7 +4307,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4323,7 +4323,7 @@ msgstr "Nutolusio lpd spausdintuvo nuostatos"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4480,7 +4480,7 @@ msgstr "Pakeisti į normalų režimą"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4511,7 +4511,7 @@ msgstr ""</div><div class='ctx'> "Tavo kietajame diske buvo aptiktas vienas ar daugiau Microsoft Windows\n"</div><div class='ctx'> "skirsnis. Prašom pasirinkti, kurio iš jų dydį nori pakeisti, kad įdiegtum "</div><div class='ctx'> "savo\n"</div><div class='del'>-"naująją Mandrakelinux operacijų sistemą.\n"</div><div class='add'>+"naująją Mandrivalinux operacijų sistemą.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Tavo žiniai, kiekvienas skirsnis sąraše užrašomas pavidalu \"Linux "</div><div class='hunk'>@@ -4567,7 +4567,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4576,13 +4576,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4623,7 +4623,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4782,7 +4782,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4803,7 +4803,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4929,7 +4929,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4946,7 +4946,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5008,11 +5008,11 @@ msgstr "Paslaugų nustatymai"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Pasirink kietąjį diską, kurį nori ištuštinti, kad įdiegtum naują\n"</div><div class='del'>-"Mandrakelinux sistemą. Būk atsargus, visi duomenys, esantys jame, bus\n"</div><div class='add'>+"Mandrivalinux sistemą. Būk atsargus, visi duomenys, esantys jame, bus\n"</div><div class='ctx'> "prarasti, ir jų nebebus įmanoma atkurti."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -5347,7 +5347,7 @@ msgstr "Naudoti laisvą vietą Windows skirsnyje"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tavo Windows skirsnis yra pernelyg fragmentuotas, pirma paleisk „defrag“"</div><div class='hunk'>@@ -5466,19 +5466,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5500,7 +5500,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5508,14 +5508,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5525,7 +5525,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5545,10 +5545,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5559,11 +5559,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5579,7 +5579,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5665,7 +5665,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5673,13 +5673,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sveikiname. Įdiegimas baigtas.\n"</div><div class='ctx'> "Ištrauk įdiegimo laikmenas ir spausk Enter, kad perkrautum.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Kad sužinotum apie pataisymus, kurie prieinami šiai Mandrakelinux laidai,\n"</div><div class='add'>+"Kad sužinotum apie pataisymus, kurie prieinami šiai Mandrivalinux laidai,\n"</div><div class='ctx'> "pasižiūrėk į Errata, kuris yra \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5687,7 +5687,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informacija apie tavo sistemos konfigūravimą yra oficialioje\n"</div><div class='del'>-"Mandrakelinux User's Guide knygoje."</div><div class='add'>+"Mandrivalinux User's Guide knygoje."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -5722,12 +5722,12 @@ msgstr "Įeinama į žingsnį „%s“\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tavo sistemoje mažai resursų. Tu gali susidurti su bėdomis, įdiegdamas\n"</div><div class='del'>-"Mandrakelinux. Jei taip atsitiktų, gali pabandyti tekstinį diegimo būdą:\n"</div><div class='add'>+"Mandrivalinux. Jei taip atsitiktų, gali pabandyti tekstinį diegimo būdą:\n"</div><div class='ctx'> "Kai užsikrauna iš CDROM'o, paspausk `F1', o tada įvesk \"text\"."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_gtk.pm:228 install_steps_interactive.pm:624</div><div class='hunk'>@@ -6240,7 +6240,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Jungiamasi prie atvaizdžio (mirror), kad gautume prieinamų paketų sąrašą"</div><div class='ctx'> </div><div class='hunk'>@@ -6457,8 +6457,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux įdiegimas %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux įdiegimas %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9028,7 +9028,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12657,7 +12657,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14397,18 +14397,18 @@ msgstr "Sustoti"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Sveiki atvykę į &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Sveiki atvykę į &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14417,7 +14417,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14434,9 +14434,9 @@ msgstr "Nustatymų tikrinimas"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14456,7 +14456,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14482,10 +14482,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14504,8 +14504,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14532,7 +14532,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14542,7 +14542,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14561,13 +14561,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14579,7 +14579,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14593,19 +14593,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "Prisijungti prie interneto"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14626,61 +14626,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14718,7 +14718,7 @@ msgstr "Kiti grafiniai darbalaukiai"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14739,7 +14739,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14856,7 +14856,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15091,14 +15091,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "Prisijungti prie interneto"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15120,9 +15120,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15134,7 +15134,7 @@ msgstr "Prisijungti prie interneto"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15157,20 +15157,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr "Prisijungti prie interneto"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15189,33 +15189,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "Prisijungti prie interneto"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -15238,32 +15238,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr "Prisijungti prie interneto"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15565,7 +15565,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "Prisijungti prie interneto"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -15661,7 +15661,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15709,7 +15709,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -18161,12 +18161,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Prisijungti prie interneto"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "Prisijungti prie interneto"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -18187,7 +18187,7 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr "Prisijungti prie interneto"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -18232,7 +18232,7 @@ msgstr "Tinklo Konfigūravimo Meistras"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18638,14 +18638,14 @@ msgstr "Startavo įkrovos metu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -18696,7 +18696,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18981,7 +18981,7 @@ msgstr "Importuoti"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19464,7 +19464,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -19491,7 +19491,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Prisijungti prie interneto"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -22485,7 +22485,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Konsolės įrankiai"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -22989,7 +22989,7 @@ msgstr "Jungties tipas: "</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -23819,7 +23819,7 @@ msgstr "Įdiegimas nepavyko"</div><div class='ctx'> #~ msgstr "Pašalinti eilę"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='ctx'> #~ msgstr "Prisijungti prie interneto"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='head'>diff --git a/perl-install/share/po/ltg.po b/perl-install/share/po/ltg.po<br/>index bb8ceb468..25b3933dc 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/ltg.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/ltg.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/ltg.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ltg.po</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> # SOME DESCRIPTIVE TITLE.</div><div class='ctx'> # Copyright (C) 2000 Free Software Foundation, Inc.</div><div class='del'>-# Copyright (c) 2000 Mandrakesoft.</div><div class='add'>+# Copyright (c) 2000 Mandriva.</div><div class='ctx'> #</div><div class='ctx'> msgid ""</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -60,7 +60,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Izaver, ka USB atslāgai ir uzstuodeits raksteišonys aizlīgums, bet tagad\n"</div><div class='ctx'> "tū nav īspiejams drūši izjimt.\n"</div><div class='hunk'>@@ -68,7 +68,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Nūspīdit pūgu, kab puorsuokneitu mašynu, izjemit tū, nūjemit raksteišonys "</div><div class='ctx'> "aizlīgumu,\n"</div><div class='del'>-"otkon pīsliedzit, i vēlreiz palaidit Mandrake Move."</div><div class='add'>+"otkon pīsliedzit, i vēlreiz palaidit Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -86,7 +86,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Jiusu USB atslāgai nav ni vīna dereiga Windows (FAT) nūdaliejuma.\n"</div><div class='hunk'>@@ -98,14 +98,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Jius varit ari turpynuot bez USB atslāgys - jiusim jūprūjom byus\n"</div><div class='del'>-"īspieja lītuot Mandrake Move kai normali dorbojūšūs Mandrake\n"</div><div class='add'>+"īspieja lītuot Mandriva Move kai normali dorbojūšūs Mandrake\n"</div><div class='ctx'> "opereituojsistemu."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -113,11 +113,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Natyka atrosta ni vīna USB atslāga iz jiusu sistemys.\n"</div><div class='del'>-"Ja jius pīslēgsit USB atslāgu niule, Mandrake Move byus pīeja\n"</div><div class='add'>+"Ja jius pīslēgsit USB atslāgu niule, Mandriva Move byus pīeja\n"</div><div class='ctx'> "napuorprūtami saglobuot datus jiusu sātys katalogā\n"</div><div class='ctx'> "i vysys sistemys konfiguraceju dieļ nuokūšuos suokneišonys iz ituo\n"</div><div class='ctx'> "ci iz cyta datora. Pīzeime: ja jius pīslēdzet atslāgu tagad,\n"</div><div class='hunk'>@@ -125,7 +125,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Jius varit ari turpynuot bez USB atslāgys - jiusim jūprūjom byus\n"</div><div class='del'>-"īspieja lītuot Mandrake Move kai normali dorbuojūšūs Mandrake\n"</div><div class='add'>+"īspieja lītuot Mandriva Move kai normali dorbuojūšūs Mandrake\n"</div><div class='ctx'> "opereituojsistemu."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -252,7 +252,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1273,11 +1273,11 @@ msgstr "Manuali"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux var nūdrūšynuot vairuokys volūdys. Izavielejit\n"</div><div class='add'>+"Mandrivalinux var nūdrūšynuot vairuokys volūdys. Izavielejit\n"</div><div class='ctx'> "volūdys, kaidys gribit uzstuodeit. Tuos byus pīejamys,\n"</div><div class='ctx'> "kod jiusu instaleišona byus gotova i jius puorstarteisit sovu sistemu."</div><div class='ctx'> </div><div class='hunk'>@@ -3610,13 +3610,13 @@ msgstr "īslēgt radejis atbolstu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Pyrms turpynuot, jiusim vajadzātu uzmaneigi izlaseit licencis vīnuošonūs. "</div><div class='ctx'> "Tei nūsadz\n"</div><div class='del'>-"vysu Mandrakelinux distribuceju. Ja jius napīkreitit vysim tuos "</div><div class='add'>+"vysu Mandrivalinux distribuceju. Ja jius napīkreitit vysim tuos "</div><div class='ctx'> "nūteikumiem,\n"</div><div class='ctx'> "puorbaudit \"%s\"  kasti, nūspīdit pūgu \"%s\",\n"</div><div class='ctx'> "lai jiusu dators puorstarteitu."</div><div class='hunk'>@@ -3756,13 +3756,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux instalācija ir sadalīta pa dažiem CD-ROM diskiem. DrakX\n"</div><div class='add'>+"Mandrivalinux instalācija ir sadalīta pa dažiem CD-ROM diskiem. DrakX\n"</div><div class='ctx'> "zin, vai izvēlētā pakotne atrodas uz cita CD-ROM diska, izvirzīs pašreizējo\n"</div><div class='ctx'> "kompaktdisku un palūgs ievietot citu pēc nepieciešamības."</div><div class='ctx'> </div><div class='hunk'>@@ -3770,11 +3770,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3881,10 +3881,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4005,7 +4005,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4111,12 +4111,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4143,7 +4143,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4152,7 +4152,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4172,11 +4172,11 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pošlaik jiusim ir juoizavielej, kur iz cītuo diska instalēt Mandrakelinux\n"</div><div class='add'>+"Pošlaik jiusim ir juoizavielej, kur iz cītuo diska instalēt Mandrivalinux\n"</div><div class='ctx'> "opereituojsistemu. Ja disks ir tukšs voi cyta opereituojsistema aizjam vysu\n"</div><div class='ctx'> "vītu iz diska, jiusim byus juoveic diska sadaleišona. Eisumā, cītuo diska\n"</div><div class='ctx'> "sadaleišona nūzeimej tū sadaleit logiskuos daļuos, lai izveiduotu vītu\n"</div><div class='del'>-"Mandrakelinux sistemys instaleišonai.\n"</div><div class='add'>+"Mandrivalinux sistemys instaleišonai.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Sakarā ar tū, ka diska sadaleišonys process parasti ir naatgrīzenisks,\n"</div><div class='ctx'> "napīredziejušam lītuotuojam tys var byut napateikams i stresa pylns.\n"</div><div class='hunk'>@@ -4205,7 +4205,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "* Izdzēst visu disku: ja vēlaties izdzēst visus uz diska esošos datus un "</div><div class='ctx'> "sadaļas un aizstāt tās ar jaunu\n"</div><div class='del'>-"  Mandrakelinux sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "</div><div class='add'>+"  Mandrivalinux sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "</div><div class='ctx'> "izvēloties šo risinājumu, jo pēc\n"</div><div class='ctx'> "  apstiprināšanas jūs vairs nevarēsit atteikties no šīs izvēles.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4218,7 +4218,7 @@ msgstr ""</div><div class='ctx'> "vai izmainīt Microsoft\n"</div><div class='ctx'> "  Windows sadaļas izmēru. Sadaļas izmēru var izmainīt bez datu zaudēšanas. "</div><div class='ctx'> "Šis risinājums ir ieteicams, ja\n"</div><div class='del'>-"  jūs savā datorā vēlaties izmantot gan Mandrakelinux, gan Microsoft "</div><div class='add'>+"  jūs savā datorā vēlaties izmantot gan Mandrivalinux, gan Microsoft "</div><div class='ctx'> "Windows.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4342,7 +4342,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4366,7 +4366,7 @@ msgstr ""</div><div class='ctx'> "Noklikšķiniet \"Labi\", kad esat gatavi formatēt sadaļas.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Noklikšķiniet \"Atcelt\", ja jūs gribat izvēlēties citas sadaļas, kur\n"</div><div class='del'>-"instalēt jauno Mandrakelinux operētājsistēmu."</div><div class='add'>+"instalēt jauno Mandrivalinux operētājsistēmu."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434</div><div class='ctx'> #: interactive/newt.pm:318 printer/printerdrake.pm:3676</div><div class='hunk'>@@ -4380,7 +4380,7 @@ msgstr "Atpakaļ"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4409,7 +4409,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4433,7 +4433,7 @@ msgstr "Drošības administrators:"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4503,7 +4503,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pašlaik jums ir jāizvēlas, kurā(s) diska sadaļā(s) instalēt Mandrakelinux\n"</div><div class='add'>+"Pašlaik jums ir jāizvēlas, kurā(s) diska sadaļā(s) instalēt Mandrivalinux\n"</div><div class='ctx'> "operētājsistēmu. Ja sadaļas jau ir izveidotas (agrākas GNU/Linux "</div><div class='ctx'> "instalēšanas\n"</div><div class='ctx'> "laikā vai ar citu diska sadalīšanas rīku), jūs varat izmantot esošās "</div><div class='hunk'>@@ -4586,7 +4586,7 @@ msgstr "Pārslēgt normālajā režīmā"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4616,7 +4616,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Uz jūsu cietā diska ir atrasta vairāk nekā viena Microsoft Windows sadaļa.\n"</div><div class='ctx'> "Lūdzu izvēlieties to sadaļu, kuras izmēru jūs vēlaties izmainīt, lai\n"</div><div class='del'>-"instalētu jauno Mandrakelinux operētājsistēmu.\n"</div><div class='add'>+"instalētu jauno Mandrivalinux operētājsistēmu.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Jūsu zināšanai, katra sadaļa ir uzskaitīta šādā veidā: \"Linux nosaukums\",\n"</div><div class='hunk'>@@ -4663,7 +4663,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4672,13 +4672,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4732,7 +4732,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4891,7 +4891,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4912,7 +4912,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5033,7 +5033,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5050,7 +5050,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5112,11 +5112,11 @@ msgstr "Servisi"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Norādiet cieto disku, ko vēlaties izdzēst, lai izveidotu jaunu\n"</div><div class='del'>-"Mandrakelinux sadaļu. Esiet uzmanīgi, jo visi diskā esošie dati\n"</div><div class='add'>+"Mandrivalinux sadaļu. Esiet uzmanīgi, jo visi diskā esošie dati\n"</div><div class='ctx'> "pazudīs un nebūs atjaunojami."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -5465,11 +5465,11 @@ msgstr "Izmantot Windows sadaļas brīvo vietu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Windows sadaļa ir puoruok fragmenteita. Vyspyrms nu Windows vidis palaidit "</div><div class='del'>-"``defrag'' i tod atsuocit Mandrakelinux instaleišonu."</div><div class='add'>+"``defrag'' i tod atsuocit Mandrivalinux instaleišonu."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -5585,19 +5585,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5619,7 +5619,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5627,14 +5627,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5644,7 +5644,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5664,10 +5664,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5678,11 +5678,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5698,7 +5698,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5787,7 +5787,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5795,14 +5795,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Apsveicam, instaleišona ir pabeigta.\n"</div><div class='ctx'> "Izjemit suokneišonys datu nesieju i nūspīdit īvodu, lai puorstarteitu "</div><div class='ctx'> "datoru.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Lai sajimtu informaceju par lobuojumim, kas ir pīejami itam Mandrakelinux\n"</div><div class='add'>+"Lai sajimtu informaceju par lobuojumim, kas ir pīejami itam Mandrivalinux\n"</div><div class='ctx'> "izdavumam, skotit Errata failu, kas atrūnams\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5810,7 +5810,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informaceja par jiusu sistemys konfigureišonu ir pīejama Oficialajā\n"</div><div class='del'>-"Mandrakelinux lītuotuoja rūkysgruomotys piecinstaleišonys (post install) "</div><div class='add'>+"Mandrivalinux lītuotuoja rūkysgruomotys piecinstaleišonys (post install) "</div><div class='ctx'> "nūdaļā."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5846,11 +5846,11 @@ msgstr "Uzsuocu sūli `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Jiusu sistemai tryukst resursu. Mandrakelinux instaleišonys laikā var\n"</div><div class='add'>+"Jiusu sistemai tryukst resursu. Mandrivalinux instaleišonys laikā var\n"</div><div class='ctx'> "rastīs problemys. Ja tai nūteik, varit pamieginuot teksta režima "</div><div class='ctx'> "instaleišonu.\n"</div><div class='ctx'> "Lai tū izdareitu, nūspīdit`F1', kod nūteik īluode nu CDROM, tod īvodit\n"</div><div class='hunk'>@@ -6388,9 +6388,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pīsaslādzu Mandrakelinux teimeklim, lai sajimtu pīejamū spūguļserveru "</div><div class='add'>+"Pīsaslādzu Mandrivalinux teimeklim, lai sajimtu pīejamū spūguļserveru "</div><div class='ctx'> "sarokstu..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6606,8 +6606,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux instaleišona %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux instaleišona %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9201,13 +9201,13 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall konfigurētājs\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Šis rīks konfigurē personālo ugunssienu priekš Mandrakelinux\n"</div><div class='add'>+"Šis rīks konfigurē personālo ugunssienu priekš Mandrivalinux\n"</div><div class='ctx'> "datora. Priekš spēcīga, ugunssienas izveidei veltīta risinājuma,\n"</div><div class='ctx'> "lūdzu apskatiet MandrakeSecurity Firewall XXXXXX."</div><div class='ctx'> </div><div class='hunk'>@@ -12943,7 +12943,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14723,18 +14723,18 @@ msgstr "Apturēt"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Laipni lyudzam &lt;b&gt;Mandrakelinux&lt;/b&gt;'ā!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Laipni lyudzam &lt;b&gt;Mandrivalinux&lt;/b&gt;'ā!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14743,7 +14743,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14760,9 +14760,9 @@ msgstr "Esit sveicynuoti atvartuo koda pasaulē!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14782,7 +14782,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14808,10 +14808,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14830,8 +14830,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14858,7 +14858,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14868,7 +14868,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14887,13 +14887,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14905,7 +14905,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14919,19 +14919,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Mandrake veikals&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14952,61 +14952,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15044,7 +15044,7 @@ msgstr "&lt;b&gt;Izavielejit jiusu dorba viersmys grafiskū vidi!&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15065,7 +15065,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15095,7 +15095,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/15.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Kontact&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/15.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15182,7 +15182,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15417,14 +15417,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux kontrolis centrs&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux kontrolis centrs&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15446,9 +15446,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15460,7 +15460,7 @@ msgstr "&lt;b&gt;Mandrake veikals&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15483,20 +15483,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15515,33 +15515,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -15564,32 +15564,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15890,7 +15890,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "&lt;b&gt;Mandrake veikals&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -15986,7 +15986,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16034,7 +16034,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -18563,13 +18563,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Mandrake kliudys ziņuojumu reiks"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux kontrolis centrs"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux kontrolis centrs"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18589,8 +18589,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18634,7 +18634,7 @@ msgstr "Konfigureišonys miestars"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19047,19 +19047,19 @@ msgstr "Palaists pi īluodis"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Itei saskarne vēl nabeja nūkonfigurāta.\n"</div><div class='del'>-"Palaidit paleigu \"Pīvīnuot saskarni\" nu Mandrakelinux kontrolis centra."</div><div class='add'>+"Palaidit paleigu \"Pīvīnuot saskarni\" nu Mandrivalinux kontrolis centra."</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Itei saskarne vēl nabeja nūkonfigurāta.\n"</div><div class='del'>-"Palaidit paleigu \"%s\" nu Mandrakelinux kontrolis centra."</div><div class='add'>+"Palaidit paleigu \"%s\" nu Mandrivalinux kontrolis centra."</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -19109,7 +19109,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -19404,7 +19404,7 @@ msgstr "Importēt"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19911,7 +19911,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -19938,7 +19938,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Mandrake kontrolis centrs"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -22966,7 +22966,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Mandrake reiku aproksti"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -23481,7 +23481,7 @@ msgstr "Savīnuojums izpiļdeits."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -24326,7 +24326,7 @@ msgstr "Instalaceja naizadeve"</div><div class='ctx'> #~ msgstr "Jius naizavielēt nivīnu fontu"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Mandrake veikals&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='hunk'>@@ -24443,13 +24443,13 @@ msgstr "Instalaceja naizadeve"</div><div class='ctx'> #~ msgstr "Kliuda, atverūt %s īraksteišonai: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Itys ir HardDrake, Mandrakelinux aparaturys konfigureišonys reiks.\n"</div><div class='add'>+#~ "Itys ir HardDrake, Mandrivalinux aparaturys konfigureišonys reiks.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Verseja:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Autors:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -24790,8 +24790,8 @@ msgstr "Instalaceja naizadeve"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Naizadeve printeri \"%s\" nūjimt nu Star Office/OpenOffice.org/GIMP."</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Congratulations for choosing Mandrakelinux!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Paļdis, ka izavielēt Mandrakelinux!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Congratulations for choosing Mandrivalinux!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Paļdis, ka izavielēt Mandrivalinux!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Discovery&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Atkluošona&lt;/b&gt;"</div><div class='hunk'>@@ -24799,21 +24799,21 @@ msgstr "Instalaceja naizadeve"</div><div class='ctx'> #~ msgid "&lt;b&gt;Surf The Internet&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Puorlyukojit Internetu&lt;/b&gt;"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Become a &lt;b&gt;Mandrakeclub&lt;/b&gt; member!"</div><div class='add'>+#~ msgid "Become a &lt;b&gt;Mandriva Club&lt;/b&gt; member!"</div><div class='ctx'> #~ msgstr "Kliustit  par &lt;b&gt;Mandrake kluba&lt;/b&gt; lūcekli!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Full access to commercial applications"</div><div class='ctx'> #~ msgstr "\t* Pylna pīeja komercialajom aplikacejom"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Voting for software to put in Mandrakelinux"</div><div class='add'>+#~ msgid "\t* Voting for software to put in Mandrivalinux"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "\t* Īspieja bolsuot par programmnūdrūšynuojumu, kurs tiks īkļauts "</div><div class='del'>-#~ "Mandrakelinux\"ā"</div><div class='add'>+#~ "Mandrivalinux\"ā"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "Do you require assistance?"</div><div class='ctx'> #~ msgstr "Voi jiusim ir vajadzeiga paleidzeiba?"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Become a Mandrakeclub member!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Become a Mandriva Club member!&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Kliustit par Mandrake kluba lūcekli!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Do you require assistance?&lt;/b&gt;"</div><div class='hunk'>@@ -24855,14 +24855,14 @@ msgstr "Instalaceja naizadeve"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Before continuing, you should carefully read the terms of the license. "</div><div class='ctx'> #~ "It\n"</div><div class='del'>-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "</div><div class='add'>+#~ "covers the entire Mandrivalinux distribution. If you do agree with all "</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"</div><div class='ctx'> #~ "will reboot your computer."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Pyrms turpynuot, jiusim vajadzātu uzmaneigi izlaseit licencis vīnuošonūs. "</div><div class='ctx'> #~ "Tei nūsadz\n"</div><div class='del'>-#~ "vysu Mandrakelinux distribuceju. Ja jius napīkreitit vysim tuos "</div><div class='add'>+#~ "vysu Mandrivalinux distribuceju. Ja jius napīkreitit vysim tuos "</div><div class='ctx'> #~ "nūteikumiem,\n"</div><div class='ctx'> #~ "puorbaudit \"%s\"  kasti, nūspīdit pūgu \"%s\",\n"</div><div class='ctx'> #~ "lai jiusu dators puorstarteitu."</div><div class='hunk'>@@ -24956,8 +24956,8 @@ msgstr "Instalaceja naizadeve"</div><div class='ctx'> #~ msgid "&lt;b&gt;Become a MandrakeClub member!&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Kliustit par Mandrake kluba lūcekli!&lt;/b&gt;"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "This interface has not been configured yet.\n"</div><div class='head'>diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po<br/>index 068b95983..b8eb07ecb 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/lv.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/lv.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/lv.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/lv.po</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> # SOME DESCRIPTIVE TITLE.</div><div class='ctx'> # Copyright (C) 2000 Free Software Foundation, Inc.</div><div class='del'>-# Copyright (c) 2000 Mandrakesoft.</div><div class='add'>+# Copyright (c) 2000 Mandriva.</div><div class='ctx'> #</div><div class='ctx'> msgid ""</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -58,7 +58,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -77,7 +77,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +85,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -93,7 +93,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -219,7 +219,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1237,7 +1237,7 @@ msgstr "Mjanma"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "Jūs varat izvēlēties citas valodas, kas būs pieejamas pēc instalēšanas"</div><div class='hunk'>@@ -3570,13 +3570,13 @@ msgstr "ieslēgt radio atbalstu"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Pirms turpināt, Jums vajadzētu uzmanīgi izlasīt licences vienošanos. Tā "</div><div class='ctx'> "nosedz\n"</div><div class='del'>-"visu Mandrakelinux distribūciju, un ja Jūs nepiekrītat visiem noteikumiem,\n"</div><div class='add'>+"visu Mandrivalinux distribūciju, un ja Jūs nepiekrītat visiem noteikumiem,\n"</div><div class='ctx'> "nospiediet uz pogas \"Noraidīt\", kas nekavējoties pārtrauks instalāciju. "</div><div class='ctx'> "Lai turpinātu\n"</div><div class='ctx'> "instalācijas procesu, nospiediet pogu \"Pieņemt\"."</div><div class='hunk'>@@ -3716,13 +3716,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux instalācija ir sadalīta pa dažiem CD-ROM diskiem. DrakX\n"</div><div class='add'>+"Mandrivalinux instalācija ir sadalīta pa dažiem CD-ROM diskiem. DrakX\n"</div><div class='ctx'> "zin, vai izvēlētā pakotne atrodas uz cita CD-ROM diska, izvirzīs pašreizējo\n"</div><div class='ctx'> "kompaktdisku un palūgs ievietot citu pēc nepieciešamības."</div><div class='ctx'> </div><div class='hunk'>@@ -3730,11 +3730,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3843,10 +3843,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3967,7 +3967,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4070,12 +4070,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4102,7 +4102,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4111,7 +4111,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4131,11 +4131,11 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pašlaik jums ir jāizvēlas, kur uz cietā diska instalēt Mandrakelinux\n"</div><div class='add'>+"Pašlaik jums ir jāizvēlas, kur uz cietā diska instalēt Mandrivalinux\n"</div><div class='ctx'> "operētājsistēmu. Ja disks ir tukšs vai cita operētājsistēma aizņem visu\n"</div><div class='ctx'> "vietu uz diska, jums būs jāveic diska sadalīšana. Īsumā, cietā diska\n"</div><div class='ctx'> "sadalīšana nozīmē to sadalīt loģiskās daļās, lai izveidotu vietu\n"</div><div class='del'>-"Mandrakelinux sistēmas instalēšanai.\n"</div><div class='add'>+"Mandrivalinux sistēmas instalēšanai.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Sakarā ar to, ka diska sadalīšanas process parasti ir neatgriezenisks,\n"</div><div class='hunk'>@@ -4164,7 +4164,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "* Izdzēst visu disku: ja vēlaties izdzēst visus uz diska esošos datus un "</div><div class='ctx'> "sadaļas un aizstāt tās ar jaunu\n"</div><div class='del'>-"  Mandrakelinux sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "</div><div class='add'>+"  Mandrivalinux sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "</div><div class='ctx'> "izvēloties šo risinājumu, jo pēc\n"</div><div class='ctx'> "  apstiprināšanas jūs vairs nevarēsit atteikties no šīs izvēles.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4177,7 +4177,7 @@ msgstr ""</div><div class='ctx'> "vai izmainīt Microsoft\n"</div><div class='ctx'> "  Windows sadaļas izmēru. Sadaļas izmēru var izmainīt bez datu zaudēšanas. "</div><div class='ctx'> "Šis risinājums ir ieteicams, ja\n"</div><div class='del'>-"  jūs savā datorā vēlaties izmantot gan Mandrakelinux, gan Microsoft "</div><div class='add'>+"  jūs savā datorā vēlaties izmantot gan Mandrivalinux, gan Microsoft "</div><div class='ctx'> "Windows.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4301,7 +4301,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4325,7 +4325,7 @@ msgstr ""</div><div class='ctx'> "Noklikšķiniet \"Labi\", kad esat gatavi formatēt sadaļas.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Noklikšķiniet \"Atcelt\", ja jūs gribat izvēlēties citas sadaļas, kur\n"</div><div class='del'>-"instalēt jauno Mandrakelinux operētājsistēmu."</div><div class='add'>+"instalēt jauno Mandrivalinux operētājsistēmu."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434</div><div class='ctx'> #: interactive/newt.pm:318 printer/printerdrake.pm:3676</div><div class='hunk'>@@ -4339,7 +4339,7 @@ msgstr "Atpakaļ"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4368,7 +4368,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4392,7 +4392,7 @@ msgstr "Drošības administrators:"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4462,7 +4462,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pašlaik jums ir jāizvēlas, kurā(s) diska sadaļā(s) instalēt Mandrakelinux\n"</div><div class='add'>+"Pašlaik jums ir jāizvēlas, kurā(s) diska sadaļā(s) instalēt Mandrivalinux\n"</div><div class='ctx'> "operētājsistēmu. Ja sadaļas jau ir izveidotas (agrākas GNU/Linux "</div><div class='ctx'> "instalēšanas\n"</div><div class='ctx'> "laikā vai ar citu diska sadalīšanas rīku), jūs varat izmantot esošās "</div><div class='hunk'>@@ -4545,7 +4545,7 @@ msgstr "Pārslēgt normālajā režīmā"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4575,7 +4575,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Uz jūsu cietā diska ir atrasta vairāk nekā viena Microsoft Windows sadaļa.\n"</div><div class='ctx'> "Lūdzu izvēlieties to sadaļu, kuras izmēru jūs vēlaties izmainīt, lai\n"</div><div class='del'>-"instalētu jauno Mandrakelinux operētājsistēmu.\n"</div><div class='add'>+"instalētu jauno Mandrivalinux operētājsistēmu.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Jūsu zināšanai, katra sadaļa ir uzskaitīta šādā veidā: \"Linux nosaukums\",\n"</div><div class='hunk'>@@ -4622,7 +4622,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4631,13 +4631,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4691,7 +4691,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4850,7 +4850,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4871,7 +4871,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4992,7 +4992,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5009,7 +5009,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5071,11 +5071,11 @@ msgstr "Servisi"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Norādiet cieto disku, ko vēlaties izdzēst, lai izveidotu jaunu\n"</div><div class='del'>-"Mandrakelinux sadaļu. Esiet uzmanīgi, jo visi diskā esošie dati\n"</div><div class='add'>+"Mandrivalinux sadaļu. Esiet uzmanīgi, jo visi diskā esošie dati\n"</div><div class='ctx'> "pazudīs un nebūs atjaunojami."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -5424,11 +5424,11 @@ msgstr "Izmantot Windows sadaļas brīvo vietu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Windows sadaļa ir pārāk fragmentēta. Vispirms no Windows vides palaidiet "</div><div class='del'>-"``defrag'' un tad atsāciet Mandrakelinux instalēšanu."</div><div class='add'>+"``defrag'' un tad atsāciet Mandrivalinux instalēšanu."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -5542,19 +5542,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5576,7 +5576,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5584,14 +5584,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5601,7 +5601,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5621,10 +5621,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5635,11 +5635,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5655,7 +5655,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5739,7 +5739,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5747,14 +5747,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Apsveicam, instalēšana ir pabeigta.\n"</div><div class='ctx'> "Izņemiet sāknēšanas datu nesēju un nospiediet ievadu, lai pārstartētu "</div><div class='ctx'> "datoru.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Lai saņemtu informāciju par labojumiem, kas ir pieejami šim Mandrakelinux\n"</div><div class='add'>+"Lai saņemtu informāciju par labojumiem, kas ir pieejami šim Mandrivalinux\n"</div><div class='ctx'> "izdevumam, skatiet Errata failu, kas atrodams\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5762,7 +5762,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informācija par jūsu sistēmas konfigurēšanu ir pieejama Oficiālās\n"</div><div class='del'>-"Mandrakelinux rokasgrāmatas pēcinstalēšanas nodaļā."</div><div class='add'>+"Mandrivalinux rokasgrāmatas pēcinstalēšanas nodaļā."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -5797,11 +5797,11 @@ msgstr "Uzsāku soli `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Jūsu sistēmai trūkst resursu. Mandrakelinux instalēšanas laikā var\n"</div><div class='add'>+"Jūsu sistēmai trūkst resursu. Mandrivalinux instalēšanas laikā var\n"</div><div class='ctx'> "rasties problēmas. Ja tā notiek, varat pamēģināt teksta instalēšanu.\n"</div><div class='ctx'> "Lai to izdarītu, nospiediet`F1', ka notiek ielāde no CDROM, tad ievadiet\n"</div><div class='ctx'> "`text'."</div><div class='hunk'>@@ -6336,9 +6336,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pieslēdzos Mandrakelinux tīmeklim, lai saņemtu pieejamo spoguļserveru "</div><div class='add'>+"Pieslēdzos Mandrivalinux tīmeklim, lai saņemtu pieejamo spoguļserveru "</div><div class='ctx'> "sarakstu sarakstu..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6552,8 +6552,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux instalēšana %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux instalēšana %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9136,13 +9136,13 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall konfigurētājs\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Šis rīks konfigurē personālo ugunssienu priekš Mandrakelinux\n"</div><div class='add'>+"Šis rīks konfigurē personālo ugunssienu priekš Mandrivalinux\n"</div><div class='ctx'> "datora. Priekš spēcīga, ugunssienas izveidei veltīta risinājuma,\n"</div><div class='ctx'> "lūdzu apskatiet MandrakeSecurity Firewall XXXXXX."</div><div class='ctx'> </div><div class='hunk'>@@ -12874,7 +12874,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14652,18 +14652,18 @@ msgstr "Apturēt"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Laipni lūdzam &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Laipni lūdzam &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14672,7 +14672,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14689,9 +14689,9 @@ msgstr "Esiet sveicināti atvērtā koda pasaulē"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14711,7 +14711,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14737,10 +14737,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14759,8 +14759,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14787,7 +14787,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14797,7 +14797,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14816,13 +14816,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14834,7 +14834,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14848,19 +14848,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux kontroles centrs"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "Mandrivalinux kontroles centrs"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14881,61 +14881,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14973,7 +14973,7 @@ msgstr "Izvēlieties jūsu failsistēmas šifrēšanas atslēgu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14994,7 +14994,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15112,7 +15112,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15350,14 +15350,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux kontroles centrs&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux kontroles centrs&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15379,21 +15379,21 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Online Store&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux kontroles centrs"</div><div class='add'>+msgstr "Mandrivalinux kontroles centrs"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15416,20 +15416,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15448,33 +15448,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -15497,32 +15497,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux kontroles centrs"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "Mandrivalinux kontroles centrs"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15830,8 +15830,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakelinux kontroles centrs"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandrivalinux kontroles centrs"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -15926,7 +15926,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15974,7 +15974,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -18533,13 +18533,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Mandrake kļūdu ziņojuma rīks"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux kontroles centrs"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux kontroles centrs"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18559,8 +18559,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18604,7 +18604,7 @@ msgstr "Konfigurēšanas meistari"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19020,20 +19020,20 @@ msgstr "Palaists pie ielādes"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Šis %s skeneris jākonfigurē ar printerdrake.\n"</div><div class='del'>-"Jūs varat palaist printerdrake no Mandrakelinux kontroles centra Aparatūras "</div><div class='add'>+"Jūs varat palaist printerdrake no Mandrivalinux kontroles centra Aparatūras "</div><div class='ctx'> "sekcijā."</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Šis %s skeneris jākonfigurē ar printerdrake.\n"</div><div class='del'>-"Jūs varat palaist printerdrake no Mandrakelinux kontroles centra Aparatūras "</div><div class='add'>+"Jūs varat palaist printerdrake no Mandrivalinux kontroles centra Aparatūras "</div><div class='ctx'> "sekcijā."</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -19085,7 +19085,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -19380,7 +19380,7 @@ msgstr "Importēt"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19888,7 +19888,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -19915,7 +19915,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Mandrake kontroles centrs"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -22829,7 +22829,7 @@ msgid ""</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Šis ir HardDrake, Mandrakelinux aparatūras konfigurēšanas rīks.\n"</div><div class='add'>+"Šis ir HardDrake, Mandrivalinux aparatūras konfigurēšanas rīks.\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Versija:&lt;/span&gt; %s\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Autors:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -22940,7 +22940,7 @@ msgstr "Izmaiņa ir notikusi, bet, lai to padarītu efektīvu, Jums jāatslēdza</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Mandrake rīku apraksti"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -23450,7 +23450,7 @@ msgstr "Savienojuma ātrums"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -23684,7 +23684,7 @@ msgstr ""</div><div class='ctx'> #: standalone/scannerdrake:101</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported by this version of %s."</div><div class='del'>-msgstr "Šī Mandrakelinux versija neatbalsta %s."</div><div class='add'>+msgstr "Šī Mandrivalinux versija neatbalsta %s."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:104</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -23724,7 +23724,7 @@ msgstr ""</div><div class='ctx'> #: standalone/scannerdrake:144</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported under Linux."</div><div class='del'>-msgstr "Šī Mandrakelinux versija neatbalsta %s."</div><div class='add'>+msgstr "Šī Mandrivalinux versija neatbalsta %s."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:171 standalone/scannerdrake:185</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24295,8 +24295,8 @@ msgstr "Instalēšana neizdevās"</div><div class='ctx'> #~ msgstr "netika atrasts neviens fonts.\n"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Mandrakelinux kontroles centrs"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Mandrivalinux kontroles centrs"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Pārlūks nav pieejams. Lūdzu, instalējiet kādu"</div><div class='hunk'>@@ -24765,8 +24765,8 @@ msgstr "Instalēšana neizdevās"</div><div class='ctx'> #~ msgid "mkraid failed"</div><div class='ctx'> #~ msgstr "mkraid neizdevās"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "The package %s is needed. Install it?"</div><div class='ctx'> #~ msgstr "Ir nepieciešama pakotne %s. Instalēt to?"</div><div class='head'>diff --git a/perl-install/share/po/mk.po b/perl-install/share/po/mk.po<br/>index edfacc5b2..df0417276 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/mk.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/mk.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/mk.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/mk.po</a></div><div class='hunk'>@@ -71,7 +71,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Изгледа дека USB клучот има овозможено заштита за запишување, но сепак не "</div><div class='ctx'> "можам\n"</div><div class='hunk'>@@ -80,7 +80,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Притиснете на копчето да го рестартирате компјутерот, отстранете го, "</div><div class='ctx'> "исклучете ја заштитата за запишување, внесете го клучот повторно и повторно "</div><div class='del'>-"подигнете го Mandrake Move."</div><div class='add'>+"подигнете го Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -98,7 +98,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -106,7 +106,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -114,7 +114,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -244,7 +244,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1281,11 +1281,11 @@ msgstr "Избор на јазик"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux може да подржи повеќе јазици. Изберете\n"</div><div class='add'>+"Mandrivalinux може да подржи повеќе јазици. Изберете\n"</div><div class='ctx'> "ѓи јазиците кои сакате да ѓи инсталирате. Тие ќе бидат\n"</div><div class='ctx'> "достапни кога инсталацијата ќе заврши и кога ќе го\n"</div><div class='ctx'> "рестартирате системот."</div><div class='hunk'>@@ -3691,7 +3691,7 @@ msgstr "овозможи радио поддршка"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3887,7 +3887,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3901,11 +3901,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3957,7 +3957,7 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Сега е време да изберете програми што ќе се инсталираат на Вашиот систем.\n"</div><div class='del'>-"Постојат илјадници пакети за Mandrakelinux, и од Вас не се очекува да\n"</div><div class='add'>+"Постојат илјадници пакети за Mandrivalinux, и од Вас не се очекува да\n"</div><div class='ctx'> "ги препознете напамет.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ако вршите стандардна инсталација од CD, прво ќе бидете запрашани за тоа\n"</div><div class='hunk'>@@ -4060,10 +4060,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4267,7 +4267,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4434,12 +4434,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4466,7 +4466,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4475,7 +4475,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4495,7 +4495,7 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Сега треба да изберете каде на Вашиот диск да се инсталира Mandrakelinux\n"</div><div class='add'>+"Сега треба да изберете каде на Вашиот диск да се инсталира Mandrivalinux\n"</div><div class='ctx'> "оперативниот систем. Ако Вашиот диск е празен или ако веќе некој оперативен\n"</div><div class='ctx'> "систем го користи целокупниот простор, ќе треба да го партицирате. \n"</div><div class='ctx'> "Партицирањето се состои од логичко делење за да се создаде простор за\n"</div><div class='hunk'>@@ -4531,7 +4531,7 @@ msgstr ""</div><div class='ctx'> "Менувањето на големина може да се изведе без губиток на податоци,\n"</div><div class='ctx'> "под услов претходно да сте ја дефрагментирале Windows партицијата. Не би "</div><div class='ctx'> "било лошо ни да направите бекап на Вашите податоци.\n"</div><div class='del'>-"Оваа солуција се пропорачува ако сакате да ги користите и Mandrakelinux и\n"</div><div class='add'>+"Оваа солуција се пропорачува ако сакате да ги користите и Mandrivalinux и\n"</div><div class='ctx'> "Microsoft Windows на истиот компјутер.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Пред избирање на оваа опција треба да знаете дека по ова Microsoft "</div><div class='hunk'>@@ -4708,7 +4708,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4752,7 +4752,7 @@ msgstr "Претходно"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4793,7 +4793,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4821,7 +4821,7 @@ msgstr "Администратор за безбедност"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4979,7 +4979,7 @@ msgstr "Префрлање помеѓу нормален/експертски р</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5057,7 +5057,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5066,13 +5066,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Оваа постапка се активира само ако на Вашиот компјутер се најде некоја стара "</div><div class='ctx'> "GNU/Linux партиција.\n"</div><div class='hunk'>@@ -5087,13 +5087,13 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Ова ви овозможува да ги надградите пакетите кои веќе се "</div><div class='ctx'> "инсталирани на Вашиот систем\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current\n"</div><div class='ctx'> "partitioning scheme and user data is not altered. Most of other\n"</div><div class='ctx'> "configuration steps remain available, similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"�����``Upgrade'' ����should work fine on Mandrakelinux systems\n"</div><div class='add'>+"�����``Upgrade'' ����should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -5150,7 +5150,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5392,7 +5392,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5413,7 +5413,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Сега се избира принтерски систем за Вашиот компјутер. Некои други "</div><div class='hunk'>@@ -5571,7 +5571,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5588,7 +5588,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5650,7 +5650,7 @@ msgstr "Сервиси"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Изберете го дискот што сакат да го избришете за да ја инсталирате новата\n"</div><div class='hunk'>@@ -6003,7 +6003,7 @@ msgstr "Пресметување на големината на Windows парт</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Вашата Windows партиција е премногу фрагментирана. Рестартирајте го "</div><div class='hunk'>@@ -6124,19 +6124,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6158,7 +6158,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6166,14 +6166,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6183,7 +6183,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6203,10 +6203,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6217,11 +6217,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6237,7 +6237,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Вовед\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6252,7 +6252,7 @@ msgstr ""</div><div class='ctx'> "1. Лиценцен договор\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Внимателно прочитајте го овој документ. Овој документ е лиценцен договор\n"</div><div class='del'>-"меѓу Вас и Mandrakesoft S.A. кој се однесува на софтверските производи.\n"</div><div class='add'>+"меѓу Вас и Mandriva S.A. кој се однесува на софтверските производи.\n"</div><div class='ctx'> "Со инсталирање, дуплицирање или користење на софтверските производи\n"</div><div class='ctx'> "на било кој начин, Вие експлицитно прифаќате и целосно се согласувате со\n"</div><div class='ctx'> "термините и условите на оваа лиценца. Ако не се согласувате со било кој \n"</div><div class='hunk'>@@ -6269,19 +6269,19 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Софтверските производи и придружната документација се дадени \n"</div><div class='ctx'> "\"како што се\" (\"as is\"), без никаква гаранција, до степен можен со \n"</div><div class='del'>-"закон. Mandrakesoft S.A. нема во никој случај, до степен можен со закон, \n"</div><div class='add'>+"закон. Mandriva S.A. нема во никој случај, до степен можен со закон, \n"</div><div class='ctx'> "да одговара за било какви специјални, инцидентни, директни и индиректни\n"</div><div class='ctx'> "штети (вклучувајќи, и неограничувајќи се, на губиток на бизнис, прекин на\n"</div><div class='ctx'> "бизнис, финансиски губиток, легални такси и казни последеици на судска\n"</div><div class='ctx'> "одлука, или било каква друга консеквентна штета) кои потекнуваат од \n"</div><div class='ctx'> "користење или неспособност за користење на софтверските производи, \n"</div><div class='del'>-"дури и ако Mandrakesoft S.A. бил советуван за можноста од или случувањето\n"</div><div class='add'>+"дури и ако Mandriva S.A. бил советуван за можноста од или случувањето\n"</div><div class='ctx'> "на такви штети.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "ОГРАНИЧЕНА ОДГОВОРНОСТ ПОВРЗАНА СО ПОСЕДУВАЊЕТО ИЛИ \n"</div><div class='ctx'> "КОРИСТЕЊЕТО СОФТВЕР ЗАБРАНЕТ ВО НЕКОИ ЗЕМЈИ\n"</div><div class='ctx'> "\n"</div><div class='del'>-"До степен дозволн со закон, Mandrakesoft S.A. или неговите дистрибутери\n"</div><div class='add'>+"До степен дозволн со закон, Mandriva S.A. или неговите дистрибутери\n"</div><div class='ctx'> "нема во никој случај да бидат одговорни за било какви специјални, \n"</div><div class='ctx'> "инцидентни, директни и индиректни штети (вклучувајќи, и неограничувајќи се, "</div><div class='ctx'> "на губиток на бизнис, прекин на\n"</div><div class='hunk'>@@ -6306,9 +6306,9 @@ msgstr ""</div><div class='ctx'> "кои ги покриваат. Прочитајате ги внимателно термините и условите на \n"</div><div class='ctx'> "лиценцниот договор за секоја окмпонента, пред да користите било ко од нив.\n"</div><div class='ctx'> "Било какви прашања за лиценца на некоја компонента треба да се адресира\n"</div><div class='del'>-"на авторот на компонентата, а не на Mandrakesoft. Програмите развиени од\n"</div><div class='del'>-"Mandrakesoft S.A. потпаѓаат под GPL лиценцата. Документацијата напишана\n"</div><div class='del'>-"од Mandrakesoft S.A. потпаѓа под посебна лиценца. Видете ја "</div><div class='add'>+"на авторот на компонентата, а не на Mandriva. Програмите развиени од\n"</div><div class='add'>+"Mandriva S.A. потпаѓаат под GPL лиценцата. Документацијата напишана\n"</div><div class='add'>+"од Mandriva S.A. потпаѓа под посебна лиценца. Видете ја "</div><div class='ctx'> "документацијата,\n"</div><div class='ctx'> "за повеќе детали.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6317,11 +6317,11 @@ msgstr ""</div><div class='ctx'> "Сите права на компонентите на софтверските производи им припаѓаат на нивните "</div><div class='ctx'> "соодветни автори и се заштитени со законите за интелектуална\n"</div><div class='ctx'> "сопственост или авторски права (copyright laws) применливи на софтверски\n"</div><div class='del'>-"програми. Mandrakesoft S.A. го задржува правото да ги модифицира или \n"</div><div class='add'>+"програми. Mandriva S.A. го задржува правото да ги модифицира или \n"</div><div class='ctx'> "адаптира софтверските производи, како целина или во делови, на било кој\n"</div><div class='ctx'> "начин и за било која цел.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" и придружените логотипи се заштитени знаци\n"</div><div class='del'>-"на Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" и придружените логотипи се заштитени знаци\n"</div><div class='add'>+"на Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Правосилни закони\n"</div><div class='hunk'>@@ -6334,7 +6334,7 @@ msgstr ""</div><div class='ctx'> "Секој спор за термините на оваа лиценца по можност ќе се реши на суд.\n"</div><div class='ctx'> "Како последен чекор, спорот ќе биде предаден на соодветинот суд во\n"</div><div class='ctx'> "Париз - Франиција. За било какви прашања во врска со овој документ,\n"</div><div class='del'>-"контактирајте го Mandrakesoft S.A.\n"</div><div class='add'>+"контактирајте го Mandriva S.A.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6420,7 +6420,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6428,7 +6428,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Инсталацијата е завршена. Ви честитаме!\n"</div><div class='ctx'> "Извадете ги инсталационите медиуми и притиснете Ентер за рестартирање.\n"</div><div class='hunk'>@@ -6477,7 +6477,7 @@ msgstr "Премин на чекор \"%s\"\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -7020,7 +7020,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Контактирање со веб сајтот на Мандрак Линукс за добивање на листата на "</div><div class='ctx'> "огледала..."</div><div class='hunk'>@@ -7245,8 +7245,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux Инсталација %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux Инсталација %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9830,13 +9830,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall конфигуратор\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Ова конфигурира личен огнен ѕид за оваа Mandrakelinux машина.\n"</div><div class='add'>+"Ова конфигурира личен огнен ѕид за оваа Mandrivalinux машина.\n"</div><div class='ctx'> "За моќно и наменско решение на огнен ѕид, видете ја специјализираната\n"</div><div class='ctx'> "дистрибуција MandrakeSecurity Firewall."</div><div class='ctx'> </div><div class='hunk'>@@ -13753,7 +13753,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15635,18 +15635,18 @@ msgstr "Стоп"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "Добредојдовте во &lt;b&gt;Мандраклинукс&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15655,7 +15655,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15672,9 +15672,9 @@ msgstr "Добредојдовте во светот на Open Source."</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15694,7 +15694,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15720,10 +15720,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15742,8 +15742,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15770,7 +15770,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15780,7 +15780,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15799,13 +15799,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15817,7 +15817,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15831,19 +15831,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux контролен центар"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "Mandrivalinux контролен центар"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -15864,61 +15864,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15956,7 +15956,7 @@ msgstr "Изберете го клучот за криптирање на фај</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15977,7 +15977,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16007,7 +16007,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/15.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Kontact&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/15.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16094,7 +16094,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16329,14 +16329,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux контролен центар&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux контролен центар&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16358,21 +16358,21 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Online Store&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux контролен центар"</div><div class='add'>+msgstr "Mandrivalinux контролен центар"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16395,20 +16395,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16427,33 +16427,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16476,32 +16476,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16799,7 +16799,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "Лансирај го волшебникот"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -16926,7 +16926,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16997,7 +16997,7 @@ msgstr "[--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -19606,13 +19606,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Mandrake Bug Report алатка"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux контролен центар"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux контролен центар"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19632,8 +19632,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19677,7 +19677,7 @@ msgstr "Конфигурационен Волшебник"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -20099,7 +20099,7 @@ msgstr "Покренато при стартување"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "овој интерфејс не е конфигуриран.\n"</div><div class='ctx'> " Стартувај го волшебникот за конфгурација."</div><div class='hunk'>@@ -20108,7 +20108,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "овој интерфејс не е конфигуриран.\n"</div><div class='ctx'> " Стартувај го волшебникот за конфгурација."</div><div class='hunk'>@@ -20161,7 +20161,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -20457,7 +20457,7 @@ msgstr "Внеси"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20990,7 +20990,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21017,8 +21017,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux контролен центар"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux контролен центар"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24134,8 +24134,8 @@ msgstr "Промената е направена, но за да има ефек</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Логови за алтките на Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Логови за алтките на Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24649,7 +24649,7 @@ msgstr "Врската е завршена."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Врската не успеа.\n"</div><div class='ctx'> "Потврдете ја вашата конфигурација во Мандрак Контролниот Центар."</div><div class='hunk'>@@ -25516,7 +25516,7 @@ msgstr "Неуспешна инсталација"</div><div class='ctx'> #~ msgstr "немате одбрано ни еден фонт"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='ctx'> #~ msgstr "Лансирај го волшебникот"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='head'>diff --git a/perl-install/share/po/mn.po b/perl-install/share/po/mn.po<br/>index 83387cf63..be42ed3e6 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/mn.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/mn.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/mn.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/mn.po</a></div><div class='hunk'>@@ -61,7 +61,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -80,7 +80,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -88,7 +88,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -96,7 +96,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -220,7 +220,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1202,7 +1202,7 @@ msgstr "Хэл"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "вы бол вы."</div><div class='hunk'>@@ -3451,7 +3451,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3567,7 +3567,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3581,11 +3581,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3700,10 +3700,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3820,7 +3820,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -3927,12 +3927,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -3959,7 +3959,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -3968,7 +3968,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4104,7 +4104,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4122,7 +4122,7 @@ msgstr "Өмнөх"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4151,7 +4151,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4167,7 +4167,7 @@ msgstr "Хамгаалалт:"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4253,7 +4253,7 @@ msgstr "Ердийн/мэргэжлийн горимын хооронд шилж</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4304,7 +4304,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4313,13 +4313,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "бол г вы шинэ г\n"</div><div class='ctx'> " с вы вы аас г\n"</div><div class='hunk'>@@ -4365,7 +4365,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4531,7 +4531,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4552,7 +4552,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "с Бусад вы туг аас аас г\n"</div><div class='hunk'>@@ -4655,7 +4655,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4672,7 +4672,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4749,7 +4749,7 @@ msgstr "Үйлчилгээ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5059,7 +5059,7 @@ msgstr "хэмжээ аас Цонхнууд"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr "Цонхнууд бол Цонхнууд."</div><div class='ctx'> </div><div class='hunk'>@@ -5163,19 +5163,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5197,7 +5197,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5205,14 +5205,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5222,7 +5222,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5242,10 +5242,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5256,11 +5256,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5276,7 +5276,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5335,7 +5335,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5343,7 +5343,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5375,7 +5375,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr "бол Та вы текст текст."</div><div class='hunk'>@@ -5877,7 +5877,7 @@ msgstr "Та г вы Интернэт г вы?"</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr "сайт жигсаалт аас."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6082,7 +6082,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -8642,7 +8642,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr "г."</div><div class='hunk'>@@ -12282,7 +12282,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13996,18 +13996,18 @@ msgstr "Зогсоох"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "&lt;b&gt;Мандраке Линукс&lt;/b&gt;-т тавтай морилно уу"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14016,7 +14016,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14033,9 +14033,9 @@ msgstr "Тавтай морил Нээх."</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14055,7 +14055,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14081,10 +14081,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14103,8 +14103,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14131,7 +14131,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14141,7 +14141,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14160,13 +14160,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14178,7 +14178,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14192,19 +14192,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "Мандрак удирдлагын төв"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14225,61 +14225,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14317,7 +14317,7 @@ msgstr "Сонгох"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14338,7 +14338,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14455,7 +14455,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14690,14 +14690,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Мандрак удирдлагын төв&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14719,9 +14719,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14733,7 +14733,7 @@ msgstr "Мандрак удирдлагын төв"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14756,20 +14756,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Мандрак Клуб&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -14788,33 +14788,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "Мандрак удирдлагын төв"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -14837,32 +14837,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Мандраке Мэргэжилтэн&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15153,7 +15153,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "Мандрак удирдлагын төв"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -15262,7 +15262,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15310,7 +15310,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17822,12 +17822,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Мандрак удирдлагын төв"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "Мандрак удирдлагын төв"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -17848,7 +17848,7 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -17893,7 +17893,7 @@ msgstr "Тоноглол"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18302,14 +18302,14 @@ msgstr "Ачаалахад эхэлсэн"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr "ямх"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr "ямх"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -18360,7 +18360,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18649,7 +18649,7 @@ msgstr "Авчирах"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19119,7 +19119,7 @@ msgstr "Интернэт бусад Сүлжээ."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -19146,7 +19146,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Мандрак удирдлагын төв"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -22140,7 +22140,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Мандрак удирдлагын төв"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -22644,7 +22644,7 @@ msgstr "Холболт."</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr "Холболт ямх Контрол Төвд."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -23485,7 +23485,7 @@ msgstr "Хэлбэр!"</div><div class='ctx'> #~ msgstr "Та"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='ctx'> #~ msgstr "Мандрак удирдлагын төв"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='head'>diff --git a/perl-install/share/po/ms.po b/perl-install/share/po/ms.po<br/>index c0a2cb40d..4d83bc2c2 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/ms.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/ms.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/ms.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ms.po</a></div><div class='hunk'>@@ -58,7 +58,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -77,7 +77,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +85,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -93,7 +93,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +221,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1208,7 +1208,7 @@ msgstr "Pilihan Tidak Sah"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "dan ulanghidup."</div><div class='hunk'>@@ -3457,7 +3457,7 @@ msgstr "Hidupkan sokongan SSL"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr "dalam off."</div><div class='hunk'>@@ -3576,7 +3576,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3587,11 +3587,11 @@ msgstr "on on dan."</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3706,10 +3706,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3823,7 +3823,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -3934,12 +3934,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -3966,7 +3966,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -3975,7 +3975,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4121,7 +4121,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4139,7 +4139,7 @@ msgstr "Terdahulu"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4168,7 +4168,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4184,7 +4184,7 @@ msgstr "Pentadbir Domain:"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4285,7 +4285,7 @@ msgstr "normal"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4335,7 +4335,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4344,13 +4344,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "on\n"</div><div class='ctx'> " keluar fail on\n"</div><div class='hunk'>@@ -4394,7 +4394,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4558,7 +4558,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4579,7 +4579,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Lain-lain\n"</div><div class='hunk'>@@ -4682,7 +4682,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4699,7 +4699,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4776,7 +4776,7 @@ msgstr "Perkhidmatan"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr "dalam on dan!"</div><div class='ctx'> </div><div class='hunk'>@@ -5086,7 +5086,7 @@ msgstr "Kemasukan Tidak Sah bagi Saiz Partisyen"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr "Tetingkap Tetingkap ulanghidup."</div><div class='ctx'> </div><div class='hunk'>@@ -5190,19 +5190,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5224,7 +5224,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5232,14 +5232,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5249,7 +5249,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5269,10 +5269,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5283,11 +5283,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5303,7 +5303,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Pengenalan dan dalam dan dan dan A dalam dan dan dalam dan dan dan tidak A "</div><div class='ctx'> "dalam tidak dan dan keluar A A dalam tidak keluar dan keluar dalam lokal "</div><div class='hunk'>@@ -5364,7 +5364,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5372,7 +5372,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr "Tahniah dan on on dalam Pengguna."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5404,7 +5404,7 @@ msgstr "Memasuki permulaan interaktif"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr "on on."</div><div class='hunk'>@@ -5920,7 +5920,7 @@ msgstr "Internet?"</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6127,8 +6127,8 @@ msgstr "on"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Arahan Pemasangan - Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Arahan Pemasangan - Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -8691,7 +8691,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr "dan."</div><div class='hunk'>@@ -12267,7 +12267,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13933,18 +13933,18 @@ msgstr "Henti"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr "Pilihan Anda? (1-%d) "</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Selamat Datang ke &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Selamat Datang ke &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -13953,7 +13953,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -13970,9 +13970,9 @@ msgstr "Selamat Datang Buka."</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -13992,7 +13992,7 @@ msgstr "GPL"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14018,10 +14018,10 @@ msgstr "Sertai Saluran..."</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14040,8 +14040,8 @@ msgstr " - Versi sijil: #%d\n"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14068,7 +14068,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14078,7 +14078,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14097,13 +14097,13 @@ msgstr "Red Hat Enterprise Linux Desktop"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14115,7 +14115,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14129,19 +14129,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "/_Produk Mandrakelinux"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "/_Produk Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr "Hujah yang sah adalah:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14162,61 +14162,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr " PenimbalBingkai jauh - Hak Cipta (C) %s Mandrakesoft S.A."</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr " PenimbalBingkai jauh - Hak Cipta (C) %s Mandriva S.A."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14254,7 +14254,7 @@ msgstr "Sila pilih persekitaran desktop default anda:"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14275,7 +14275,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14392,7 +14392,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14627,14 +14627,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Pusat Kawalan Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Pusat Kawalan Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14656,9 +14656,9 @@ msgstr "Pustaka kriptografi sumber terbuka."</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14670,7 +14670,7 @@ msgstr "  %-20s dalamtalian\n"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14693,20 +14693,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakeclub"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "Mandriva Club"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -14725,33 +14725,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -14774,32 +14774,32 @@ msgstr "Membaca kemaskini anaconda..."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakeexpert"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "Mandriva Expert"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15090,8 +15090,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Pengguna Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Pengguna Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -15193,7 +15193,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15241,7 +15241,7 @@ msgstr "lpd"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17718,13 +17718,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Lapor pepijat pada GNOME"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Pusat Kawalan Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Pusat Kawalan Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -17744,8 +17744,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17789,7 +17789,7 @@ msgstr "Status konfigurasi bagi %s %s\n"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr "Alatan Penukar Desktop"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18195,14 +18195,14 @@ msgstr "_Aktifkan semasa boot"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr "dalam utama"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr "dalam utama"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -18253,7 +18253,7 @@ msgstr "Mematikan pengurus paparan: "</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr "Mematikan pengurus paparan: "</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18538,7 +18538,7 @@ msgstr "Import"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -18998,13 +18998,13 @@ msgstr "Semuanya Internet on Rangkaian DHCP."</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"drakbt 0.8.1nHakmilik © 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"drakbt 0.8.1nHakmilik © 2003-2004 Mandriva.\n"</div><div class='ctx'> "Ini adalah perisian percuma dan boleh disebarkan dibawah akta GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "penggunaan:\n"</div><div class='hunk'>@@ -19029,7 +19029,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Pusat Bantuan KDE"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -22027,7 +22027,7 @@ msgstr "siap"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Alatan Konfigurasi Pelayan"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -22533,7 +22533,7 @@ msgstr "Konfigurasi Selesai"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr "dalam."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='head'>diff --git a/perl-install/share/po/mt.po b/perl-install/share/po/mt.po<br/>index 7e1217888..a74a0d8d7 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/mt.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/mt.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/mt.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/mt.po</a></div><div class='hunk'>@@ -68,14 +68,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Il-USB key jidher li hija protetta mill-ktib, imma ma nistgħux naqilgħuha\n"</div><div class='ctx'> "bħalissa.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klikkja l-buttuna biex tirributja l-magna, aqla' l-USB key, neħħi\n"</div><div class='del'>-"l-protezzjoni kontra l-ktib, erġa' waħħalha, u erġa' tella' Mandrake Move."</div><div class='add'>+"l-protezzjoni kontra l-ktib, erġa' waħħalha, u erġa' tella' Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -93,7 +93,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Il-USB key m'għandhiex partizzjonijiet validi tal-Windows (FAT).\n"</div><div class='hunk'>@@ -104,13 +104,13 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Tista' wkoll tkompli mingħajr USB key - xorta tkun tista' tuża\n"</div><div class='del'>-"Mandrake Move bħala sistema operattiva normali \"live\" Mandrake."</div><div class='add'>+"Mandriva Move bħala sistema operattiva normali \"live\" Mandrake."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -118,18 +118,18 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ma sibniex USB key fuq is-sistema. Jekk twaħħal USB key issa,\n"</div><div class='del'>-"Mandrake Move ikun jista' jikteb id-data fid-direttorju personali\n"</div><div class='add'>+"Mandriva Move ikun jista' jikteb id-data fid-direttorju personali\n"</div><div class='ctx'> "tiegħek u tal-konfigurazzjoni tas-sistema, għal meta terġa' tibbutja\n"</div><div class='ctx'> "dan il-kompjuter jew kompjuter ieħor. Nota: Jekk twaħħal USB key \n"</div><div class='ctx'> "issa, stenna ftit sekondi qabel terġa' tipprova ssibha.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Tista' wkoll tkompli mingħajr USB key - xorta tkun tista' tuża\n"</div><div class='del'>-"Mandrake Move bħala sistema operattiva normali \"live\" Mandrake."</div><div class='add'>+"Mandriva Move bħala sistema operattiva normali \"live\" Mandrake."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -255,7 +255,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -271,7 +271,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Dan jista' jkun minn fajls ta' konfigurazzjoni korrotti\n"</div><div class='ctx'> "fuq il-USB key. F'dak il-każ jekk tneħħihom u tirributja\n"</div><div class='del'>-"Mandrake Move għandha tiġi riżolta l-problema. Biex tagħmel\n"</div><div class='add'>+"Mandriva Move għandha tiġi riżolta l-problema. Biex tagħmel\n"</div><div class='ctx'> "dan, klikkja fuq il-buttuna rispettiva.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1310,7 +1310,7 @@ msgstr "Għażla ta' lingwa"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "Tista' tagħżel lingwi oħra li jkun u disponibbli wara li tinstalla"</div><div class='hunk'>@@ -3730,12 +3730,12 @@ msgstr "ippermetti sapport għal radju"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Qabel tkompli int mitlub taqra sew it-termini ta' din il-liċenzja. Hija\n"</div><div class='del'>-"tkopri d-distribuzzjoni sħiħa ta' Mandrakelinux. Jekk taqbel mat-termini\n"</div><div class='add'>+"tkopri d-distribuzzjoni sħiħa ta' Mandrivalinux. Jekk taqbel mat-termini\n"</div><div class='ctx'> "kollha tagħha, agħfas il-buttuna \"%s\". Jekk ma taqbilx, agħfas \"%s\" "</div><div class='ctx'> "biex\n"</div><div class='ctx'> "tirributja l-kompjuter."</div><div class='hunk'>@@ -3905,13 +3905,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"L-installazzjoni ta' Mandrakelinux hija maqsuma fuq diversi CD-ROMs. Jekk\n"</div><div class='add'>+"L-installazzjoni ta' Mandrivalinux hija maqsuma fuq diversi CD-ROMs. Jekk\n"</div><div class='ctx'> "pakkett qiegħed fuq CD-ROM oħra, DrakX jiftaħ is-CDROM u jitolbok iddaħħal "</div><div class='ctx'> "is-\n"</div><div class='ctx'> "CD li jmiss. Jekk m'għandekx dik is-CD tista' tikklikkja \"%s\" u l-pakketti "</div><div class='hunk'>@@ -3922,11 +3922,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3978,11 +3978,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Issa wasal il-mument fejn tagħżel liema programmi tixtieq tinstalla fuq\n"</div><div class='del'>-"is-sistema tiegħek. Hemm eluf ta' pakketti disponibbli għal Mandrakelinux,\n"</div><div class='add'>+"is-sistema tiegħek. Hemm eluf ta' pakketti disponibbli għal Mandrivalinux,\n"</div><div class='ctx'> "u biex ikun iżjed faċli timmaniġġjahom, qegħdin imqassmin fi gruppi ta'\n"</div><div class='ctx'> "programmi simili.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux iqassam il-gruppi ta' pakketti fi tlett kategoriji. Tista' \n"</div><div class='add'>+"Mandrivalinux iqassam il-gruppi ta' pakketti fi tlett kategoriji. Tista' \n"</div><div class='ctx'> "tagħżel u tħallat programmi minn diversi kategoriji, jiġifieri "</div><div class='ctx'> "installazzjoni\n"</div><div class='ctx'> "\"workstation\" tista' tinkludi programmi mis-sezzjoni \"server\", eċċ.\n"</div><div class='hunk'>@@ -4083,10 +4083,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4115,7 +4115,7 @@ msgstr ""</div><div class='ctx'> "li tgħidlek għal xiex jintuża dak il-pakkett.\n"</div><div class='ctx'> "!! Jekk pakkett ta' server jiġi installat intenzjonalment jew għax jifforma\n"</div><div class='ctx'> "parti minn grupp, int tintalab tikkonferma jekk verament tridx lill dawn\n"</div><div class='del'>-"is-servizzi jiġu nstallati. Fil-Mandrakelinux, is-servizzi li tinstalla "</div><div class='add'>+"is-servizzi jiġu nstallati. Fil-Mandrivalinux, is-servizzi li tinstalla "</div><div class='ctx'> "jiġu\n"</div><div class='ctx'> "mtella' awtomatikament meta tixgħel. Għalkemm dawn kienu siguri u ma kien "</div><div class='ctx'> "fihom\n"</div><div class='hunk'>@@ -4271,7 +4271,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4326,7 +4326,7 @@ msgid ""</div><div class='ctx'> "not successful in getting the display configured."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (għal Sistema X Window) huwa l-qalb ta' l-interfaċċja grafika GNU/Linux\n"</div><div class='del'>-"li fuqu huma bbażati l-ambjenti grafiċi kollha inklużi ma' Mandrakelinux "</div><div class='add'>+"li fuqu huma bbażati l-ambjenti grafiċi kollha inklużi ma' Mandrivalinux "</div><div class='ctx'> "(KDE,\n"</div><div class='ctx'> "GNOME, AfterStep, WindowMaker, eċċ).\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4441,12 +4441,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4473,7 +4473,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4482,7 +4482,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4503,12 +4503,12 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "F'dan il-punt int trid tagħżel fejn, fuq il-ħard disk, trid tinstalla s-\n"</div><div class='del'>-"sistema operattiva Mandrakelinux. Jekk il-ħard disk huwa vojt, jew jekk\n"</div><div class='add'>+"sistema operattiva Mandrivalinux. Jekk il-ħard disk huwa vojt, jew jekk\n"</div><div class='ctx'> "hemm sistema operattiva qed tokkupaha kollha, l-ewwel trid toħloq \n"</div><div class='ctx'> "partizzjonijiet. Bażikament, il-partizzjonijiet tal-ħard disk jaqsmu d-"</div><div class='ctx'> "diska\n"</div><div class='ctx'> "f'partijiet biex ikun hemm sezzjonijiet fejn tiġi nstallata s-sistema ġdida\n"</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Peress li l-effett ta' partizzjonament tal-ħard disk m'humiex riversibbli,\n"</div><div class='ctx'> "u jista' jwassal għal telf ta' informazzjoni, dan il-proċess jista' jidher\n"</div><div class='hunk'>@@ -4705,7 +4705,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4728,7 +4728,7 @@ msgstr ""</div><div class='ctx'> "Agħfas \"%s\" meta tkun lest biex tifformattja l-partizzjonijiet.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Agħfas \"%s\" jekk trid tagħżel partizzjoni oħra għas-sistema ġdida\n"</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Agħfas \"%s\" biex tagħżel partizzjonijiet biex jiġu ċċekkjati għal blokki\n"</div><div class='ctx'> "ħżiena fuq id-diska."</div><div class='hunk'>@@ -4745,7 +4745,7 @@ msgstr "Ta' qabel"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4757,7 +4757,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Fid-data meta tinstalla l-Mandrakelinux, aktarx ikunu ġew aġġornati xi\n"</div><div class='add'>+"Fid-data meta tinstalla l-Mandrivalinux, aktarx ikunu ġew aġġornati xi\n"</div><div class='ctx'> "pakketti minn meta ġiet pubblikata. Xi żbalji jistgħu ikunu ġew irranġati,\n"</div><div class='ctx'> "u problemi ta' sigurtà ġew riżolti. Sabiex tibbenifika minn dawn l-\n"</div><div class='ctx'> "aġġornamenti, jaqbillek tniżżilhom minn fuq l-internet. Agħżel \"%s\" jekk\n"</div><div class='hunk'>@@ -4786,7 +4786,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4801,7 +4801,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Jekk ma tafx liema tagħżel, żomm l-għażla impliċita. Tkun tista' tibdel dan\n"</div><div class='ctx'> "il-livell iżjed 'il quddiem bl-għodda draksex, li jifforma parti miċ-Ċentru\n"</div><div class='del'>-"ta' Kontroll Mandrakelinux.\n"</div><div class='add'>+"ta' Kontroll Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Imla' l-kaxxa \"%s\" bl-indirizz tal-imejl tal-persuna responsabbli mis-"</div><div class='ctx'> "sigurtà.\n"</div><div class='hunk'>@@ -4816,7 +4816,7 @@ msgstr "Amministratur tas-sigurtà"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4887,7 +4887,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "F'dan il-punt trid tagħżel liema partizzjoni(jiet) se jintużaw għall-\n"</div><div class='del'>-"installazzjoni tas-sistema Mandrakelinux. Jekk diġà ġew definiti xi\n"</div><div class='add'>+"installazzjoni tas-sistema Mandrivalinux. Jekk diġà ġew definiti xi\n"</div><div class='ctx'> "partizzjonijiet, jew minn installazzjoni preċedenti ta' GNU/Linux jew minn\n"</div><div class='ctx'> "għodda ta' partizzjonament oħra, tista' tuża l-partizzjonijiet eżistenti.\n"</div><div class='ctx'> "Altrimenti, l-partizzjonijiet tal-ħard disk iridu jiġu definiti.\n"</div><div class='hunk'>@@ -4975,7 +4975,7 @@ msgstr "Aqleb bejn modalità normali u esperta"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5005,7 +5005,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Instabu iżjed minn partizzjoni waħda tal-Microsoft fuq il-ħard disk. Jekk \n"</div><div class='ctx'> "jogħġbok agħżel liema minnhom trid iċċekken biex tinstalla s-sistema \n"</div><div class='del'>-"operattiva Mandrakelinux.\n"</div><div class='add'>+"operattiva Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kull partizzjoni hija mmarkata hekk: \"Isem tal-Linux\", \"Isem fil-Windows"</div><div class='ctx'> "\",\n"</div><div class='hunk'>@@ -5055,7 +5055,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5064,19 +5064,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dan il-pass jiġi attivat biss jekk instabet partizzjoni eżistenti GNU/Linux\n"</div><div class='ctx'> "fuq il-kompjuter.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX issa għandu bżonn ikun jaf jekk tridx tagħmel installazzjoni ġdida\n"</div><div class='del'>-"jew aġġornament tas-sistema eżistenti Mandrakelinux:\n"</div><div class='add'>+"jew aġġornament tas-sistema eżistenti Mandrivalinux:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". Fil-parti l-kbira, din tħassar is-sistema antika għal kollox.\n"</div><div class='ctx'> "Però, skond l-iskema ta' partizzjonijiet, tista' ma tħallix ċerti \n"</div><div class='hunk'>@@ -5085,16 +5085,16 @@ msgstr ""</div><div class='ctx'> "fajls, għandek tagħżel din l-għażla.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". Din il-klassi ta' installazzjoni tħallik taġġorna l-pakketti\n"</div><div class='del'>-"installati bħalissa fuq is-sistema Mandrakelinux. Il-partizzjonijiet "</div><div class='add'>+"installati bħalissa fuq is-sistema Mandrivalinux. Il-partizzjonijiet "</div><div class='ctx'> "eżistenti\n"</div><div class='ctx'> "u d-data tal-utenti ma jintmessux. Ħafna mill-passi l-oħra tal-"</div><div class='ctx'> "konfigurazzjoni\n"</div><div class='ctx'> "jibqgħu disponibbli u huma simili għal installazzjoni normali.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "L-użu tal-għażla \"Aġġorna\" għandha taħdem tajjeb fuq sistemi "</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "minn verżjoni \"8.1\" 'il fuq. Mhux rakkomandat li tagħmel aġġornament ta'\n"</div><div class='del'>-"sistema Mandrakelinux qabel 8.1."</div><div class='add'>+"sistema Mandrivalinux qabel 8.1."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5148,7 +5148,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5191,7 +5191,7 @@ msgstr ""</div><div class='ctx'> "tal-karattri intenzjonata biex tipprovdi sapport għal-lingwi kollha. Però \n"</div><div class='ctx'> "s-sapport għaliha fil-Linux għadu qed jiġi żviluppat. Għalhekk, l-użu tal-"</div><div class='ctx'> "UTF-8\n"</div><div class='del'>-"fil-Mandrakelinux jiddependi mill-għażla tal-utent:\n"</div><div class='add'>+"fil-Mandrivalinux jiddependi mill-għażla tal-utent:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "* Jekk tagħżel lingwa b'ħafna sapport eżistenti f'kodifika oħra (eż, "</div><div class='ctx'> "lingwi \n"</div><div class='hunk'>@@ -5440,7 +5440,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5461,11 +5461,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Issa wasal il-waqt li tagħżel sistema ta' printjar għall-kompjuter tiegħek.\n"</div><div class='del'>-"Sistemi operattivi oħra joffrulek waħda, Mandrakelinux jagħtik tnejn.\n"</div><div class='add'>+"Sistemi operattivi oħra joffrulek waħda, Mandrivalinux jagħtik tnejn.\n"</div><div class='ctx'> "Kull waħda minn dawn is-sistema hija idejali għal ċirkostanzi differenti.\n"</div><div class='ctx'> " * \"%s\" - li jfisser \"printja minngħajr kju\", hija l-aħjar għażla\n"</div><div class='ctx'> "jekk għandek konnessjoni diretta mal-printer, trid il-faċilità li twaqqaf\n"</div><div class='hunk'>@@ -5485,7 +5485,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Jekk tagħmel għażla issa, u wara tiskopri li ma togħġbokx din is-sistema,\n"</div><div class='ctx'> "tista' tibdilha billi tħaddem PrinterDrake miċ-ċentru tal-kontroll ta' \n"</div><div class='del'>-"Mandrakelinux u tikklikkja l-buttuna \"%s\"."</div><div class='add'>+"Mandrivalinux u tikklikkja l-buttuna \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5601,7 +5601,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5618,7 +5618,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5665,7 +5665,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": jekk tixtieq tikkonfigura l-aċċess għall-internet jew network\n"</div><div class='ctx'> "lokali tista tagħmel dan issa. Irreferi għad-dokumentazzjoni stampata jew\n"</div><div class='del'>-"uża ċ-Ċentru tal-Kontroll Mandrakelinux wara li tlesti l-installazzjoni "</div><div class='add'>+"uża ċ-Ċentru tal-Kontroll Mandrivalinux wara li tlesti l-installazzjoni "</div><div class='ctx'> "biex\n"</div><div class='ctx'> "tikseb għajnuna online sħiħa.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5688,7 +5688,7 @@ msgstr ""</div><div class='ctx'> "din il-buttuna. Dan għandu jsir minn utenti avvanzati biss. Irreferi għad-\n"</div><div class='ctx'> "dokumentazzjoni stampata, jew l-għajnuna online dwar il-konfigurazzjoni "</div><div class='ctx'> "tal-\n"</div><div class='del'>-"bootloader fiċ-Ċentru tal-Kontroll Mandrakelinux.\n"</div><div class='add'>+"bootloader fiċ-Ċentru tal-Kontroll Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": permezz ta' dan l-element tista' tirfina liema servizzi se \n"</div><div class='ctx'> "jitħaddmu fuq il-kompjuter. Jekk qed tippjana li tuża l-kompjuter bħala \n"</div><div class='hunk'>@@ -5749,11 +5749,11 @@ msgstr "Servizzi"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Agħżel liema ħard disk trid tħassar biex tinstalla l-partizzjonijiet tal-\n"</div><div class='del'>-"Mandrakelinux fuqha. Oqgħod attent, l-informazzjoni kollha fuq din id-\n"</div><div class='add'>+"Mandrivalinux fuqha. Oqgħod attent, l-informazzjoni kollha fuq din id-\n"</div><div class='ctx'> "diska jintilef u ma jkunx jista' jinġab lura!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6108,7 +6108,7 @@ msgstr "Qed jiġi kalkulat id-daqs tal-partizzjoni Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Il-partizzjoni tal-Windows hija mgerfxa wisq. Jekk jogħġbok ħaddem \"defrag"</div><div class='hunk'>@@ -6230,19 +6230,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6264,7 +6264,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6272,14 +6272,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6289,7 +6289,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6309,10 +6309,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6323,11 +6323,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6343,7 +6343,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -6439,7 +6439,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6447,14 +6447,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Prosit! L-installazzjoni issa lesta.\n"</div><div class='ctx'> "Neħħi l-flopi/CD u agħfas Enter biex tirristartja.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Għal informazzjoni dwar aġġornamenti li saru għal din il-verżjoni ta' \n"</div><div class='del'>-"Mandrakelinux, iċċekkja s-sezzjoni \"Errata\" li hemm fuq:\n"</div><div class='add'>+"Mandrivalinux, iċċekkja s-sezzjoni \"Errata\" li hemm fuq:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='hunk'>@@ -6462,7 +6462,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Informazzjoni dwar kif tissettja s-sistema tinstab fil-kapitlu \"Post-install"</div><div class='ctx'> "\"\n"</div><div class='del'>-"fil-Mandrakelinux User's Guide uffiċjali."</div><div class='add'>+"fil-Mandrivalinux User's Guide uffiċjali."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6497,12 +6497,12 @@ msgstr "Dieħel fil-pass \"%s\"\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Is-sistema hija nieqsa mir-riżorsi. Jista' jkollok problema biex tinstalla \n"</div><div class='del'>-"l-Mandrakelinux. Jekk jiġri dan, ipprova installazzjoni testwali. Għal dan,\n"</div><div class='add'>+"l-Mandrivalinux. Jekk jiġri dan, ipprova installazzjoni testwali. Għal dan,\n"</div><div class='ctx'> "agħfas F1 meta titla' s-CD, imbagħad ittajpja \"text\"."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_gtk.pm:228 install_steps_interactive.pm:624</div><div class='hunk'>@@ -7041,9 +7041,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Qed nikkuntattja l-website ta' Mandrakelinux biex nikseb lista tal-mirja "</div><div class='add'>+"Qed nikkuntattja l-website ta' Mandrivalinux biex nikseb lista tal-mirja "</div><div class='ctx'> "disponibbli"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7268,8 +7268,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Installazzjoni Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Installazzjoni Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9855,13 +9855,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Konfiguratur drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Dan jikkonfigura firewall personali għal din is-sistema Mandrakelinux.\n"</div><div class='add'>+"Dan jikkonfigura firewall personali għal din is-sistema Mandrivalinux.\n"</div><div class='ctx'> "Għal kompjuter firewall dedikat, jekk jogħġbok ara d-distribuzzjoni\n"</div><div class='ctx'> "speċjalizzata MandrakeSecurity Firewall."</div><div class='ctx'> </div><div class='hunk'>@@ -13881,7 +13881,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15806,23 +15806,23 @@ msgstr "Ieqaf"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;X'inhu Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;X'inhu Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Merħba għal &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Merħba għal &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux hija &lt;b&gt;distribuzzjoni tal-Linux&lt;/b&gt; li jinkludi l-qalba tas-"</div><div class='add'>+"Mandrivalinux hija &lt;b&gt;distribuzzjoni tal-Linux&lt;/b&gt; li jinkludi l-qalba tas-"</div><div class='ctx'> "sistema, magħrufa bħala s-&lt;b&gt;sistema operattiva&lt;/b&gt; (ibbażata fuq il-kernel "</div><div class='ctx'> "Linux) flimkien ma' &lt;b&gt;ħafna programmi&lt;/b&gt; li għandhom jaqdu kull ħtieġa li "</div><div class='ctx'> "qatt jista' jkollok."</div><div class='hunk'>@@ -15830,10 +15830,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux hija l-iżjed distribuzzjoni ta' Linux &lt;b&gt;faċli tużaha&lt;/b&gt; "</div><div class='add'>+"Mandrivalinux hija l-iżjed distribuzzjoni ta' Linux &lt;b&gt;faċli tużaha&lt;/b&gt; "</div><div class='ctx'> "illum Hija wkoll waħda mill-iżjed distribuzzjonijiet ta' Linux tintuża "</div><div class='ctx'> "madwar id-dinja!"</div><div class='ctx'> </div><div class='hunk'>@@ -15850,15 +15850,15 @@ msgstr "Merħba għad-&lt;b&gt;dinja ta' Sors Miftuħ&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux hija kommessa għall-mudell ta' sors miftuħ. Dan ifisser li din "</div><div class='add'>+"Mandrivalinux hija kommessa għall-mudell ta' sors miftuħ. Dan ifisser li din "</div><div class='ctx'> "l-edizzjoni ġdida hija riżultat ta' &lt;b&gt;kollaborazzjoni&lt;/b&gt; bejn &lt;b&gt;it-tim "</div><div class='del'>-"ta' żviluppaturi ta' Mandrakesoft&lt;/b&gt; u l-&lt;b&gt;komunità dinjija&lt;/b&gt; ta' "</div><div class='del'>-"kontributuri ta' Mandrakelinux."</div><div class='add'>+"ta' żviluppaturi ta' Mandriva&lt;/b&gt; u l-&lt;b&gt;komunità dinjija&lt;/b&gt; ta' "</div><div class='add'>+"kontributuri ta' Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15878,9 +15878,9 @@ msgstr "&lt;b&gt;Il-GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ħafna mis-softwer inkluż mad-distribuzzjoni u l-għodda kollha Mandrakelinux "</div><div class='add'>+"Ħafna mis-softwer inkluż mad-distribuzzjoni u l-għodda kollha Mandrivalinux "</div><div class='ctx'> "huma liċenzjati taħt il-&lt;b&gt;Liċenzja Ġenerali Pubblika (GPL)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15911,15 +15911,15 @@ msgstr "&lt;b&gt;Issieħeb mal-Komunità&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux għandha waħda mill-&lt;b&gt;ikbar komunitajiet&lt;/b&gt; ta' utenti u "</div><div class='add'>+"Mandrivalinux għandha waħda mill-&lt;b&gt;ikbar komunitajiet&lt;/b&gt; ta' utenti u "</div><div class='ctx'> "żviluppaturi. Ir-rwol ta' din il-komunità huwa wiesa', u jinkludi mir-"</div><div class='ctx'> "rappurtar ta' \"bugs\" sa l-iżvilupp ta' programmi ġodda. Il-komunità "</div><div class='del'>-"għandha &lt;b&gt;rwol kruċjali&lt;/b&gt; fid-dinja ta' Mandrakelinux."</div><div class='add'>+"għandha &lt;b&gt;rwol kruċjali&lt;/b&gt; fid-dinja ta' Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15941,11 +15941,11 @@ msgstr "&lt;b&gt;Verżjoni download&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Int qed tinstalla &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Din hija verżjoni b'xejn li "</div><div class='del'>-"Mandrakesoft jixtiequ jibqgħu &lt;b&gt;jipprovdu lil kulħadd&lt;/b&gt;"</div><div class='add'>+"Int qed tinstalla &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Din hija verżjoni b'xejn li "</div><div class='add'>+"Mandriva jixtiequ jibqgħu &lt;b&gt;jipprovdu lil kulħadd&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15976,10 +15976,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Anqas m'għandek aċċess għas-&lt;b&gt;servizzi inklużi&lt;/b&gt; fi prodotti oħra ta' "</div><div class='del'>-"Mandrakesoft."</div><div class='add'>+"Mandriva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15988,8 +15988,8 @@ msgstr "&lt;b&gt;Discovery, l-ewwel desktop tal-Linux tiegħek&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Int qed tinstalla &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Int qed tinstalla &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16012,17 +16012,17 @@ msgstr "&lt;b&gt;PowerPack, L-Aqwa Desktop tal-Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Int qed tinstalla &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Int qed tinstalla &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack huwa &lt;b&gt;l-aħjar desktop tal-Linux&lt;/b&gt; ta' Mandrakesoft. PowerPack "</div><div class='add'>+"PowerPack huwa &lt;b&gt;l-aħjar desktop tal-Linux&lt;/b&gt; ta' Mandriva. PowerPack "</div><div class='ctx'> "jinkludi &lt;b&gt;eluf ta' programmi&lt;/b&gt; - mill-iżjed popolari sa l-iżjed "</div><div class='ctx'> "avvanzati."</div><div class='ctx'> </div><div class='hunk'>@@ -16033,8 +16033,8 @@ msgstr "&lt;b&gt;PowerPack+, Is-Soluzzjoni tal-Linux għal Desktops u Servers&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Int qed tinstalla &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Int qed tinstalla &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16050,21 +16050,21 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Prodotti Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Prodotti Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; żviluppaw għażla sħiħa ta' prodotti &lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; żviluppaw għażla sħiħa ta' prodotti &lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Il-prodotti Mandrakelinux huma:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Il-prodotti Mandrivalinux huma:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16085,74 +16085,74 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux għal x86-64&lt;/b&gt;, Is-soluzzjoni Mandrakelinux biex tieħu "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux għal x86-64&lt;/b&gt;, Is-soluzzjoni Mandrivalinux biex tieħu "</div><div class='ctx'> "l-massimu mill-proċessatur 64-bit tiegħek."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Prodotti Mandrakesoft (Prodotti Nomadi)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Prodotti Mandriva (Prodotti Nomadi)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft żviluppaw żewġ prodotti li jħalluk tuża Mandrakelinux &lt;b&gt;fuq "</div><div class='add'>+"Mandriva żviluppaw żewġ prodotti li jħalluk tuża Mandrivalinux &lt;b&gt;fuq "</div><div class='ctx'> "kwalinkwa kompjuter&lt;/b&gt; mingħajr m'hemm bżonn tinstallah:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, distribuzzjoni ta' Mandrakelinux li taħdem totalment minn "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, distribuzzjoni ta' Mandrivalinux li taħdem totalment minn "</div><div class='ctx'> "fuq CDROM jibbutja."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, distribuzzjoni ta' Mandrakelinux installata bil-"</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, distribuzzjoni ta' Mandrivalinux installata bil-"</div><div class='ctx'> "lest fuq “LaCie Mobile Hard Drive”."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Prodotti Mandrakesoft (Soluzzjonijiet Professjonali)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Prodotti Mandriva (Soluzzjonijiet Professjonali)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Hawn taħt issib il-prodotti Mandrakesoft intenzjonati li jaqdu &lt;b&gt;ħtiġijiet "</div><div class='add'>+"Hawn taħt issib il-prodotti Mandriva intenzjonati li jaqdu &lt;b&gt;ħtiġijiet "</div><div class='ctx'> "professjonali&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Id-desktop Mandrakelinux għan-negozju."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Id-desktop Mandrivalinux għan-negozju."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Is-soluzzjoni server ta' Mandrakelinux"</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Is-soluzzjoni server ta' Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Is-soluzzjoni at' sigurtà ta' "</div><div class='del'>-"Mandrakelinux"</div><div class='add'>+"Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16195,10 +16195,10 @@ msgstr "&lt;b&gt;Agħżel l-Ambjent tad-Desktop Favorit&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bil-PowerPack, int ikollok għażla ta' &lt;b&gt;ambjent grafiku tad-desktop&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft għażlu &lt;b&gt;KDE&lt;/b&gt; bħala dak impliċitu."</div><div class='add'>+"Mandriva għażlu &lt;b&gt;KDE&lt;/b&gt; bħala dak impliċitu."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16222,10 +16222,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bil-PowerPack+, int ikollok għażla ta' &lt;b&gt;ambjent grafiku tad-desktop&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft għażlu &lt;b&gt;KDE&lt;/b&gt; bħala dak impliċitu."</div><div class='add'>+"Mandriva għażlu &lt;b&gt;KDE&lt;/b&gt; bħala dak impliċitu."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16352,10 +16352,10 @@ msgstr "&lt;b&gt;Ħu Gost bil-Varjetà Kbira ta' Programmi&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Fil-menu Mandrakelinux issib programmi &lt;b&gt;faċli tużahom&lt;/b&gt; għax-&lt;b&gt;xogħol "</div><div class='add'>+"Fil-menu Mandrivalinux issib programmi &lt;b&gt;faċli tużahom&lt;/b&gt; għax-&lt;b&gt;xogħol "</div><div class='ctx'> "kollu&lt;/b&gt; li trid:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16617,18 +16617,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Ċentru tal-Kontroll Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Ċentru tal-Kontroll Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Iċ-&lt;b&gt;Ċentru ta' Kontroll Mandrakelinux&lt;/b&gt; huwa kollezzjoni essenzjali ta' "</div><div class='del'>-"programmi speċifiċi ta' Mandrakelinux li jissimplifikaw il-konfigurazzjoni "</div><div class='add'>+"Iċ-&lt;b&gt;Ċentru ta' Kontroll Mandrivalinux&lt;/b&gt; huwa kollezzjoni essenzjali ta' "</div><div class='add'>+"programmi speċifiċi ta' Mandrivalinux li jissimplifikaw il-konfigurazzjoni "</div><div class='ctx'> "tal-kompjuter."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16652,16 +16652,16 @@ msgstr "&lt;b&gt;Il-Mudell Sors Miftuħ&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bħal kull programmar tal-kompjuter, softwer sors miftuħ &lt;b&gt;jiħtieġ ħin u "</div><div class='ctx'> "nies&lt;/b&gt; biex jiżviluppawh. Sabiex tirrispetta l-filosofija tas-sors miftuħ, "</div><div class='del'>-"Mandrakesoft ibiegħu prodotti b'valur miżjud u servizzi biex &lt;b&gt;ikomplu "</div><div class='del'>-"itejbu lil Mandrakelinux&lt;/b&gt;. Jekk tixtieq &lt;b&gt;tappoġġja l-filosofija ta' "</div><div class='del'>-"sors miftuħ&lt;/b&gt; u l-iżvilupp ta' Mandrakelinux, &lt;b&gt;jekk jogħġbok&lt;/b&gt; "</div><div class='add'>+"Mandriva ibiegħu prodotti b'valur miżjud u servizzi biex &lt;b&gt;ikomplu "</div><div class='add'>+"itejbu lil Mandrivalinux&lt;/b&gt;. Jekk tixtieq &lt;b&gt;tappoġġja l-filosofija ta' "</div><div class='add'>+"sors miftuħ&lt;/b&gt; u l-iżvilupp ta' Mandrivalinux, &lt;b&gt;jekk jogħġbok&lt;/b&gt; "</div><div class='ctx'> "ikkunsidra li tixtri wieħed mill-prodotti jew servizzi tagħna!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16672,10 +16672,10 @@ msgstr "&lt;b&gt;Ħanut Online&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Biex issir taf iżjed dwar il-prodotti u servizzi Mandrakesoft, tista' żżur "</div><div class='add'>+"Biex issir taf iżjed dwar il-prodotti u servizzi Mandriva, tista' żżur "</div><div class='ctx'> "il-&lt;b&gt;pjattaforma e-kummerċ&lt;/b&gt; tagħna."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16701,24 +16701,24 @@ msgstr "Aqbeż qabża llum għand &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; huwa s-&lt;b&gt;sieħeb idejali&lt;/b&gt; għall-prodott Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; huwa s-&lt;b&gt;sieħeb idejali&lt;/b&gt; għall-prodott Mandrivalinux "</div><div class='ctx'> "tiegħek.."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ħu vantaġġ minn &lt;b&gt;benefiċċji&lt;/b&gt; billi tissieħeb ma' Mandrakeclub, fosthom:"</div><div class='add'>+"Ħu vantaġġ minn &lt;b&gt;benefiċċji&lt;/b&gt; billi tissieħeb ma' Mandriva Club, fosthom:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16740,40 +16740,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Parteċipazzjoni fil-&lt;b&gt;forums tal-utenti&lt;/b&gt; Mandrakelinux."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Parteċipazzjoni fil-&lt;b&gt;forums tal-utenti&lt;/b&gt; Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Aċċess kmieni u privileġġjat&lt;/b&gt;, qabel il-ħarġa pubblika, għal "</div><div class='del'>-"&lt;b&gt;ISO images&lt;/b&gt; Mandrakelinux."</div><div class='add'>+"&lt;b&gt;ISO images&lt;/b&gt; Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; huwa servizz ġdid ewlieni li Mandrakesoft kburin "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; huwa servizz ġdid ewlieni li Mandriva kburin "</div><div class='ctx'> "joffru lill-klijenti!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline jipprovdi firxa ta' servizzi tajbin biex &lt;b&gt;faċilment "</div><div class='del'>-"taġġorna&lt;/b&gt; s-sistemi Mandrakelinux:"</div><div class='add'>+"Mandriva Online jipprovdi firxa ta' servizzi tajbin biex &lt;b&gt;faċilment "</div><div class='add'>+"taġġorna&lt;/b&gt; s-sistemi Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16799,41 +16799,41 @@ msgstr "\t* &lt;b&gt;Skedi&lt;/b&gt; flessibbli ta' aġġornamenti."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* L-immaniġġjar tas-&lt;b&gt;sistemi kollha Mandrakelinux&lt;/b&gt; minn kont wieħed."</div><div class='add'>+"\t* L-immaniġġjar tas-&lt;b&gt;sistemi kollha Mandrivalinux&lt;/b&gt; minn kont wieħed."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Għandek bżonn l-&lt;b&gt;għajnuna&lt;/b&gt;? Iltaqa' mal-esperti tekniċi ta' "</div><div class='del'>-"Mandrakesoft fuq il-&lt;b&gt;pjattaforma ta' għajnuna teknika&lt;/b&gt; www."</div><div class='add'>+"Mandriva fuq il-&lt;b&gt;pjattaforma ta' għajnuna teknika&lt;/b&gt; www."</div><div class='ctx'> "mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Grazzi għall-għajnuna ta' &lt;b&gt;esperti kwalifikati ta' Mandrakelinux&lt;/b&gt;, int "</div><div class='add'>+"Grazzi għall-għajnuna ta' &lt;b&gt;esperti kwalifikati ta' Mandrivalinux&lt;/b&gt;, int "</div><div class='ctx'> "tiffranka ħafna ħin."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Għal kwalinkwa mistoqsija relatata ma' Mandrakelinux, għandek il-possibbiltà "</div><div class='add'>+"Għal kwalinkwa mistoqsija relatata ma' Mandrivalinux, għandek il-possibbiltà "</div><div class='ctx'> "li tixtri inċidenti ta' sapport minn fuq &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17130,8 +17130,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "&lt;b&gt;Prodotti Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "&lt;b&gt;Prodotti Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -17240,7 +17240,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17288,7 +17288,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -20064,13 +20064,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Għodda tal-Mandrakelinux biex tirrapporta bugs"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Għodda tal-Mandrivalinux biex tirrapporta bugs"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Ċentru tal-Kontroll Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Ċentru tal-Kontroll Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20090,8 +20090,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20135,7 +20135,7 @@ msgstr "Sħaħar tal-Konfigurazzjoni"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -20560,19 +20560,19 @@ msgstr "Tella' fil-bidu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Din l-interfaċċja għadha ma ġietx ikkonfigurata.\n"</div><div class='del'>-"Ħaddem is-saħħar \"Żid interfaċċja\" miċ-Ċentru tal-Kontroll Mandrakelinux"</div><div class='add'>+"Ħaddem is-saħħar \"Żid interfaċċja\" miċ-Ċentru tal-Kontroll Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "M'għandek ebda konnessjoni mal-internet ikkonfigurata.\n"</div><div class='del'>-"Ħaddem is-saħħar \"%s\" miċ-Ċentru tal-Kontroll Mandrakelinux"</div><div class='add'>+"Ħaddem is-saħħar \"%s\" miċ-Ċentru tal-Kontroll Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20622,8 +20622,8 @@ msgstr "KDM (KDE Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20922,7 +20922,7 @@ msgstr "Importa"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20931,7 +20931,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 ta' Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 ta' Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (verżjoni oriġinali)\n"</div><div class='hunk'>@@ -21462,14 +21462,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GPL "</div><div class='ctx'> "GNU.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21495,8 +21495,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Ċentru ta' l-Għajnuna Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Ċentru ta' l-Għajnuna Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24717,7 +24717,7 @@ msgid ""</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Dan huwa Harddrake, għodda tal-Mandrakelinux għall-konfigurazzjoni tal-"</div><div class='add'>+"Dan huwa Harddrake, għodda tal-Mandrivalinux għall-konfigurazzjoni tal-"</div><div class='ctx'> "ħardwer.\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Verżjoni:&lt;/span&gt; %s\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Awtur:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='hunk'>@@ -24829,7 +24829,7 @@ msgstr "Il-bidliet saru, imma biex ikunu effettivi trid tilloggja 'l barra"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Log tal-għodda Mandrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -25343,10 +25343,10 @@ msgstr "Konnessjoni lesta."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Konnessjoni falliet.\n"</div><div class='del'>-"Ivverifika l-konfigurazzjoni fiċ-Ċentru tal-Kontroll Mandrakelinux."</div><div class='add'>+"Ivverifika l-konfigurazzjoni fiċ-Ċentru tal-Kontroll Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26220,8 +26220,8 @@ msgstr "Installazzjoni falliet"</div><div class='ctx'> #~ msgstr "Ma għażilt ebda font"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "&lt;b&gt;Prodotti Mandrakesoft&lt;/b&gt;"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "&lt;b&gt;Prodotti Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Ebda browser disponibbli! Jekk jogħġbok installa wieħed"</div><div class='head'>diff --git a/perl-install/share/po/nb.po b/perl-install/share/po/nb.po<br/>index 740d5c8cd..80ad58e5b 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/nb.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/nb.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/nb.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/nb.po</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # translation of DrakX-nb.po to Norwegian Bokmål</div><div class='ctx'> # KTranslator Generated File</div><div class='ctx'> # Translation file of Mandrake graphic install</div><div class='del'>-# Copyright (C) 1999 Mandrakesoft</div><div class='add'>+# Copyright (C) 1999 Mandriva</div><div class='ctx'> # Terje Bjerkelia &lt;terje@bjerkelia.com&gt;, 1999-2000.</div><div class='ctx'> # Andreas Bergstrøm &lt;abergstr@halden.net&gt;, 2000.</div><div class='ctx'> # Kenneth Rørvik &lt;kenneth@argon.no-ip.com&gt;, 2003.</div><div class='hunk'>@@ -75,7 +75,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB-nøkkelen ser ut til å ha skrivebeskyttelse aktivert, men vi kan ikke "</div><div class='ctx'> "plugge\n"</div><div class='hunk'>@@ -84,7 +84,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Klikk knappen for å restarte din maskin, plugg den ut, fjern "</div><div class='ctx'> "skrivebeskyttelsen,\n"</div><div class='del'>-"plugg i nøkkelen igjen og last Mandrake Move på nytt."</div><div class='add'>+"plugg i nøkkelen igjen og last Mandriva Move på nytt."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -102,7 +102,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Din USB-nøkkel har ikke noen gyldig Windows- (FAT) partisjon.\n"</div><div class='hunk'>@@ -113,14 +113,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Du kan også fortsette uten en USB-nøkkel - du vil fortsatt være\n"</div><div class='del'>-"i stand til å bruke Mandrake Move som et normalt live Mandrake\n"</div><div class='add'>+"i stand til å bruke Mandriva Move som et normalt live Mandriva\n"</div><div class='ctx'> "Operativsystem."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -128,11 +128,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vi oppdaget ikke noen USB-nøkkel på ditt system. Hvis du\n"</div><div class='del'>-"plugger inn en USB-nøkkel nå, så vil Mandrake Move ha muligheten\n"</div><div class='add'>+"plugger inn en USB-nøkkel nå, så vil Mandriva Move ha muligheten\n"</div><div class='ctx'> "til å transparent lagre dataene i din hjemmekatalog og systemvidt\n"</div><div class='ctx'> "oppsett for neste oppstart av denne maskinen eller en annen.\n"</div><div class='ctx'> "Merk: hvis du plugger inn en nøkkel nå, vent flere sekunder før du\n"</div><div class='hunk'>@@ -140,7 +140,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Du kan også fortsette uten en USB-nøkkel - du vil fortsatt være\n"</div><div class='del'>-"i stand til å bruke Mandrake Move som et normal live Mandrake\n"</div><div class='add'>+"i stand til å bruke Mandriva Move som et normal live Mandriva\n"</div><div class='ctx'> "Operativsystem."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -267,7 +267,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -283,7 +283,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Dette kan komme av korrupte systemoppsettsfiler\n"</div><div class='ctx'> "på USB-nøkkelen, i slike tilfeller så vil det å fjerne dem for\n"</div><div class='del'>-"så å restarte Mandrake Move fikse problemet. For å gjøre\n"</div><div class='add'>+"så å restarte Mandriva Move fikse problemet. For å gjøre\n"</div><div class='ctx'> "dette, klikk på den riktige knappen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1320,11 +1320,11 @@ msgstr "Spåkvalg"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux kan støtte flere språk. Velg\n"</div><div class='add'>+"Mandrivalinux kan støtte flere språk. Velg\n"</div><div class='ctx'> "språkene du ønsker å installere. Disse vil bli tilgjengelige\n"</div><div class='ctx'> "når installasjonen er ferdig og du har startet systemet på nytt."</div><div class='ctx'> </div><div class='hunk'>@@ -3742,12 +3742,12 @@ msgstr "aktiver radiostøtte"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Før du går videre bør du lese betingelsene i lisensen nøye. Den dekker hele\n"</div><div class='del'>-"Mandrakelinux-distribusjonen. Hvis du er enig med alle betingelsene,\n"</div><div class='add'>+"Mandrivalinux-distribusjonen. Hvis du er enig med alle betingelsene,\n"</div><div class='ctx'> "sjekk av \"%s\"-boksen- Hvis ikke, så vil det år trykke på '%s'k-knappen "</div><div class='ctx'> "starte\n"</div><div class='ctx'> "maskinen din på nytt."</div><div class='hunk'>@@ -3936,13 +3936,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux-installasjonen er spredd ut over flere CD-ROMer. \n"</div><div class='add'>+"Mandrivalinux-installasjonen er spredd ut over flere CD-ROMer. \n"</div><div class='ctx'> "Hvis en valgt pakke er på en annen CDROM, vil DrakX løse ut den nåværende\n"</div><div class='ctx'> "CD og be deg sette i en den rette CDen som kreves. Hvis du ikke har den som\n"</div><div class='ctx'> "trengs nå, bare klikk på «%s», pakken(e) vil da ikke bli installert."</div><div class='hunk'>@@ -3951,11 +3951,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4007,7 +4007,7 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Det er nå på tide å spesifisere hvilke programmer du ønsker å installere på\n"</div><div class='del'>-"systemet ditt. Det er tusenvis av pakker tilgjengelig for Mandrakelinux, "</div><div class='add'>+"systemet ditt. Det er tusenvis av pakker tilgjengelig for Mandrivalinux, "</div><div class='ctx'> "for\n"</div><div class='ctx'> "å gjøre det enklere å håndtere pakkene så har de blitt plassert i grupper "</div><div class='ctx'> "med\n"</div><div class='hunk'>@@ -4015,7 +4015,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Pakkene er delt inn i grupper som svarer til forskjellig typisk bruk av din "</div><div class='ctx'> "maskin.\n"</div><div class='del'>-"Mandrakelinux har fire forhåndsdefinerte installasjoner tilgjengelig.\n"</div><div class='add'>+"Mandrivalinux har fire forhåndsdefinerte installasjoner tilgjengelig.\n"</div><div class='ctx'> "Du kan mikse og matche applikasjoner fra forskjellige grupper, så en\n"</div><div class='ctx'> "``Arbeidsstasjon''-installasjon kan fortsatt ha applikasjoner fra\n"</div><div class='ctx'> "``Utvikling''-gruppa installert.\n"</div><div class='hunk'>@@ -4118,10 +4118,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4154,13 +4154,13 @@ msgstr ""</div><div class='ctx'> "eller fordi den var medlem av en gruppe pakker, vil du bli bedt om å "</div><div class='ctx'> "bekrefte at du\n"</div><div class='ctx'> "virkelig ønsker å installere de valgte tjenerne.\n"</div><div class='del'>-"Som standard i Mandrakelinux vil alle installerte tjenere bli startet ved "</div><div class='add'>+"Som standard i Mandrivalinux vil alle installerte tjenere bli startet ved "</div><div class='ctx'> "oppstart.\n"</div><div class='ctx'> "Selv om de er sikre og ikke har noen kjente sikkerhetshull når denne "</div><div class='ctx'> "distribusjonen\n"</div><div class='ctx'> "ble sluppet,\n"</div><div class='ctx'> "så kan det være at sikkerhetshull ble oppdaget etter at denne versjonen\n"</div><div class='del'>-"av Mandrakelinux ble sluppet. Hvis du ikke vet hva en type tjener gjør, "</div><div class='add'>+"av Mandrivalinux ble sluppet. Hvis du ikke vet hva en type tjener gjør, "</div><div class='ctx'> "eller\n"</div><div class='ctx'> "hvorfor den blir installert, klikk «%s».\n"</div><div class='ctx'> "«%s» vil installere de listede tjenerene og de vil bli\n"</div><div class='hunk'>@@ -4318,7 +4318,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4375,7 +4375,7 @@ msgstr ""</div><div class='ctx'> "X (for X Window System) er hjertet i GNU/Linux sitt grafiske grensesnitt "</div><div class='ctx'> "som\n"</div><div class='ctx'> "alle de grafiske miljøene (KDE, GNOME Afterstep, Windowmaker osv.)\n"</div><div class='del'>-"som følger med Mandrakelinux er avhengige av.\n"</div><div class='add'>+"som følger med Mandrivalinux er avhengige av.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Du vil få en liste med forkjellige parametre som kan forandres for å få et\n"</div><div class='ctx'> "optimalt grafisk grensesnitt: \n"</div><div class='hunk'>@@ -4503,12 +4503,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4535,7 +4535,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4544,7 +4544,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4564,14 +4564,14 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Du må nå avgjøre hvor du ønsker å installere Mandrakelinux-operativsystemet\n"</div><div class='add'>+"Du må nå avgjøre hvor du ønsker å installere Mandrivalinux-operativsystemet\n"</div><div class='ctx'> "på din harddisk. Hvis din harddisk er tom, eller et eksisterende\n"</div><div class='ctx'> "operativsystem benytter all plassen som er tilgjengelig, vil du bli nødt til "</div><div class='ctx'> "å\n"</div><div class='ctx'> "ompartisjonere disken. Partisjonering av en harddisk vil si å dele den inn "</div><div class='ctx'> "i\n"</div><div class='ctx'> "logiske enheter for å skape plassen som trengs for å installere ditt nye\n"</div><div class='del'>-"Mandrakelinux-system.\n"</div><div class='add'>+"Mandrivalinux-system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ettersom partisjoneringsprosessen ikke kan tilbakestilles, og kan føre til "</div><div class='ctx'> "tapte\n"</div><div class='hunk'>@@ -4606,7 +4606,7 @@ msgstr ""</div><div class='ctx'> "har\n"</div><div class='ctx'> "defragmentert Windows-partisjonen. Det anbefales sterkt at du tar \n"</div><div class='ctx'> "sikkerhetskopi av dine data. Dette valget er anbefalt, dersom du ønsker \n"</div><div class='del'>-"å kjøre både Mandrakelinux og Microsoft Windows på samme maskin.\n"</div><div class='add'>+"å kjøre både Mandrivalinux og Microsoft Windows på samme maskin.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Før du velger dette valget, må du være klar over at størrelsen på din\n"</div><div class='ctx'> "Microsoft Windows-partisjon vil være mindre enn når du startet. Du vil \n"</div><div class='hunk'>@@ -4615,7 +4615,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": hvis du ønsker å slette alle partisjoner og data, og erstatte dem "</div><div class='ctx'> "med ditt\n"</div><div class='del'>-"nye Mandrakelinux-system, så velg dette valget. Vær forsiktig, du vil ikke "</div><div class='add'>+"nye Mandrivalinux-system, så velg dette valget. Vær forsiktig, du vil ikke "</div><div class='ctx'> "kunne gjøre\n"</div><div class='ctx'> "om dette etter at du har bekreftet valget.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4783,7 +4783,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4807,7 +4807,7 @@ msgstr ""</div><div class='ctx'> "Klikk «%s» når du er klar til å formatere partisjonene.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klikk «%s» om du vil velge andre partisjoner for din nye\n"</div><div class='del'>-"Mandrakelinux-operativsysteminstallasjon. \n"</div><div class='add'>+"Mandrivalinux-operativsysteminstallasjon. \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klikk på «%s» hvis du ønsker å velge partisjoner som skal sjekkes for\n"</div><div class='ctx'> "ødelagte blokker på disken."</div><div class='hunk'>@@ -4824,7 +4824,7 @@ msgstr "Forrige"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4836,7 +4836,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Når du installerer Mandrakelinux, er det sannsynlig at enkelte pakker\n"</div><div class='add'>+"Når du installerer Mandrivalinux, er det sannsynlig at enkelte pakker\n"</div><div class='ctx'> "er blitt oppdatert siden denne versjonen ble sluppet. Noen feil kan ha\n"</div><div class='ctx'> "blitt fikset, eller sikkerhetsproblemer løst. For at du skal få utnytte\n"</div><div class='ctx'> "disse forbedringene kan du nå laste dem ned fra internett. Kryss av  «%s»\n"</div><div class='hunk'>@@ -4864,7 +4864,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4877,7 +4877,7 @@ msgstr ""</div><div class='ctx'> "gjerne på bekostning av brukervennligheten.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Hvis du ikke vet hva du skal velge, behold standardvalget. Du vil kunne\n"</div><div class='del'>-"endre sikkerhetsnivået senere med verktøyet draksec fra Mandrakelinux\n"</div><div class='add'>+"endre sikkerhetsnivået senere med verktøyet draksec fra Mandrivalinux\n"</div><div class='ctx'> "Kontrollsenter.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "'%s'-feltet kan informere systemet om den bruker på systemet som\n"</div><div class='hunk'>@@ -4893,7 +4893,7 @@ msgstr "Sikkerhetsadministrator"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4964,7 +4964,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "På dette punktet må du velge hvilke partisjon(er) som skal brukes til å\n"</div><div class='del'>-"installere ditt nye Mandrakelinux-system på. Hvis partisjoner allerede har\n"</div><div class='add'>+"installere ditt nye Mandrivalinux-system på. Hvis partisjoner allerede har\n"</div><div class='ctx'> "blitt definert enten fra en tidligere installasjon av GNU/Linux eller fra et "</div><div class='ctx'> "annet\n"</div><div class='ctx'> "partisjoneringsverktøy, kan du bruke eksisterende partisjoner. I andre\n"</div><div class='hunk'>@@ -5058,7 +5058,7 @@ msgstr "Skift mellom normal-/ekspert-modus"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5090,7 +5090,7 @@ msgstr ""</div><div class='ctx'> "din.\n"</div><div class='ctx'> "Vennligst velg den du ønsker å endre størrelsen på for å installere ditt "</div><div class='ctx'> "nye\n"</div><div class='del'>-"Mandrakelinux-operativsystem.\n"</div><div class='add'>+"Mandrivalinux-operativsystem.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Hver partisjon er listet som følger: \"Linux-navn\",\n"</div><div class='ctx'> " \"Windows-navn\", \"Kapasitet\".\n"</div><div class='hunk'>@@ -5138,7 +5138,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5147,20 +5147,20 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dette trinnet blir bare aktivert dersom det blir funnet en eksisterende\n"</div><div class='ctx'> "GNU/Linux-partisjon på maskinen din.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX trenger nå å vite om du vil utføre en ny installasjon eller en "</div><div class='ctx'> "oppgradering\n"</div><div class='del'>-"av et eksisterende Mandrakelinux-system:\n"</div><div class='add'>+"av et eksisterende Mandrivalinux-system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * «%s»: Dette vil stort sett slette hele det gamle systemet. Dersom du\n"</div><div class='ctx'> "ønsker å forandre hvordan harddiskene blir partisjonert, eller forandre på\n"</div><div class='hunk'>@@ -5169,12 +5169,12 @@ msgstr ""</div><div class='ctx'> "du avverge at noen av de gamle dataene blir overskrevet.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * «%s»: Denne installasjonsklassen lar deg oppgradere pakkene som\n"</div><div class='del'>-"er installert på ditt nåværende Mandrakelinux-system. Dine nåværende\n"</div><div class='add'>+"er installert på ditt nåværende Mandrivalinux-system. Dine nåværende\n"</div><div class='ctx'> "partisjonsoppdelinger og brukerdata blir ikke berørt. De fleste andre "</div><div class='ctx'> "oppsettstrinn\n"</div><div class='ctx'> "forblir tilgjengelige, i likhet med en standard installasjon.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"«Oppgrader»-valget bør fungere fint på Mandrakelinux systemer som kjører\n"</div><div class='add'>+"«Oppgrader»-valget bør fungere fint på Mandrivalinux systemer som kjører\n"</div><div class='ctx'> "versjon «8.1» eller nyere. Oppgradering av versjoner tidligere enn «8.1» er\n"</div><div class='ctx'> " ikke anbefalt. "</div><div class='ctx'> </div><div class='hunk'>@@ -5235,7 +5235,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5277,7 +5277,7 @@ msgstr ""</div><div class='ctx'> "Om UTF-8 (ISO 10646) støtte. ISO 10646 er en ny tegnsettskoding det\n"</div><div class='ctx'> "er ment til å dekke alle eksisterende språk. Men full støtte for det i GNU/"</div><div class='ctx'> "Linux er\n"</div><div class='del'>-"stadig under utvikling. Av denne grunnen vil Mandrakelinux bruke det\n"</div><div class='add'>+"stadig under utvikling. Av denne grunnen vil Mandrivalinux bruke det\n"</div><div class='ctx'> "eller ei avhengig av brukerens valg:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Hvis du velger et språk med sterk binding til gammel kodnng (latin1-\n"</div><div class='hunk'>@@ -5530,7 +5530,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5551,11 +5551,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nå er det på tide å velge utskriftsystemet for din maskin. Andre\n"</div><div class='del'>-"operativsystemer tilbyr kanskje en, men Mandrakelinux tilbyr to.\n"</div><div class='add'>+"operativsystemer tilbyr kanskje en, men Mandrivalinux tilbyr to.\n"</div><div class='ctx'> "Hvert av systemene er best for et spesiell type oppsett.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * «%s» -- som står for ``print, do not queue'', er valget hvis du har en\n"</div><div class='hunk'>@@ -5579,7 +5579,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Hvis du gjør et valg nå, og så senere finner ut at du ikke liker ditt "</div><div class='ctx'> "utskriftssystem,\n"</div><div class='del'>-"så kan du endre det ved å kjøre PrinterDrake fra Mandrakelinux "</div><div class='add'>+"så kan du endre det ved å kjøre PrinterDrake fra Mandrivalinux "</div><div class='ctx'> "Kontrollsenter og\n"</div><div class='ctx'> "klikke på «%s»-knappen. "</div><div class='ctx'> </div><div class='hunk'>@@ -5701,7 +5701,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5718,7 +5718,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5773,7 +5773,7 @@ msgstr ""</div><div class='ctx'> " * «%s»: hvis du vil sette opp din internett- eller lokale "</div><div class='ctx'> "nettverkstilkobling\n"</div><div class='ctx'> "kan du gjøre det nå. Sjekk den utskrevne dokumentasjonen eller bruk\n"</div><div class='del'>-"Mandrakelinux Kontrollsenter etter at installasjonen er ferdig for å\n"</div><div class='add'>+"Mandrivalinux Kontrollsenter etter at installasjonen er ferdig for å\n"</div><div class='ctx'> "få full hjelp med oppsettet.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * «%s»: lar deg sette opp HTTP og FTP mellomtjener-adresser hvis maskinen\n"</div><div class='hunk'>@@ -5793,7 +5793,7 @@ msgstr ""</div><div class='ctx'> "denne\n"</div><div class='ctx'> "knappen. Dette er kun for avanserte brukere. Sjekk den utskrevne "</div><div class='ctx'> "dokumentasjonen\n"</div><div class='del'>-"eller innebygd hjelp om oppstartslaster-oppsettet i Mandrakelinux "</div><div class='add'>+"eller innebygd hjelp om oppstartslaster-oppsettet i Mandrivalinux "</div><div class='ctx'> "Kontrollsenter.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * «%s»: igjennom dette valget kan du finjustere hvilke tjenester som skal "</div><div class='hunk'>@@ -5857,11 +5857,11 @@ msgstr "Tjenester"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Velg den harddisken du ønsker å slette for å installere din nye\n"</div><div class='del'>-"Mandrakelinux-partisjon. Vær forsiktig, alle data på denne partisjonen vil "</div><div class='add'>+"Mandrivalinux-partisjon. Vær forsiktig, alle data på denne partisjonen vil "</div><div class='ctx'> "gå tapt\n"</div><div class='ctx'> "og vil ikke kunne gjenopprettes!"</div><div class='ctx'> </div><div class='hunk'>@@ -6218,11 +6218,11 @@ msgstr "Beregner den ledige plassen på Windows-partisjonen"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Windows-partisjonen din er for fragmentert. Vennligst restart maskinen din "</div><div class='del'>-"under Windows, kjør ``defrag'' -verktøyet, så start Mandrakelinux-"</div><div class='add'>+"under Windows, kjør ``defrag'' -verktøyet, så start Mandrivalinux-"</div><div class='ctx'> "installasjonen på nytt."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6340,19 +6340,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6374,7 +6374,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6382,14 +6382,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6399,7 +6399,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6419,10 +6419,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6433,11 +6433,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6453,17 +6453,17 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Introduksjon\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Dette operativsystemet og de forskjellige komponentene som følger med "</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "kalles heretter \"programvareproduktene\". Programvareproduktene inkluderer, "</div><div class='ctx'> "men er ikke\n"</div><div class='ctx'> "begrenset til det settet med programmer, metoder, regler og dokumentasjon "</div><div class='ctx'> "relatert til\n"</div><div class='del'>-"operativsystemet og de forskjellige komponentene til Mandrakelinux-"</div><div class='add'>+"operativsystemet og de forskjellige komponentene til Mandrivalinux-"</div><div class='ctx'> "distribusjonen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6471,7 +6471,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Vennligst les dette dokumentet nøye. Dokumentet er en lisensavtale mellom "</div><div class='ctx'> "deg og\n"</div><div class='del'>-"Mandrakesoft S.A.som gjelder programvareproduktene. Ved å installere, "</div><div class='add'>+"Mandriva S.A.som gjelder programvareproduktene. Ved å installere, "</div><div class='ctx'> "duplisere eller\n"</div><div class='ctx'> "bruke programvareproduktene godtar du og samtykker i vilkårene i denne "</div><div class='ctx'> "lisensen.\n"</div><div class='hunk'>@@ -6490,7 +6490,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Programvareproduktene og den medfølgende dokumentasjonen er levert \"som de "</div><div class='ctx'> "er\"\n"</div><div class='del'>-"uten garanti så langt som det er tillatt ved lov. Mandrakesoft S.A. vil "</div><div class='add'>+"uten garanti så langt som det er tillatt ved lov. Mandriva S.A. vil "</div><div class='ctx'> "under ingen\n"</div><div class='ctx'> "omstendigheter, og så langt som loven tillater det, være ansvarlige for noen "</div><div class='ctx'> "spesielle,\n"</div><div class='hunk'>@@ -6500,14 +6500,14 @@ msgstr ""</div><div class='ctx'> "påført tap) som oppstår\n"</div><div class='ctx'> "som følge av bruk av, eller manglende mulighet til å bruke, "</div><div class='ctx'> "programvareproduktene. Dette \n"</div><div class='del'>-"gjelder også om Mandrakesoft S.A. har blitt informert om slike tap, eller "</div><div class='add'>+"gjelder også om Mandriva S.A. har blitt informert om slike tap, eller "</div><div class='ctx'> "muligheten for slike tap.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "BEGRENSET ANSVAR I FORBINDELSE MED BESITTELSE ELLER BRUK AV ULOVLIG "</div><div class='ctx'> "PROGRAMVARE\n"</div><div class='ctx'> "I ENKELTE LAND\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakesoft S.A. eller dets distributører vil under ingen omstendigheter, "</div><div class='add'>+"Mandriva S.A. eller dets distributører vil under ingen omstendigheter, "</div><div class='ctx'> "og så langt som loven\n"</div><div class='ctx'> "tillater det, være ansvarlige for noen spesielle, tilfeldige, direkte eller "</div><div class='ctx'> "indirekte skader (inkludert\n"</div><div class='hunk'>@@ -6516,7 +6516,7 @@ msgstr ""</div><div class='ctx'> "straff, eller annet påført tap) som oppstår som følge av besittelse og bruk "</div><div class='ctx'> "av programvareproduktene\n"</div><div class='ctx'> "eller som følge av nedlasting av programvarekomponenter fra noen av "</div><div class='del'>-"Mandrakelinux-nettstedene\n"</div><div class='add'>+"Mandrivalinux-nettstedene\n"</div><div class='ctx'> "som er forbudt eller begrenset i enkelte land ved lokal lov. Dette "</div><div class='ctx'> "begrensede\n"</div><div class='ctx'> "ansvaret gjelder, men er ikke begrenset til, sterke kryptografiprodukter som "</div><div class='hunk'>@@ -6538,9 +6538,9 @@ msgstr ""</div><div class='ctx'> "du bruker dem.\n"</div><div class='ctx'> "Spørsmål om en gitt komponents lisens skal rettes til forfatteren av "</div><div class='ctx'> "komponenten og ikke til\n"</div><div class='del'>-"Mandrakesoft S.A. Programmene som er utviklet av Mandrakesoft S.A. er "</div><div class='add'>+"Mandriva S.A. Programmene som er utviklet av Mandrakesoft S.A. er "</div><div class='ctx'> "regulert av GPL-lisensen.\n"</div><div class='del'>-"Dokumentasjon skrevet av Mandrakesoft S.A er regulert av en spesifikk "</div><div class='add'>+"Dokumentasjon skrevet av Mandriva S.A er regulert av en spesifikk "</div><div class='ctx'> "lisens. Vennligst referer\n"</div><div class='ctx'> "til dokumentasjonen for detaljer.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6549,12 +6549,12 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Alle rettigheter til programvareproduktene tilhører deres respektive "</div><div class='ctx'> "forfattere og er beskyttet\n"</div><div class='del'>-"av opphavrettlover som gjelder for programvare. Mandrakesoft S.A. "</div><div class='add'>+"av opphavrettlover som gjelder for programvare. Mandriva S.A. "</div><div class='ctx'> "forbeholder seg retten til å\n"</div><div class='ctx'> "modifisere eller tilpasse programvareproduktene helt eller delvis, på alle "</div><div class='ctx'> "måter og for alle formål.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" og tilhørende logoer er varemerker "</div><div class='del'>-"tilhørende Mandrakesoft S.A.\n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" og tilhørende logoer er varemerker "</div><div class='add'>+"tilhørende Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Gjeldende lover\n"</div><div class='hunk'>@@ -6569,7 +6569,7 @@ msgstr ""</div><div class='ctx'> "utvei vil disputten bli\n"</div><div class='ctx'> "henvist til de riktige rettsinstansene i Paris, Frankrike. Har du noen "</div><div class='ctx'> "spørsmål om dette dokumentet,\n"</div><div class='del'>-"vennligst kontakt Mandrakesoft S.A. \n"</div><div class='add'>+"vennligst kontakt Mandriva S.A. \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6661,7 +6661,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6669,14 +6669,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gratulerer, installasjonen er fullført.\n"</div><div class='ctx'> "Fjern oppstartsmediet og trykk enter for å starte på nytt.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For informasjon om fikser som er tilgjengelige for denne utgaven av "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "sjekk errataen tilgjengelig fra:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6684,7 +6684,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informasjon om oppsett av systemet ditt finnes i post\n"</div><div class='del'>-"install-kapittelet i Official Mandrakelinux User's Guide."</div><div class='add'>+"install-kapittelet i Official Mandrivalinux User's Guide."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6718,12 +6718,12 @@ msgstr "Entrer trinn `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Systemet ditt har lite ressurser. Du kan muligens oppleve noen problemer\n"</div><div class='del'>-"ved installering av Mandrakelinux. Hvis dette skjer kan du prøve tekst- "</div><div class='add'>+"ved installering av Mandrivalinux. Hvis dette skjer kan du prøve tekst- "</div><div class='ctx'> "installering\n"</div><div class='ctx'> "i stedet. Trykk `F1' ved oppstart av CD-ROM, skriv så `text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7267,9 +7267,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kontakter Mandrakelinux-nettstedet for å få liste over tilgjengelige speil..."</div><div class='add'>+"Kontakter Mandrivalinux-nettstedet for å få liste over tilgjengelige speil..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7493,8 +7493,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux-installasjon %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux-installasjon %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10082,13 +10082,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall-oppsett\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Dette setter opp en personlig brannmur for denne Mandrakelinux-maskinen.\n"</div><div class='add'>+"Dette setter opp en personlig brannmur for denne Mandrivalinux-maskinen.\n"</div><div class='ctx'> "For en kraftig dedikert brannmurløsning ta en kikk på den\n"</div><div class='ctx'> "spesialiserte MandrakeSecurity Firewall-distribusjonen."</div><div class='ctx'> </div><div class='hunk'>@@ -14158,11 +14158,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kjør Scannerdrake (Maskinvare/Scanner i Mandrakelinux Kontrollsenter) for å "</div><div class='add'>+"Kjør Scannerdrake (Maskinvare/Scanner i Mandrivalinux Kontrollsenter) for å "</div><div class='ctx'> "dele scanneren din på nettverket.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -16095,33 +16095,33 @@ msgstr "Stopp"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Hva er Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Hva er Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Velkommen til &lt;b&gt;Mandrakelinux!&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Velkommen til &lt;b&gt;Mandrivalinux!&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux er en &lt;b&gt;Linux-distribusjon&lt;/b&gt; som inneholder kjernen i "</div><div class='add'>+"Mandrivalinux er en &lt;b&gt;Linux-distribusjon&lt;/b&gt; som inneholder kjernen i "</div><div class='ctx'> "systemet, kalt &lt;b&gt;operativsystemet&lt;/b&gt; (basert på Linux-kjernen) sammen med "</div><div class='ctx'> "&lt;b&gt;mange programmer&lt;/b&gt; som møter alle behov du kan tenke på."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux er den mest &lt;b&gt;brukervennlige&lt;/b&gt; Linux-distribusjonen i dag. "</div><div class='add'>+"Mandrivalinux er den mest &lt;b&gt;brukervennlige&lt;/b&gt; Linux-distribusjonen i dag. "</div><div class='ctx'> "Det er også en av de &lt;b&gt;mest brukte&lt;/b&gt; Linux-distribusjonene i verden!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16137,15 +16137,15 @@ msgstr "Velkommen til &lt;b&gt;Open Source-verdenen&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux er og skal fortsette å være basert på åpen kildekode-modellen. "</div><div class='add'>+"Mandrivalinux er og skal fortsette å være basert på åpen kildekode-modellen. "</div><div class='ctx'> "Dette betyr at hver nye utgivelse er resultatet av &lt;b&gt;samarbeid&lt;/b&gt; mellom "</div><div class='del'>-"&lt;b&gt;Mandrakesoft's utviklergruppe&lt;/b&gt; og det &lt;b&gt;verdensomspennende samfunnet&lt;/"</div><div class='del'>-"b&gt; av Mandrakelinux bidragsytere."</div><div class='add'>+"&lt;b&gt;Mandriva's utviklergruppe&lt;/b&gt; og det &lt;b&gt;verdensomspennende samfunnet&lt;/"</div><div class='add'>+"b&gt; av Mandrivalinux bidragsytere."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16165,9 +16165,9 @@ msgstr "&lt;b&gt;GPL-lisensen&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"De fleste programmene inkludert i distribusjonen og alle Mandrakelinux-"</div><div class='add'>+"De fleste programmene inkludert i distribusjonen og alle Mandrivalinux-"</div><div class='ctx'> "verktøyene er lisensert under &lt;b&gt;General Public License&lt;/b&gt;-lisensen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16194,20 +16194,20 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:13</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "&lt;b&gt;Join the Community&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Bli med i Mandrakelinux-samfunnet!&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Bli med i Mandrivalinux-samfunnet!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux har et av de &lt;b&gt;største samfunnene&lt;/b&gt; med brukere og "</div><div class='add'>+"Mandrivalinux har et av de &lt;b&gt;største samfunnene&lt;/b&gt; med brukere og "</div><div class='ctx'> "utviklere. Rollen til et slikt samfunn er veldig bred, alt fra "</div><div class='ctx'> "feilrapportering til utvikling av nye programmer. Samfunnet har en "</div><div class='del'>-"&lt;b&gt;avgjørende rolle&lt;/b&gt; i Mandrakelinux-verdenen."</div><div class='add'>+"&lt;b&gt;avgjørende rolle&lt;/b&gt; i Mandrivalinux-verdenen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16228,11 +16228,11 @@ msgstr "&lt;b&gt;Nedlastingsversjon&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Du installerer nå &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Dette er gratisversjonen "</div><div class='del'>-"som Mandrakesoft vil ha &lt;b&gt;tilgjengelig for alle&lt;/b&gt;."</div><div class='add'>+"Du installerer nå &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Dette er gratisversjonen "</div><div class='add'>+"som Mandriva vil ha &lt;b&gt;tilgjengelig for alle&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16262,9 +16262,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Du vil ikke ha tilgang til &lt;b&gt;tjenestene inkludert&lt;/b&gt; i andre Mandrakesoft-"</div><div class='add'>+"Du vil ikke ha tilgang til &lt;b&gt;tjenestene inkludert&lt;/b&gt; i andre Mandriva-"</div><div class='ctx'> "produkter heller."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -16274,8 +16274,8 @@ msgstr "&lt;b&gt;Discovery, ditt første Linux-system&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Du installerer nå &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Du installerer nå &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16297,17 +16297,17 @@ msgstr "&lt;b&gt;PowerPack, det ultimate Linux-skrivebordet&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Du installerer nå &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Du installerer nå &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack er Mandrakesoft's &lt;b&gt;førsteklasses Linux-skrivebordspakke&lt;/b&gt;. "</div><div class='add'>+"PowerPack er Mandriva's &lt;b&gt;førsteklasses Linux-skrivebordspakke&lt;/b&gt;. "</div><div class='ctx'> "PowerPack inkluderer &lt;b&gt;flere tusen programmer&lt;/b&gt; - alt fra de mest "</div><div class='ctx'> "populære til de mest avanserte."</div><div class='ctx'> </div><div class='hunk'>@@ -16318,8 +16318,8 @@ msgstr "&lt;b&gt;PowerPack+, Linux-løsningen for hjemme-PCer og tjenere&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Du installerer nå &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;"</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Du installerer nå &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16335,22 +16335,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft-produkter&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva-produkter&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; har utviklet en lang rekke med &lt;b&gt;Mandrakelinux&lt;/b&gt;-"</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; har utviklet en lang rekke med &lt;b&gt;Mandrivalinux&lt;/b&gt;-"</div><div class='ctx'> "produkter."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux-produktene er:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux-produktene er:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16370,72 +16370,72 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, Linux-løsningen for hjemme PC-er og tjenere"</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, Mandrakelinux løsningen for å få mest "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, Mandrivalinux løsningen for å få mest "</div><div class='ctx'> "mulig ut av din 64-bits prosessor."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft-Produkter (Nomade Produkter)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva-Produkter (Nomade Produkter)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft har utviklet to produkter som lar deg bruke Mandrakelinux &lt;b&gt;på "</div><div class='add'>+"Mandriva har utviklet to produkter som lar deg bruke Mandrivalinux &lt;b&gt;på "</div><div class='ctx'> "hvilken som helst PC&lt;/b&gt; uten å trenge å installere det:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, en Mandrakelinux-distribusjon som kjøres helt fra en "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, en Mandrivalinux-distribusjon som kjøres helt fra en "</div><div class='ctx'> "oppstartbar CD-ROM."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, en Mandrakelinux distribusjon ferdig installert på "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, en Mandrivalinux distribusjon ferdig installert på "</div><div class='ctx'> "den ultra-kompakte «LaCie Mobile Hard Drive»."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft-produkter (Profesjonelle løsninger)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva-produkter (Profesjonelle løsninger)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Under er Mandrakesoft-produktene utformet for å møte &lt;b&gt;profesjonelle behov&lt;/"</div><div class='add'>+"Under er Mandriva-produktene utformet for å møte &lt;b&gt;profesjonelle behov&lt;/"</div><div class='ctx'> "b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrakelinux-systemet for bedrifter."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrivalinux-systemet for bedrifter."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrakelinux-tjenerløsningen."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrivalinux-tjenerløsningen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrakelinux-sikkerhetsløsningen."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrivalinux-sikkerhetsløsningen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16479,10 +16479,10 @@ msgstr "&lt;b&gt;Velg ditt foretrukne grafiske skrivebordsmiljø&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Med PowerPack vil du ha valget mellom flere &lt;b&gt;grafiske skrivebordsmiljøer&lt;/"</div><div class='del'>-"b&gt;. Mandrakesoft har valgt &lt;b&gt;KDE&lt;/b&gt; som standard."</div><div class='add'>+"b&gt;. Mandriva har valgt &lt;b&gt;KDE&lt;/b&gt; som standard."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16506,10 +16506,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Med PowerPack+ vil du ha valget mellom flere &lt;b&gt;grafiske skrivebordsmiljøer&lt;/"</div><div class='del'>-"b&gt;. Mandrakesoft har valgt &lt;b&gt;KDE&lt;/b&gt; som standard."</div><div class='add'>+"b&gt;. Mandriva har valgt &lt;b&gt;KDE&lt;/b&gt; som standard."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16636,10 +16636,10 @@ msgstr "&lt;b&gt;Nyt den lange rekken med programmer&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"I Mandrakelinux-menyen vil du finne programmer som er &lt;b&gt;enkle å bruke&lt;/b&gt; "</div><div class='add'>+"I Mandrivalinux-menyen vil du finne programmer som er &lt;b&gt;enkle å bruke&lt;/b&gt; "</div><div class='ctx'> "for &lt;b&gt;alle dine oppgaver&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16902,17 +16902,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Kontrollsenter&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Kontrollsenter&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakelinux Kontrollsenter&lt;/b&gt; er en uunværlig samling av Mandrakelinux-"</div><div class='add'>+"&lt;b&gt;Mandrivalinux Kontrollsenter&lt;/b&gt; er en uunværlig samling av Mandrivalinux-"</div><div class='ctx'> "spesifikke verktøy for å forenkle oppsettet av din maskin."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16937,16 +16937,16 @@ msgstr "&lt;b&gt;Åpen Source-modellen&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Som all dataprogrammering, trenger open source-programvare &lt;b&gt;tid og folk&lt;/"</div><div class='ctx'> "b&gt; for utvikling. For å respektere open source-filosofien selger "</div><div class='del'>-"Mandrakesoft ekstra produkter og tjenester for å &lt;b&gt;fortsette å forbedre "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. Hvis du vil &lt;b&gt;støtte open source-filosofien&lt;/b&gt; og "</div><div class='del'>-"utviklingen av Mandrakelinux, &lt;b&gt;vennligst&lt;/b&gt; vurder å kjøpe et av våre "</div><div class='add'>+"Mandriva ekstra produkter og tjenester for å &lt;b&gt;fortsette å forbedre "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. Hvis du vil &lt;b&gt;støtte open source-filosofien&lt;/b&gt; og "</div><div class='add'>+"utviklingen av Mandrivalinux, &lt;b&gt;vennligst&lt;/b&gt; vurder å kjøpe et av våre "</div><div class='ctx'> "produkter eller tjenester!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16957,10 +16957,10 @@ msgstr "&lt;b&gt;Nettbutikk&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"For å lære mer om Mandrakesoft-produkter og tjenester kan du besøke vår &lt;b&gt;e-"</div><div class='add'>+"For å lære mer om Mandriva-produkter og tjenester kan du besøke vår &lt;b&gt;e-"</div><div class='ctx'> "handelplattform&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16985,24 +16985,24 @@ msgstr "Stopp innom i dag på &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; er den &lt;p&gt;perfekte partner&lt;/b&gt; til ditt Mandrakelinux-"</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; er den &lt;p&gt;perfekte partner&lt;/b&gt; til ditt Mandrivalinux-"</div><div class='ctx'> "produkt.."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Utnytt våre &lt;b&gt;verdifulle fordeler&lt;/b&gt; ved å bli med i Mandrakeclub, som:"</div><div class='add'>+"Utnytt våre &lt;b&gt;verdifulle fordeler&lt;/b&gt; ved å bli med i Mandriva Club, som:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17024,40 +17024,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Delta i Mandrakelinux-&lt;b&gt;brukerforum&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Delta i Mandrivalinux-&lt;b&gt;brukerforum&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t*&lt;b&gt;Tidlig og priviligert tilgang&lt;/b&gt;, før offentlige utgivelser til "</div><div class='del'>-"Mandrakelinux-&lt;b&gt;ISO-imagefiler&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux-&lt;b&gt;ISO-imagefiler&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; er en flott tjeneste som Mandrakesoft er stolt over å "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; er en flott tjeneste som Mandriva er stolt over å "</div><div class='ctx'> "kunne tilby sine kunder!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline tilbyr en lang rekke med verdifulle tjenester for &lt;b&gt;enkel "</div><div class='del'>-"oppdatering&lt;/b&gt; av dine Mandrakelinux-systemer:"</div><div class='add'>+"Mandriva Online tilbyr en lang rekke med verdifulle tjenester for &lt;b&gt;enkel "</div><div class='add'>+"oppdatering&lt;/b&gt; av dine Mandrivalinux-systemer:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17082,40 +17082,40 @@ msgstr "\t* Fleksible &lt;b&gt;planlagte&lt;/b&gt; oppdateringer."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Håndtering av &lt;b&gt;alle dine Mandrakelinux-systemer&lt;/b&gt; med en konto."</div><div class='add'>+"\t* Håndtering av &lt;b&gt;alle dine Mandrivalinux-systemer&lt;/b&gt; med en konto."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Har du behov for &lt;b&gt;assistanse?&lt;/b&gt; Mæt Mandrakesoft's tekniske eksperter på "</div><div class='add'>+"Har du behov for &lt;b&gt;assistanse?&lt;/b&gt; Mæt Mandriva's tekniske eksperter på "</div><div class='ctx'> "&lt;b&gt;vår tekniske kundestøtteplattform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Takket være hjelpa fra &lt;b&gt;kvalifiserte Mandrakelinux-eksperter&lt;/b&gt;, så vil "</div><div class='add'>+"Takket være hjelpa fra &lt;b&gt;kvalifiserte Mandrivalinux-eksperter&lt;/b&gt;, så vil "</div><div class='ctx'> "du få spart masse tid."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"For alle spørsmål relatert til Mandrakelinux så har du muligheten til å "</div><div class='add'>+"For alle spørsmål relatert til Mandrivalinux så har du muligheten til å "</div><div class='ctx'> "kjøpe kundestøttetilfeller på &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17415,8 +17415,8 @@ msgstr "Overvårkningsverktøy, prosessbokføring, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft-veivisere"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva-veivisere"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17570,7 +17570,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17584,7 +17584,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[VALG]...\n"</div><div class='del'>-"Mandrakelinux Terminaltjener-oppsett\n"</div><div class='add'>+"Mandrivalinux Terminaltjener-oppsett\n"</div><div class='ctx'> "--enable         : aktiver MTS\n"</div><div class='ctx'> "--disable        : deaktiver MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17640,7 +17640,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17648,7 +17648,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[VALG]...\n"</div><div class='ctx'> "  --no-confirmation      ikke spør det første bekreftelsesspørsmålet i "</div><div class='del'>-"MandrakeUpdate-modus\n"</div><div class='add'>+"Mandriva Update-modus\n"</div><div class='ctx'> "  --no-verify-rpm        ikke kontroller pakkesignaturer\n"</div><div class='ctx'> "  --changelog-first      vis endringslogg før filliste i   "</div><div class='ctx'> "beskrivelsesvinduet\n"</div><div class='hunk'>@@ -20411,13 +20411,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux-feilrapporteringsverktøy"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux-feilrapporteringsverktøy"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Kontrollsenter"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Kontrollsenter"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20437,8 +20437,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20482,8 +20482,8 @@ msgstr "Oppsetssveivisere"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Velg Mandrakesoft-verktøy:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Velg Mandriva-verktøy:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20908,19 +20908,19 @@ msgstr "Startet ved oppstart"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dette grensesnittet har ikke blitt satt opp ennå.\n"</div><div class='del'>-"Kjør \"Legg til et grensesnitt\"-assistenten fra Mandrakelinux Kontrollsenter"</div><div class='add'>+"Kjør \"Legg til et grensesnitt\"-assistenten fra Mandrivalinux Kontrollsenter"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Du har ikke satt opp en internettilkobling enda.\n"</div><div class='del'>-"Kjør «%s»-assistenten fra Mandrakelinux Kontrollsenter."</div><div class='add'>+"Kjør «%s»-assistenten fra Mandrivalinux Kontrollsenter."</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20970,8 +20970,8 @@ msgstr "KDM (KDE-Innloggingshåndterer)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux-Innloggingshåndterer)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux-Innloggingshåndterer)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21270,7 +21270,7 @@ msgstr "Importer"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21279,7 +21279,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 ved Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 ved Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (opprinnelig versjon)\n"</div><div class='hunk'>@@ -21825,14 +21825,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Dette er fri programvare og kan bli redistribuert under vilkårene til GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21861,8 +21861,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux hjelpesenter"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux hjelpesenter"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25387,8 +25387,8 @@ msgstr "Endringen er gjort, men for å være effektivisert så må du logge ut"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinuxverktøy-logger"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinuxverktøy-logger"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25904,10 +25904,10 @@ msgstr "Oppkobling ferdig."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Oppkobling feilet.\n"</div><div class='del'>-"Sjekk oppsettet ditt i Mandrakelinux Kontrollsenter."</div><div class='add'>+"Sjekk oppsettet ditt i Mandrivalinux Kontrollsenter."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/nl.po b/perl-install/share/po/nl.po<br/>index cfc8f96db..512502669 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/nl.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/nl.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/nl.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/nl.po</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> # Dutch translation of DrakX.</div><div class='ctx'> # Copyright (C) 2000 Free Software Foundation, Inc.</div><div class='del'>-# Copyright (c) 2000 Mandrakesoft</div><div class='add'>+# Copyright (c) 2000 Mandriva</div><div class='ctx'> # Niels Gras &lt;niels.gras@wanadoo.nl&gt;, 2000</div><div class='ctx'> # Jeroen ten Berge &lt;j.ten.berge@twinbit.nl&gt;, 2002</div><div class='ctx'> # Reinout van Schouwen &lt;reinout@cs.vu.nl&gt;, 2002-2005</div><div class='hunk'>@@ -69,7 +69,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "De USB-key lijkt schrijfbeschermd te zijn, maar hij kan op dit moment niet\n"</div><div class='ctx'> "veilig ontkoppeld worden.\n"</div><div class='hunk'>@@ -77,7 +77,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Klik op de knop om de computer opnieuw op te starten, ontkoppel de USB-key,\n"</div><div class='ctx'> "maak de schrijfbescherming ongedaan, plug hem opnieuw in, en start\n"</div><div class='del'>-"Mandrake Move opnieuw."</div><div class='add'>+"Mandriva Move opnieuw."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Uw USB-key beschikt niet over geldige Windows (FAT) partities.\n"</div><div class='hunk'>@@ -106,13 +106,13 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "U kunt ook zonder een USB-key doorgaan - u kunt dan nog steeds\n"</div><div class='del'>-"Mandrake Move gebruiken als een normaal Mandrake besturingssysteem."</div><div class='add'>+"Mandriva Move gebruiken als een normaal Mandrake besturingssysteem."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -120,11 +120,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Er is geen USB-key aan uw systeem gevonden. Als u nu\n"</div><div class='del'>-"een USB-key inplugt, heeft Mandrake Move de mogelijkheid om de\n"</div><div class='add'>+"een USB-key inplugt, heeft Mandriva Move de mogelijkheid om de\n"</div><div class='ctx'> "gegevens op transparante wijze in uw persoonlijke map en\n"</div><div class='ctx'> "systeemconfiguratie op te slaan, voor de volgende keer dat u \n"</div><div class='ctx'> "deze computer of een andere opstart. Opmerking: als u nu een \n"</div><div class='hunk'>@@ -133,7 +133,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "U kunt ook zonder een USB-key doorgaan - u kunt dan nog steeds\n"</div><div class='del'>-"Mandrake Move gebruiken als een normaal Mandrake besturingssysteem."</div><div class='add'>+"Mandriva Move gebruiken als een normaal Mandrake besturingssysteem."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -259,7 +259,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -276,7 +276,7 @@ msgstr ""</div><div class='ctx'> "Dit zou veroorzaakt kunnen worden door gecorrumpeerde \n"</div><div class='ctx'> "systeemconfiguratiebestanden op de USB-key. In dit \n"</div><div class='ctx'> "geval kan het probleem opgelost worden door ze te \n"</div><div class='del'>-"verwijderen en Mandrake Move te herstarten. Klik op de\n"</div><div class='add'>+"verwijderen en Mandriva Move te herstarten. Klik op de\n"</div><div class='ctx'> "overeenkomstige knop als u dit wilt doen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1324,11 +1324,11 @@ msgstr "Taalkeuze"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux kan meerdere talen aan. Selecteer de talen\n"</div><div class='add'>+"Mandrivalinux kan meerdere talen aan. Selecteer de talen\n"</div><div class='ctx'> "die u wenst te installeren. Ze zullen beschikbaar zijn wanneer\n"</div><div class='ctx'> "de installatie afgerond is en u uw computer opnieuw start."</div><div class='ctx'> </div><div class='hunk'>@@ -3768,12 +3768,12 @@ msgstr "activeer radio ondersteuning"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Voordat u verdergaat dient u eerst de voorwaarden in de licentie\n"</div><div class='del'>-"aandachtig te lezen. Zij beslaan de gehele Mandrakelinux distributie.\n"</div><div class='add'>+"aandachtig te lezen. Zij beslaan de gehele Mandrivalinux distributie.\n"</div><div class='ctx'> "Indien u akkoord gaat met alle voorwaarden erin kruist u het\n"</div><div class='ctx'> "\"%s\"-vakje aan. Zoniet, dan zal het klikken van de \"%s\"-knop\n"</div><div class='ctx'> "uw computer herstarten."</div><div class='hunk'>@@ -3956,13 +3956,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"De Mandrakelinux-installatie is verdeeld over meerdere CD-ROMs. Als een \n"</div><div class='add'>+"De Mandrivalinux-installatie is verdeeld over meerdere CD-ROMs. Als een \n"</div><div class='ctx'> "geselecteerd pakket te vinden is op een andere CD-ROM, zal het \n"</div><div class='ctx'> "installatieprogramma de huidige CD uitwerpen en u vragen om de\n"</div><div class='ctx'> "correcte CD in te leggen. Mocht u de betreffende CD niet bij de hand "</div><div class='hunk'>@@ -3974,11 +3974,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4034,7 +4034,7 @@ msgstr ""</div><div class='ctx'> "Linux, en om het overzichtelijker te maken zijn de pakketten in groepen\n"</div><div class='ctx'> "van vergelijkbare toepassingen geplaatst.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorteert groepen pakketten in vier categorieën.\n"</div><div class='add'>+"Mandrivalinux sorteert groepen pakketten in vier categorieën.\n"</div><div class='ctx'> "U kunt de toepassingen uit de verschillende categorieën uitkiezen\n"</div><div class='ctx'> "en samenvoegen naar eigen inzicht, zodat een ``Werkstation''-installatie\n"</div><div class='ctx'> "nog steeds toepassingen geïnstalleerd kan hebben uit de ``Server''\n"</div><div class='hunk'>@@ -4146,10 +4146,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4181,11 +4181,11 @@ msgstr ""</div><div class='ctx'> "!! Als een server-pakket geselecteerd is, ofwel omdat u dat pakket\n"</div><div class='ctx'> "specifiek gekozen heeft ofwel omdat het onderdeel is van een hele groep\n"</div><div class='ctx'> "pakketten, zal u gevraagd worden om te bevestigen dat u deze servers echt\n"</div><div class='del'>-"wilt installeren. Onder Mandrakelinux worden alle geïnstalleerde servers\n"</div><div class='add'>+"wilt installeren. Onder Mandrivalinux worden alle geïnstalleerde servers\n"</div><div class='ctx'> "standaard ingeschakeld tijdens het opstarten. Zelfs wanneer zij veilig\n"</div><div class='ctx'> "zijn en geen bekende beveiligingsgebreken hadden op het moment dat de\n"</div><div class='ctx'> "distributie werd uitgebracht, kan het gebeuren dat beveiligingsfouten\n"</div><div class='del'>-"ontdekt worden nadat deze versie van Mandrakelinux afgemaakt werd.\n"</div><div class='add'>+"ontdekt worden nadat deze versie van Mandrivalinux afgemaakt werd.\n"</div><div class='ctx'> "Indien u niet weet wat een bepaalde dienst geacht wordt te doen of waarom\n"</div><div class='ctx'> "deze geïnstalleerd wordt, klikt u dan \"%s\". Klikken op \"%s\" zal\n"</div><div class='ctx'> "de getoonde diensten installeren en ze zullen automatisch worden\n"</div><div class='hunk'>@@ -4343,7 +4343,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4400,7 +4400,7 @@ msgstr ""</div><div class='ctx'> "X (voor X Window System) is het hart van de grafische interface van GNU/\n"</div><div class='ctx'> "Linux waarvan alle grafische omgevingen (KDE, GNOME, AfterStep, "</div><div class='ctx'> "WindowMaker,\n"</div><div class='del'>-"etc.) die bij Mandrakelinux worden geleverd, afhankelijk zijn.\n"</div><div class='add'>+"etc.) die bij Mandrivalinux worden geleverd, afhankelijk zijn.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "U krijgt een lijst te zien van verschillende parameters die u kunt "</div><div class='ctx'> "aanpassen\n"</div><div class='hunk'>@@ -4519,12 +4519,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4551,7 +4551,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4560,7 +4560,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4580,12 +4580,12 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Op dit punt dient u te kiezen waar op uw harde schijf u uw Mandrakelinux\n"</div><div class='add'>+"Op dit punt dient u te kiezen waar op uw harde schijf u uw Mandrivalinux\n"</div><div class='ctx'> "besturingssysteem wilt installeren. Als uw harde schijf leeg is of als een\n"</div><div class='ctx'> "ander besturingssysteem alle beschikbare ruimte inneemt, dan zult u\n"</div><div class='ctx'> "de harde schijf moeten partitioneren. Partitioneren houdt in dat u uw harde\n"</div><div class='ctx'> "schijf in logische stukken onderverdeelt om ruimte te creëren voor uw\n"</div><div class='del'>-"nieuwe Mandrakelinux besturingssysteem.\n"</div><div class='add'>+"nieuwe Mandrivalinux besturingssysteem.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Omdat de effecten van het partitioneringsproces over het algemeen niet\n"</div><div class='ctx'> "terug te draaien zijn en kan leiden tot gegevensverlies als er reeds een\n"</div><div class='hunk'>@@ -4618,7 +4618,7 @@ msgstr ""</div><div class='ctx'> "verlies van enige gegevens, vooropgesteld dat u eerst de Windows-partitie\n"</div><div class='ctx'> "gedefragmenteerd heeft. Een reservekopie maken van uw gegevens is\n"</div><div class='ctx'> "uitdrukkelijk aangeraden. Deze optie is aanbevolen indien u zowel\n"</div><div class='del'>-"Mandrakelinux als Microsoft Windows op dezelfde computer wilt gebruiken.\n"</div><div class='add'>+"Mandrivalinux als Microsoft Windows op dezelfde computer wilt gebruiken.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Laat het goed tot u doordringen, voordat u deze optie kiest, dat uw\n"</div><div class='ctx'> "Microsoft Windows partitie na afloop van deze procedure minder groot\n"</div><div class='hunk'>@@ -4627,7 +4627,7 @@ msgstr ""</div><div class='ctx'> "installeren.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": indien u alle gegevens en alle partities op uw\n"</div><div class='del'>-"harde schijf wilt verwijderen en vervangen door uw nieuwe Mandrakelinux-\n"</div><div class='add'>+"harde schijf wilt verwijderen en vervangen door uw nieuwe Mandrivalinux-\n"</div><div class='ctx'> "systeem, kiest u deze optie. Weest u voorzichtig met deze oplossing omdat u\n"</div><div class='ctx'> "na bevestiging deze keuze niet meer ongedaan kunt maken.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4794,7 +4794,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4817,7 +4817,7 @@ msgstr ""</div><div class='ctx'> "Klik op \"%s\" wanneer u klaar bent om de partities te formatteren.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klik op \"%s\" indien u een andere partitie voor uw nieuwe\n"</div><div class='del'>-"Mandrakelinux besturingssysteem wilt kiezen.\n"</div><div class='add'>+"Mandrivalinux besturingssysteem wilt kiezen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klik op \"%s\" indien u partities wenst te selecteren die op\n"</div><div class='ctx'> "onleesbare blokken gecontroleerd moeten worden."</div><div class='hunk'>@@ -4834,7 +4834,7 @@ msgstr "Vorige"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4846,7 +4846,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Op het moment dat u Mandrakelinux installeert, is het waarschijnlijk\n"</div><div class='add'>+"Op het moment dat u Mandrivalinux installeert, is het waarschijnlijk\n"</div><div class='ctx'> "dat sommige pakketten herzien zijn sinds het moment dat het werd\n"</div><div class='ctx'> "uitgebracht. Sommige onvolkomenheden kunnen gerepareerd zijn en\n"</div><div class='ctx'> "beveiligingsproblemen opgelost. Om u te kunnen laten profiteren van\n"</div><div class='hunk'>@@ -4877,7 +4877,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4892,7 +4892,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Als u niet weet wat te kiezen, behoudt u de standaard optie. U zult \n"</div><div class='ctx'> "later nog in staat zijn het beveiligingsniveau te veranderen met het\n"</div><div class='del'>-"draksec-hulpprogramma vanuit het Mandrakelinux Configuratiecentrum.\n"</div><div class='add'>+"draksec-hulpprogramma vanuit het Mandrivalinux Configuratiecentrum.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Vul in het \"%s\"-veld het e-mailadres in van de persoon die\n"</div><div class='ctx'> "verantwoordelijk is voor de beveiliging. Beveiligingsmeldingen\n"</div><div class='hunk'>@@ -4907,7 +4907,7 @@ msgstr "Beveiligingsbeheerder"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4978,7 +4978,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Op dit punt dient u te kiezen welke partitie(s) gebruikt zullen worden voor\n"</div><div class='del'>-"de installatie van uw Mandrakelinux systeem. Indien er reeds partities\n"</div><div class='add'>+"de installatie van uw Mandrivalinux systeem. Indien er reeds partities\n"</div><div class='ctx'> "gedefinieerd zijn, van een vorige GNU/Linux installatie of door een\n"</div><div class='ctx'> "ander partitioneringsprogramma, kunt u bestaande partities gebruiken.\n"</div><div class='ctx'> "In andere gevallen moeten er harde schijf-partities gedefinieerd worden.\n"</div><div class='hunk'>@@ -5077,7 +5077,7 @@ msgstr "Normale/expert-modus"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5106,7 +5106,7 @@ msgid ""</div><div class='ctx'> "disk or partition is called \"C:\")."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Er is meer dan één Microsoft-partitie op uw harde schijf gevonden.\n"</div><div class='del'>-"Kiest u degene die u wilt verkleinen om uw nieuwe Mandrakelinux\n"</div><div class='add'>+"Kiest u degene die u wilt verkleinen om uw nieuwe Mandrivalinux\n"</div><div class='ctx'> "besturingssysteem te kunnen installeren.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Elke partitie wordt getoond als volgt: \"Linux naam\", \"Windows naam\"\n"</div><div class='hunk'>@@ -5155,7 +5155,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5164,19 +5164,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Deze stap activeert slechts wanneer een bestaande GNU/Linux-partitie\n"</div><div class='ctx'> "gevonden is op uw computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Nu is het noodzakelijk dat u aangeeft of u een nieuwe installatie\n"</div><div class='del'>-"of een opwaardering van een bestaand Mandrakelinux-systeem\n"</div><div class='add'>+"of een opwaardering van een bestaand Mandrivalinux-systeem\n"</div><div class='ctx'> "wilt uitvoeren:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". Dit verwijdert het oude systeem vrijwel volledig.\n"</div><div class='hunk'>@@ -5187,14 +5187,14 @@ msgstr ""</div><div class='ctx'> "bestandssysteem wenst te wijzigen, dan dient u deze optie te kiezen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". Deze installatieklasse stelt u in staat de pakketten\n"</div><div class='del'>-"die momenteel op uw Mandrakelinux-systeem zijn geïnstalleerd te verversen.\n"</div><div class='add'>+"die momenteel op uw Mandrivalinux-systeem zijn geïnstalleerd te verversen.\n"</div><div class='ctx'> "Uw huidige partitioneringsschema en gebruikersgegevens worden niet\n"</div><div class='ctx'> " veranderd. De meeste andere configuratiestappen blijven beschikbaar,\n"</div><div class='ctx'> "zoals bij een gewone installatie.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Het gebruik van de ``Opwaardering''-optie zou prima moeten werken op\n"</div><div class='del'>-"Mandrakelinux versie \"8.1\" of recenter. Het uitvoeren van een\n"</div><div class='del'>-"opwaardering op versies eerder dan Mandrakelinux versie \"8.1\" is afgeraden."</div><div class='add'>+"Mandrivalinux versie \"8.1\" of recenter. Het uitvoeren van een\n"</div><div class='add'>+"opwaardering op versies eerder dan Mandrivalinux versie \"8.1\" is afgeraden."</div><div class='ctx'> </div><div class='ctx'> # Extra stukje toegevoegd over Nederlandse layout</div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -5256,7 +5256,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5298,7 +5298,7 @@ msgstr ""</div><div class='ctx'> "Over UTF-8 (unicode)-ondersteuning: Unicode is een nieuwe tekencodering\n"</div><div class='ctx'> "bedoeld om alle bestaande geschreven talen te omvatten. Volledige\n"</div><div class='ctx'> "GNU/Linux-ondersteuning ervoor is echter nog in ontwikkeling.\n"</div><div class='del'>-"Daarom gebruikt Mandrakelinux het al dan niet, afhankelijk van de keuze\n"</div><div class='add'>+"Daarom gebruikt Mandrivalinux het al dan niet, afhankelijk van de keuze\n"</div><div class='ctx'> "van de gebruiker:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Indien u talen kiest met een sterke coderingstraditie (latin1\n"</div><div class='hunk'>@@ -5546,7 +5546,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5567,11 +5567,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Het is nu tijd een afdruksysteem voor uw computer te selecteren. Andere\n"</div><div class='del'>-"besturingssystemen geven u er wellicht maar één, maar Mandrakelinux\n"</div><div class='add'>+"besturingssystemen geven u er wellicht maar één, maar Mandrivalinux\n"</div><div class='ctx'> "biedt er twee. Elk van deze afdruksystemen is het meest geschikt voor\n"</div><div class='ctx'> "bepaalde typen configuraties.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5597,7 +5597,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Wanneer u nu een keuze maakt en er later achter komt dat uw afdruksysteem\n"</div><div class='ctx'> "u niet bevalt dan kunt u het veranderen door PrinterDrake uit te voeren\n"</div><div class='del'>-"vanuit het Mandrakelinux Configuratiecentrum en op de \"%s\"-knop te klikken."</div><div class='add'>+"vanuit het Mandrivalinux Configuratiecentrum en op de \"%s\"-knop te klikken."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5717,7 +5717,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5734,7 +5734,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5787,7 +5787,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Als u uw internettoegang of toegang tot het lokale\n"</div><div class='ctx'> "netwerk wilt instellen, kunt u dat nu doen. Raadpleeg de gedrukte\n"</div><div class='del'>-"documentatie of gebruik het Mandrakelinux Configuratiecentrum nadat\n"</div><div class='add'>+"documentatie of gebruik het Mandrivalinux Configuratiecentrum nadat\n"</div><div class='ctx'> "de installatie klaar is om te profiteren van volledige on-line hulp.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": stelt u in staat HTTP- en FTP-proxy adressen te configureren\n"</div><div class='hunk'>@@ -5804,7 +5804,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": indien u uw opstartlader-configuratie wenst te \n"</div><div class='ctx'> "veranderen, klikt u op deze knop. Alleen aankomen als u een gevorderde\n"</div><div class='ctx'> "gebruiker bent. Raadpleeg de gedrukte documentatie of de on-line hulp\n"</div><div class='del'>-"over de configuratie van een opstartlader in het Mandrakelinux \n"</div><div class='add'>+"over de configuratie van een opstartlader in het Mandrivalinux \n"</div><div class='ctx'> "Configuratiecentrum.\n"</div><div class='ctx'> " * \"%s\": U bent hier in staat om de diensten die op uw computer\n"</div><div class='ctx'> "actief zullen zijn, fijn af te regelen. Indien u deze computer als server\n"</div><div class='hunk'>@@ -5865,10 +5865,10 @@ msgstr "Diensten"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kies de harde schijf die u wilt wissen om uw nieuwe Mandrakelinux-\n"</div><div class='add'>+"Kies de harde schijf die u wilt wissen om uw nieuwe Mandrivalinux-\n"</div><div class='ctx'> "partitie op te installeren. Wees voorzichtig, alle gegevens die\n"</div><div class='ctx'> "op deze schijf staan zullen verloren gaan, en niet terug te halen zijn!"</div><div class='ctx'> </div><div class='hunk'>@@ -6227,12 +6227,12 @@ msgstr "Bezig met berekenen grootte van Windows-partitie"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Uw Windows-partitie is te gefragmenteerd. Start uw computer opnieuw op onder "</div><div class='ctx'> "Windows, gebruik het ``defrag''-hulpprogramma, en herstart vervolgens de "</div><div class='del'>-"installatie van Mandrakelinux."</div><div class='add'>+"installatie van Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6352,19 +6352,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6386,7 +6386,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6394,14 +6394,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6411,7 +6411,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6431,10 +6431,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6445,11 +6445,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6465,17 +6465,17 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Introductie\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Het besturingssysteem en de verschillende componenten beschikbaar in de "</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "distributie zullen vanaf nu \" Software Produkten\" heten. De Software "</div><div class='ctx'> "Produkten omvatten,\n"</div><div class='ctx'> "maar zijn niet beperkt tot de programma's, methoden, regels en documentatie "</div><div class='ctx'> "gerelateerd aan\n"</div><div class='del'>-"het besturingssysteem en de verschillende onderdelen van de Mandrakelinux "</div><div class='add'>+"het besturingssysteem en de verschillende onderdelen van de Mandrivalinux "</div><div class='ctx'> "distributie.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6483,7 +6483,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Lees dit document zorgvuldig. Dit document is een licentieovereenkomst "</div><div class='ctx'> "tussen U en\n"</div><div class='del'>-"Mandrakesoft S.A. welke van toepassing is op de Software Produkten.\n"</div><div class='add'>+"Mandriva S.A. welke van toepassing is op de Software Produkten.\n"</div><div class='ctx'> "Door het installeren, dupliceren of gebruiken van de Software Produkten in "</div><div class='ctx'> "welke vorm dan ook,\n"</div><div class='ctx'> "gaat u expliciet akkoord en bent het volledig eens met de voorwaarden van "</div><div class='hunk'>@@ -6505,7 +6505,7 @@ msgstr ""</div><div class='ctx'> "De Software Produkten en meegeleverde documentatie zijn geleverd \"als "</div><div class='ctx'> "zodanig\" zonder garantie,\n"</div><div class='ctx'> "voorzover dat dat wettelijk is toegestaan.\n"</div><div class='del'>-"Mandrakesoft S.A. zal in geen enkele omstandigheid, en voorzover dat "</div><div class='add'>+"Mandriva S.A. zal in geen enkele omstandigheid, en voorzover dat "</div><div class='ctx'> "wettelijk is toegestaan,\n"</div><div class='ctx'> "aansprakelijk zijn voor elke vorm van speciale, incidentele, directe of "</div><div class='ctx'> "indirecte schade (inclusief\n"</div><div class='hunk'>@@ -6515,13 +6515,13 @@ msgstr ""</div><div class='ctx'> "daaruit volgende verliezen)\n"</div><div class='ctx'> "veroorzaakt door het gebruik of het niet kunnen gebruiken van de Software "</div><div class='ctx'> "Produkten, zelfs als\n"</div><div class='del'>-"Mandrakesoft S.A. op de hoogte was van de mogelijkheid danwel voorkomen van "</div><div class='add'>+"Mandriva S.A. op de hoogte was van de mogelijkheid danwel voorkomen van "</div><div class='ctx'> "dergelijke schades.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "BEPERKTE AANSPRAKELIJKHEID GEKOPPELD AAN HET BEZIT OF GEBRUIK VAN\n"</div><div class='ctx'> "VERBODEN SOFTWARE IN SOMMIGE LANDEN\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakesoft S.A. of zijn distributeurs zullen, voorzover wettelijk "</div><div class='add'>+"Mandriva S.A. of zijn distributeurs zullen, voorzover wettelijk "</div><div class='ctx'> "toegestaan, in geen geval aansprakelijk\n"</div><div class='ctx'> "zijn voor welke vorm van speciale, incidentele, directe of indirecte schade "</div><div class='ctx'> "dan ook (inclusief\n"</div><div class='hunk'>@@ -6531,7 +6531,7 @@ msgstr ""</div><div class='ctx'> "daaruit volgende verliezen)\n"</div><div class='ctx'> "voortkomend uit het bezit of gebruik van softwarecomponenten of voortkomend "</div><div class='ctx'> "uit het downloaden van\n"</div><div class='del'>-"softwarecomponenten van één van Mandrakelinux sites, welke verboden of "</div><div class='add'>+"softwarecomponenten van één van Mandrivalinux sites, welke verboden of "</div><div class='ctx'> "beperkt zijn in sommige\n"</div><div class='ctx'> "landen door lokale wetgeving.\n"</div><div class='ctx'> "Deze beperkte aansprakelijkheid geldt voor, maar is niet beperkt tot de "</div><div class='hunk'>@@ -6553,10 +6553,10 @@ msgstr ""</div><div class='ctx'> "deze licentieovereenkomsten\n"</div><div class='ctx'> "alvorens enige component te gebruiken. Elke vraag over een componentlicentie "</div><div class='ctx'> "kunt U richten aan de\n"</div><div class='del'>-"desbetreffende auteur en niet aan Mandrakesoft.\n"</div><div class='del'>-"De programmatuur ontwikkeld door Mandrakesoft S.A. valt onder de GPL-"</div><div class='add'>+"desbetreffende auteur en niet aan Mandriva.\n"</div><div class='add'>+"De programmatuur ontwikkeld door Mandriva S.A. valt onder de GPL-"</div><div class='ctx'> "licentie. Documentatie\n"</div><div class='del'>-"geschreven door Mandrakesoft S.A. valt onder een eigen licentie. Zie de "</div><div class='add'>+"geschreven door Mandriva S.A. valt onder een eigen licentie. Zie de "</div><div class='ctx'> "documentatie voor verdere details.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6567,11 +6567,11 @@ msgstr ""</div><div class='ctx'> "auteurs en zijn beschermd door intellectuele eigendoms- en copyright-wetten "</div><div class='ctx'> "welke gelden voor\n"</div><div class='ctx'> "computerprogrammatuur.\n"</div><div class='del'>-"Mandrakesoft S.A. behoudt zich het recht voor om de Software Produkten te "</div><div class='add'>+"Mandriva S.A. behoudt zich het recht voor om de Software Produkten te "</div><div class='ctx'> "veranderen in hun geheel\n"</div><div class='ctx'> "of in onderdelen, op welke manier dan ook en voor welk doel dan ook.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" en geassocieerde logo's zijn handelsmerken "</div><div class='del'>-"van Mandrakesoft S.A.\n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" en geassocieerde logo's zijn handelsmerken "</div><div class='add'>+"van Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Geldende wetten\n"</div><div class='hunk'>@@ -6588,7 +6588,7 @@ msgstr ""</div><div class='ctx'> "geschikt. Als een laatste oplossing kan de zaak doorverwezen worden naar de "</div><div class='ctx'> "geschikte\n"</div><div class='ctx'> "gerechtshoven van Parijs - Frankrijk.\n"</div><div class='del'>-"Bij vragen over dit document, gelieve contact op te nemen met Mandrakesoft S."</div><div class='add'>+"Bij vragen over dit document, gelieve contact op te nemen met Mandriva S."</div><div class='ctx'> "A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Dit document is vanuit het Engels vertaald door een onbeëdigde vertaler. "</div><div class='hunk'>@@ -6690,7 +6690,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6698,13 +6698,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gefeliciteerd, de installatie is voltooid. \n"</div><div class='ctx'> "Verwijder de opstartmedia en druk op Enter om opnieuw op te starten.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Voor informatie over verbeteringen die voor deze versie van Mandrakelinux\n"</div><div class='add'>+"Voor informatie over verbeteringen die voor deze versie van Mandrivalinux\n"</div><div class='ctx'> "beschikbaar zijn, raadpleegt u de Errata, beschikbaar van:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6712,7 +6712,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informatie over het configureren van uw systeem is beschikbaar in het\n"</div><div class='del'>-"\"post install\"-hoofdstuk van de Official Mandrakelinux User's Guide."</div><div class='add'>+"\"post install\"-hoofdstuk van de Official Mandrivalinux User's Guide."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6747,12 +6747,12 @@ msgstr "Overgang naar stap `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Uw systeem heeft weinig bronnen beschikbaar. U zou problemen kunnen\n"</div><div class='del'>-"ondervinden bij het installeren van Mandrakelinux. Als dit gebeurt,\n"</div><div class='add'>+"ondervinden bij het installeren van Mandrivalinux. Als dit gebeurt,\n"</div><div class='ctx'> "kunt u een tekstinstallatie proberen. Om dit te doen, drukt u op `F1'\n"</div><div class='ctx'> "terwijl de CDROM opstart, en dan voert u `text' in."</div><div class='ctx'> </div><div class='hunk'>@@ -7298,9 +7298,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Bezig te verbinden met de Mandrakelinux-website om de lijst met beschikbare "</div><div class='add'>+"Bezig te verbinden met de Mandrivalinux-website om de lijst met beschikbare "</div><div class='ctx'> "mirrors op te halen..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7526,8 +7526,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux installatie %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux installatie %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10114,14 +10114,14 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Configuratie van drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Dit programma configureert een persoonlijke firewall voor deze \n"</div><div class='del'>-"Mandrakelinux machine. Voor een krachtige, specifieke\n"</div><div class='add'>+"Mandrivalinux machine. Voor een krachtige, specifieke\n"</div><div class='ctx'> "firewall-oplossing, zie de gespecialiseerde MandrakeSecurity \n"</div><div class='ctx'> "Firewall-distributie."</div><div class='ctx'> </div><div class='hunk'>@@ -14218,11 +14218,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Voer Scannerdrake uit (Apparatuur/Scanner in Mandrakelinux "</div><div class='add'>+"Voer Scannerdrake uit (Apparatuur/Scanner in Mandrivalinux "</div><div class='ctx'> "Configuratiecentrum) om uw scanner te delen op het netwerk.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -16195,23 +16195,23 @@ msgstr "Stop"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Wat is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Wat is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Welkom bij &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Welkom bij &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux is een &lt;b&gt;Linuxdistributie&lt;/b&gt; die bestaat uit het hart van "</div><div class='add'>+"Mandrivalinux is een &lt;b&gt;Linuxdistributie&lt;/b&gt; die bestaat uit het hart van "</div><div class='ctx'> "het systeem, &lt;b&gt;besturingssysteem&lt;/b&gt; genoemd (gebaseerd op de Linux-kernel) "</div><div class='ctx'> "tesamen met &lt;b&gt;vele toepassingen&lt;/b&gt; die maken dat u alles met uw computer "</div><div class='ctx'> "kunt doen wat u maar kunt verzinnen."</div><div class='hunk'>@@ -16219,10 +16219,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux is de meest &lt;b&gt;gebruikersvriendelijke&lt;/b&gt; Linuxdistributie die "</div><div class='add'>+"Mandrivalinux is de meest &lt;b&gt;gebruikersvriendelijke&lt;/b&gt; Linuxdistributie die "</div><div class='ctx'> "vandaag de dag bestaat. Het is daarnaast één van de &lt;b&gt;meest gebruikte&lt;/b&gt; "</div><div class='ctx'> "Linuxdistributies ter wereld!"</div><div class='ctx'> </div><div class='hunk'>@@ -16239,15 +16239,15 @@ msgstr "Welkom in de &lt;b&gt;wereld van open source&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux legt zich toe op het open source-model. Dit betekent dat deze "</div><div class='add'>+"Mandrivalinux legt zich toe op het open source-model. Dit betekent dat deze "</div><div class='ctx'> "nieuwe uitgave het resultaat is van &lt;b&gt;samenwerking&lt;/b&gt; tussen "</div><div class='del'>-"&lt;b&gt;Mandrakesofts' team van ontwikkelaars&lt;/b&gt; en de &lt;b&gt;wereldwijde "</div><div class='del'>-"gemeenschap&lt;/b&gt; van personen die meewerken aan Mandrakelinux."</div><div class='add'>+"&lt;b&gt;Mandrivas' team van ontwikkelaars&lt;/b&gt; en de &lt;b&gt;wereldwijde "</div><div class='add'>+"gemeenschap&lt;/b&gt; van personen die meewerken aan Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16267,10 +16267,10 @@ msgstr "&lt;b&gt;De GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "De meeste software die bijgesloten is in de distributie en alle "</div><div class='del'>-"Mandrakelinux-hulpprogramma's zijn uitgegven onder de &lt;b&gt;General Public "</div><div class='add'>+"Mandrivalinux-hulpprogramma's zijn uitgegven onder de &lt;b&gt;General Public "</div><div class='ctx'> "License&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16303,15 +16303,15 @@ msgstr "&lt;b&gt;Kom bij de community&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux heeft één van de &lt;b&gt;grootste community's&lt;/b&gt; van gebruikers en "</div><div class='add'>+"Mandrivalinux heeft één van de &lt;b&gt;grootste community's&lt;/b&gt; van gebruikers en "</div><div class='ctx'> "ontwikkelaars. De rol van zo'n community is erg breed, variërend van het "</div><div class='ctx'> "melden van foutjes tot de ontwikkeling van nieuwe toepassingen. De community "</div><div class='del'>-"speelt een &lt;b&gt;sleutelrol&lt;/b&gt; in de Mandrakelinux-wereld."</div><div class='add'>+"speelt een &lt;b&gt;sleutelrol&lt;/b&gt; in de Mandrivalinux-wereld."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16333,11 +16333,11 @@ msgstr "&lt;b&gt;Downloadversie&lt;/b&gt;."</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Momenteel installeert u &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Dit is de gratis "</div><div class='del'>-"versie die Mandrakesoft &lt;b&gt;beschikbaar voor iedereen&lt;/b&gt; wil houden."</div><div class='add'>+"Momenteel installeert u &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Dit is de gratis "</div><div class='add'>+"versie die Mandriva &lt;b&gt;beschikbaar voor iedereen&lt;/b&gt; wil houden."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16369,10 +16369,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "U zult eveneens geen toegang hebben tot de &lt;b&gt;bijgesloten diensten&lt;/b&gt; in de "</div><div class='del'>-"andere Mandrakesoft-produkten."</div><div class='add'>+"andere Mandriva-produkten."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16381,8 +16381,8 @@ msgstr "&lt;b&gt;Discovery, Uw eerste Linux-werkomgeving&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "U bent nu &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt; aan het installeren."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "U bent nu &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt; aan het installeren."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16404,17 +16404,17 @@ msgstr "&lt;b&gt;PowerPack, de ultieme Linux-werkomgeving&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "U bent nu &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt; aan het installeren."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "U bent nu &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt; aan het installeren."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack is Mandrakesofts' &lt;b&gt;werkplek-Linux paradepaardje&lt;/b&gt;. PowerPack "</div><div class='add'>+"PowerPack is Mandrivas' &lt;b&gt;werkplek-Linux paradepaardje&lt;/b&gt;. PowerPack "</div><div class='ctx'> "bevat &lt;b&gt;duizenden toepassingen&lt;/b&gt; - alles van de populairste tot de meest "</div><div class='ctx'> "geavanceerde."</div><div class='ctx'> </div><div class='hunk'>@@ -16425,8 +16425,8 @@ msgstr "&lt;b&gt;PowerPack+, de Linuxoplossing voor werkplekken en servers&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "U installeert nu &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "U installeert nu &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16443,22 +16443,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft-produkten&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva-produkten&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; heeft een uitgebreide serie &lt;b&gt;Mandrakelinux&lt;/b&gt;-"</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; heeft een uitgebreide serie &lt;b&gt;Mandrivalinux&lt;/b&gt;-"</div><div class='ctx'> "produkten ontwikkeld."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "De Mandrakelinux-produkten zijn:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "De Mandrivalinux-produkten zijn:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16478,75 +16478,75 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, de Linuxoplossing voor werkplekken en servers."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux voor x86-64&lt;/b&gt;, de Mandrakelinux-oplossing om het "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux voor x86-64&lt;/b&gt;, de Mandrivalinux-oplossing om het "</div><div class='ctx'> "meeste uit uw 64-bit processor te halen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft-produkten (Nomad-produkten)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva-produkten (Nomad-produkten)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft heeft twee produkten ontwikkeld die u in staat stellen om "</div><div class='del'>-"Mandrakelinux &lt;b&gt;op iedere computer&lt;/b&gt; te gebruiken, zonder dat u het eerst "</div><div class='add'>+"Mandriva heeft twee produkten ontwikkeld die u in staat stellen om "</div><div class='add'>+"Mandrivalinux &lt;b&gt;op iedere computer&lt;/b&gt; te gebruiken, zonder dat u het eerst "</div><div class='ctx'> "hoeft te installeren:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, een Mandrakelinux-distributie die geheel vanaf een "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, een Mandrivalinux-distributie die geheel vanaf een "</div><div class='ctx'> "opstartbare CD-ROM te gebruiken is."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, een Mandrakelinux-distributie voorgeïnstalleerd op "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, een Mandrivalinux-distributie voorgeïnstalleerd op "</div><div class='ctx'> "de ultra-compacte “LaCie Mobile Hard Drive”."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft-produkten (Professional Solutions)&lt;/b&gt;:"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva-produkten (Professional Solutions)&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Hieronder de Mandrakesoft-produkten ontworpen om te voldoen aan &lt;b&gt;eisen van "</div><div class='add'>+"Hieronder de Mandriva-produkten ontworpen om te voldoen aan &lt;b&gt;eisen van "</div><div class='ctx'> "de professional&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, de Mandrakelinux-werkomgeving voor bedrijven."</div><div class='add'>+"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, de Mandrivalinux-werkomgeving voor bedrijven."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, de Mandrakelinux serveroplossing."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, de Mandrivalinux serveroplossing."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, de Mandrakelinux beveiligingsoplossing."</div><div class='add'>+"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, de Mandrivalinux beveiligingsoplossing."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16589,10 +16589,10 @@ msgstr "&lt;b&gt;Kies uw favoriete grafische werkomgeving&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Met PowerPack kunt u de &lt;b&gt;grafische werkomgeving&lt;/b&gt; uitkiezen. "</div><div class='del'>-"Mandrakesoft heeft &lt;b&gt;KDE&lt;/b&gt; als de standaardwerkomgeving gekozen."</div><div class='add'>+"Mandriva heeft &lt;b&gt;KDE&lt;/b&gt; als de standaardwerkomgeving gekozen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16617,10 +16617,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Met PowerPack+ kunt u de &lt;b&gt;grafische werkomgeving&lt;/b&gt; uitkiezen. "</div><div class='del'>-"Mandrakesoft heeft &lt;b&gt;KDE&lt;/b&gt; als de standaardwerkomgeving gekozen."</div><div class='add'>+"Mandriva heeft &lt;b&gt;KDE&lt;/b&gt; als de standaardwerkomgeving gekozen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16746,10 +16746,10 @@ msgstr "&lt;b&gt;Beleef plezier aan de uitgebreide sortering toepassingen&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"In het Mandrakelinux-menu vindt u &lt;b&gt;makkelijk te gebruiken&lt;/b&gt; toepassingen "</div><div class='add'>+"In het Mandrivalinux-menu vindt u &lt;b&gt;makkelijk te gebruiken&lt;/b&gt; toepassingen "</div><div class='ctx'> "voor &lt;b&gt;al uw werkzaamheden&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -17015,18 +17015,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Configuratiecentrum&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Configuratiecentrum&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Het &lt;b&gt;Mandrakelinux Configuratiecentrum&lt;/b&gt; is een essentiële verzameling "</div><div class='del'>-"Mandrakelinux-specifieke hulpprogramma's die het configureren van uw "</div><div class='add'>+"Het &lt;b&gt;Mandrivalinux Configuratiecentrum&lt;/b&gt; is een essentiële verzameling "</div><div class='add'>+"Mandrivalinux-specifieke hulpprogramma's die het configureren van uw "</div><div class='ctx'> "computer vereenvoudigen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -17051,16 +17051,16 @@ msgstr "&lt;b&gt;Het Open Source-model&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Zoals bij al het computerprogrammeren, vereist open source-software &lt;b&gt;tijd "</div><div class='ctx'> "en mensen&lt;/b&gt; voor ontwikkeling. Teneinde de open source-filosofie te "</div><div class='del'>-"respecteren, verkoopt Mandrakesoft produkten en diensten met toegevoegde "</div><div class='del'>-"waarde om &lt;b&gt;Mandrakelinux te blijven verbeteren&lt;/b&gt;. Als u de &lt;b&gt;open "</div><div class='del'>-"source-filosofie wilt steunen&lt;/b&gt; alsmede de ontwikkeling van Mandrakelinux, "</div><div class='add'>+"respecteren, verkoopt Mandriva produkten en diensten met toegevoegde "</div><div class='add'>+"waarde om &lt;b&gt;Mandrivalinux te blijven verbeteren&lt;/b&gt;. Als u de &lt;b&gt;open "</div><div class='add'>+"source-filosofie wilt steunen&lt;/b&gt; alsmede de ontwikkeling van Mandrivalinux, "</div><div class='ctx'> "overweeg dan &lt;b&gt;alstublieft&lt;/b&gt; het aanschaffen van één van onze produkten "</div><div class='ctx'> "of diensten!"</div><div class='ctx'> </div><div class='hunk'>@@ -17072,10 +17072,10 @@ msgstr "&lt;b&gt;Online winkel&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Om meer te weten te komen over Mandrakesoft produkten en diensten, kunt u "</div><div class='add'>+"Om meer te weten te komen over Mandriva produkten en diensten, kunt u "</div><div class='ctx'> "ons &lt;b&gt;e-commerce-platform&lt;/b&gt; bezoeken."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -17100,25 +17100,25 @@ msgstr "Kom vandaag nog langs op &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is de &lt;b&gt;perfecte metgezel&lt;/b&gt; voor uw Mandrakelinux-"</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is de &lt;b&gt;perfecte metgezel&lt;/b&gt; voor uw Mandrivalinux-"</div><div class='ctx'> "produkt."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Profiteer van &lt;b&gt;waardevolle voordelen&lt;/b&gt; door u aan te sluiten bij "</div><div class='del'>-"Mandrakeclub, zoals:"</div><div class='add'>+"Mandriva Club, zoals:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17140,40 +17140,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Deelname aan Mandrakelinux &lt;b&gt;gebruikersfora&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Deelname aan Mandrivalinux &lt;b&gt;gebruikersfora&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Vroege- en voorrangstoegang&lt;/b&gt;, vóór publieke uitgave, tot "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO-beeldbestanden&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO-beeldbestanden&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is een nieuwe premium-dienst die Mandrakesoft met "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is een nieuwe premium-dienst die Mandriva met "</div><div class='ctx'> "trots zijn klanten aanbiedt!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline voorziet in een breed spectrum waardevolle diensten voor het "</div><div class='del'>-"&lt;b&gt;eenvoudig bijwerken&lt;/b&gt; van uw Mandrakelinux-systemen:"</div><div class='add'>+"Mandriva Online voorziet in een breed spectrum waardevolle diensten voor het "</div><div class='add'>+"&lt;b&gt;eenvoudig bijwerken&lt;/b&gt; van uw Mandrivalinux-systemen:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17198,40 +17198,40 @@ msgstr "\t* Flexibel &lt;b&gt;ingeroosterd&lt;/b&gt; bijwerken."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='del'>-msgstr "\t* Beheer van &lt;b&gt;al uw Mandrakelinux-systemen&lt;/b&gt; met één account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='add'>+msgstr "\t* Beheer van &lt;b&gt;al uw Mandrivalinux-systemen&lt;/b&gt; met één account."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Heeft u &lt;b&gt;assistentie&lt;/b&gt; nodig? Ontmoet de technische experts van "</div><div class='del'>-"Mandrakesoft op &lt;b&gt;ons technisch ondersteuningsplatform&lt;/b&gt; www."</div><div class='add'>+"Mandriva op &lt;b&gt;ons technisch ondersteuningsplatform&lt;/b&gt; www."</div><div class='ctx'> "mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Dankzij de hulp van &lt;b&gt;gekwalificeerde Mandrakelinux-experts&lt;/b&gt;, zult u "</div><div class='add'>+"Dankzij de hulp van &lt;b&gt;gekwalificeerde Mandrivalinux-experts&lt;/b&gt;, zult u "</div><div class='ctx'> "veel tijd besparen."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Voor elke vraag die met Mandrakelinux te maken heeft bent u in de "</div><div class='add'>+"Voor elke vraag die met Mandrivalinux te maken heeft bent u in de "</div><div class='ctx'> "gelegenheid om ondersteuningsincidenten te kopen op &lt;b&gt;store.mandrakesoft."</div><div class='ctx'> "com&lt;/b&gt;."</div><div class='ctx'> </div><div class='hunk'>@@ -17535,8 +17535,8 @@ msgstr "Observatieprogramma's, bijhouden van processen, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft-wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva-wizards"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17688,7 +17688,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17702,7 +17702,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTIES]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configuratieprogramma\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configuratieprogramma\n"</div><div class='ctx'> "--enable         : MTS inschakelen\n"</div><div class='ctx'> "--disable        : MTS uitschakelen\n"</div><div class='ctx'> "--start          : MTS starten\n"</div><div class='hunk'>@@ -17759,7 +17759,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17767,7 +17767,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      eerste bevestigingsvraag niet stellen in "</div><div class='del'>-"MandrakeUpdate modus\n"</div><div class='add'>+"Mandriva Update modus\n"</div><div class='ctx'> "  --no-verify-rpm        pakket-handtekeningen niet verifiëren\n"</div><div class='ctx'> "  --changelog-first      veranderingenlogboek voor bestandslijst weergeven "</div><div class='ctx'> "in omschrijvingsvenster\n"</div><div class='hunk'>@@ -20550,13 +20550,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux foutrapportage-programma"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux foutrapportage-programma"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Configuratiecentrum"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Configuratiecentrum"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20576,8 +20576,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20621,8 +20621,8 @@ msgstr "Configuratie-wizards"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Selecteer Mandrakesoft-hulpprogramma:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Selecteer Mandriva-hulpprogramma:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21052,7 +21052,7 @@ msgstr "Aangezet bij het opstarten"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Deze interface is nog niet geconfigureerd.\n"</div><div class='ctx'> "Start de \"Interface toevoegen\"-assistent vanuit het Mandrake "</div><div class='hunk'>@@ -21062,10 +21062,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "U heeft nog geen geconfigureerde Internetverbinding.\n"</div><div class='del'>-"Start de \"%s\"-assistent vanuit het Mandrakelinux configuratiecentrum."</div><div class='add'>+"Start de \"%s\"-assistent vanuit het Mandrivalinux configuratiecentrum."</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21115,8 +21115,8 @@ msgstr "KDM (KDE displaybeheer)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux displaybeheer)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux displaybeheer)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21418,7 +21418,7 @@ msgstr "Importeren"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21427,7 +21427,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright © 2001-2002 door Mandrakesoft \n"</div><div class='add'>+"Copyright © 2001-2002 door Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (originele versie)\n"</div><div class='hunk'>@@ -21981,14 +21981,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright © 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright © 2003-2004 Mandriva.\n"</div><div class='ctx'> "Dit is vrije software en mag verder gedistribueerd worden onder de "</div><div class='ctx'> "voorwaarden van de GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -22017,8 +22017,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux Hulpcentrum"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux Hulpcentrum"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25318,8 +25318,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Logboek van Mandrakelinux-hulpprogramma's"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Logboek van Mandrivalinux-hulpprogramma's"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25844,10 +25844,10 @@ msgstr "Verbinding voltooid."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Verbinding mislukt.\n"</div><div class='del'>-"Controleer uw configuratie in het Mandrakelinux Configuratiecentrum."</div><div class='add'>+"Controleer uw configuratie in het Mandrivalinux Configuratiecentrum."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26735,8 +26735,8 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ msgstr "Opslaan en sluiten"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Mandrakesoft-wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Mandriva-wizards"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Geen bladerprogramma beschikbaar! Installeert u er alstublieft één."</div><div class='hunk'>@@ -26879,13 +26879,13 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "Er is een fout opgetreden bij het openen van %s voor schrijfbewerking: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Dit is HardDrake, een Mandrakelinux apparatuurconfiguratieprogramma.\n"</div><div class='add'>+#~ "Dit is HardDrake, een Mandrivalinux apparatuurconfiguratieprogramma.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Versie:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Auteur:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -27299,16 +27299,16 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "Het verwijderen van de printer \"%s\" uit Star Office/OpenOffice.org/GIMP "</div><div class='ctx'> #~ "is mislukt."</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Congratulations for choosing Mandrakelinux!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Gefeliciteerd met het kiezen van Mandrakelinux!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Congratulations for choosing Mandrivalinux!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Gefeliciteerd met het kiezen van Mandrivalinux!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux operating system and its many applications is the "</div><div class='del'>-#~ "result of collaborative efforts between Mandrakesoft developers and "</div><div class='del'>-#~ "Mandrakelinux contributors throughout the world."</div><div class='add'>+#~ "Your new Mandrivalinux operating system and its many applications is the "</div><div class='add'>+#~ "result of collaborative efforts between Mandriva developers and "</div><div class='add'>+#~ "Mandrivalinux contributors throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Uw nieuwe Mandrakelinux besturingssysteem en haar vele toepassingen zijn "</div><div class='del'>-#~ "het resultaat van samenwerking en inspanningen van Mandrakesoft-"</div><div class='add'>+#~ "Uw nieuwe Mandrivalinux besturingssysteem en haar vele toepassingen zijn "</div><div class='add'>+#~ "het resultaat van samenwerking en inspanningen van Mandriva-"</div><div class='ctx'> #~ "ontwikkelaars en personen vanuit de hele wereld die hebben bijgedragen."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27412,25 +27412,25 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "Bekijk en bewerk afbeeldingen en foto's met &lt;b&gt;GQview&lt;/b&gt; en &lt;b&gt;The Gimp!"</div><div class='ctx'> #~ "&lt;/b&gt;"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Become a &lt;b&gt;Mandrakeclub&lt;/b&gt; member!"</div><div class='del'>-#~ msgstr "Wordt lid van &lt;b&gt;Mandrakeclub&lt;/b&gt;!"</div><div class='add'>+#~ msgid "Become a &lt;b&gt;Mandriva Club&lt;/b&gt; member!"</div><div class='add'>+#~ msgstr "Wordt lid van &lt;b&gt;Mandriva Club&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Take advantage of valuable benefits, products and services by joining "</div><div class='del'>-#~ "Mandrakeclub, such as:"</div><div class='add'>+#~ "Mandriva Club, such as:"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Profiteer van waardevolle voordelen, produkten en diensten door u aan te "</div><div class='del'>-#~ "sluiten bij Mandrakeclub, zoals:"</div><div class='add'>+#~ "sluiten bij Mandriva Club, zoals:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Full access to commercial applications"</div><div class='ctx'> #~ msgstr "\t* Volledige toegang tot commerciële toepassingen"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"</div><div class='del'>-#~ msgstr "\t* Speciale downloadmirror-lijst exclusief voor Mandrakeclub-leden"</div><div class='add'>+#~ "\t* Special download mirror list exclusively for Mandriva Club Members"</div><div class='add'>+#~ msgstr "\t* Speciale downloadmirror-lijst exclusief voor Mandriva Club-leden"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Voting for software to put in Mandrakelinux"</div><div class='del'>-#~ msgstr "\t* Stemmen voor software om bij Mandrakelinux te bundelen"</div><div class='add'>+#~ msgid "\t* Voting for software to put in Mandrivalinux"</div><div class='add'>+#~ msgstr "\t* Stemmen voor software om bij Mandrivalinux te bundelen"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Plus much more"</div><div class='ctx'> #~ msgstr "\t* Plus veel meer"</div><div class='hunk'>@@ -27441,15 +27441,15 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ msgid "Do you require assistance?"</div><div class='ctx'> #~ msgstr "Kunt u assistentie gebruiken?"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt; is the primary source for technical support."</div><div class='add'>+#~ msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt; is the primary source for technical support."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "&lt;b&gt;Mandrakeexpert&lt;/b&gt; is de primaire bron voor technische ondersteuning."</div><div class='add'>+#~ "&lt;b&gt;Mandriva Expert&lt;/b&gt; is de primaire bron voor technische ondersteuning."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "If you have Linux questions, subscribe to Mandrakeexpert at &lt;b&gt;www."</div><div class='add'>+#~ "If you have Linux questions, subscribe to Mandriva Expert at &lt;b&gt;www."</div><div class='ctx'> #~ "mandrakeexpert.com&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Indien u Linuxvragen heeft, meldt u zich dan aan bij Mandrakeexpert op "</div><div class='add'>+#~ "Indien u Linuxvragen heeft, meldt u zich dan aan bij Mandriva Expert op "</div><div class='ctx'> #~ "&lt;b&gt;www.mandrakeexpert.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27467,22 +27467,22 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "op &lt;b&gt;www.mandrakelinux.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "</div><div class='add'>+#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "</div><div class='ctx'> #~ "the latest versions of the most popular Open Source applications."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinux bevat de beroemde grafische werkomgevingen KDE en GNOME, "</div><div class='add'>+#~ "Mandrivalinux bevat de beroemde grafische werkomgevingen KDE en GNOME, "</div><div class='ctx'> #~ "plus de laatste versies van de populairste Open Source-toepassingen."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "</div><div class='add'>+#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "</div><div class='ctx'> #~ "to install and easy to use Linux distribution."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Mandrakelinux is algemeen bekend als de gebruikersvriendelijkste en "</div><div class='add'>+#~ "Mandrivalinux is algemeen bekend als de gebruikersvriendelijkste en "</div><div class='ctx'> #~ "makkelijkst te installeren Linuxdistributie."</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='add'>+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Ontdek Mandrakelinux op een opstartbare CD met &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='add'>+#~ "\t* Ontdek Mandrivalinux op een opstartbare CD met &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "</div><div class='hunk'>@@ -27529,12 +27529,12 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "&lt;b&gt;MandrakeClustering&lt;/b&gt;: the power and speed of a Linux cluster "</div><div class='ctx'> #~ "combined with the stability and easy-of-use of the world-famous "</div><div class='del'>-#~ "Mandrakelinux distribution. A unique blend for incomparable HPC "</div><div class='add'>+#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "</div><div class='ctx'> #~ "performance."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "&lt;b&gt;MandrakeClustering&lt;/b&gt;: de kracht en snelheid van een Linuxcluster "</div><div class='ctx'> #~ "gecombineerd met de stabiliteit en het gebruiksgemak van de "</div><div class='del'>-#~ "wereldberoemde Mandrakelinux-distributie. Een unieke combinatie voor "</div><div class='add'>+#~ "wereldberoemde Mandrivalinux-distributie. Een unieke combinatie voor "</div><div class='ctx'> #~ "onvergelijkbare HPC-prestaties."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27546,14 +27546,14 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "standaard- tot professionele ondersteuning, van 1 to 50 incidenten, kies "</div><div class='ctx'> #~ "datgene dat bij uw wensen past!"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Become a Mandrakeclub member!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Wordt Mandrakeclub-lid!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Become a Mandriva Club member!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Wordt Mandriva Club-lid!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Do you require assistance?&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Kunt u assistentie gebruiken?&lt;/b&gt;"</div><div class='ctx'> </div><div class='del'>-#~ msgid "This is the Mandrakelinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='del'>-#~ msgstr "Dit is de Mandrakelinux &lt;b&gt;Downloadversie&lt;/b&gt;."</div><div class='add'>+#~ msgid "This is the Mandrivalinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='add'>+#~ msgstr "Dit is de Mandrivalinux &lt;b&gt;Downloadversie&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "The free download version does not include commercial software, and "</div><div class='hunk'>@@ -27565,13 +27565,13 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "ADSL en RTC) en videokaarten (zoals ATI® en NVIDIA®)."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux distribution and its many applications are the "</div><div class='del'>-#~ "result of collaborative efforts between Mandrakesoft developers and "</div><div class='del'>-#~ "Mandrakelinux contributors throughout the world."</div><div class='add'>+#~ "Your new Mandrivalinux distribution and its many applications are the "</div><div class='add'>+#~ "result of collaborative efforts between Mandriva developers and "</div><div class='add'>+#~ "Mandrivalinux contributors throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Uw nieuwe Mandrakelinux besturingssysteem en haar vele toepassingen zijn "</div><div class='del'>-#~ "het resultaat van samenwerking en inspanningen van Mandrakesoft-"</div><div class='del'>-#~ "ontwikkelaars en personen vanuit de hele wereld die aan Mandrakelinux "</div><div class='add'>+#~ "Uw nieuwe Mandrivalinux besturingssysteem en haar vele toepassingen zijn "</div><div class='add'>+#~ "het resultaat van samenwerking en inspanningen van Mandriva-"</div><div class='add'>+#~ "ontwikkelaars en personen vanuit de hele wereld die aan Mandrivalinux "</div><div class='ctx'> #~ "hebben bijgedragen."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;PowerPack+&lt;/b&gt;"</div><div class='hunk'>@@ -27588,24 +27588,24 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "servertoepassingen bij zit."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "It is the only Mandrakelinux product that includes the groupware solution."</div><div class='add'>+#~ "It is the only Mandrivalinux product that includes the groupware solution."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Het is het enige Mandrakelinux-produkt dat ene groupware-oplossing bevat."</div><div class='add'>+#~ "Het is het enige Mandrivalinux-produkt dat ene groupware-oplossing bevat."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "When you log into your Mandrakelinux system for the first time, you can "</div><div class='add'>+#~ "When you log into your Mandrivalinux system for the first time, you can "</div><div class='ctx'> #~ "choose between several popular graphical desktops environments, "</div><div class='ctx'> #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Wanneer u zich voor de eerste keer aanmeldt op uw Mandrakelinux-systeem, "</div><div class='add'>+#~ "Wanneer u zich voor de eerste keer aanmeldt op uw Mandrivalinux-systeem, "</div><div class='ctx'> #~ "kunt u kiezen tussen diverse populaire werkomgevingen, waaronder: KDE, "</div><div class='ctx'> #~ "GNOME, WindowMaker, IceWM, en andere."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "</div><div class='add'>+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "</div><div class='ctx'> #~ "of your tasks:"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "In het Mandrakelinux-menu vindt u makkelijk te gebruiken toepassingen "</div><div class='add'>+#~ "In het Mandrivalinux-menu vindt u makkelijk te gebruiken toepassingen "</div><div class='ctx'> #~ "voor alle werkzaamheden:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27651,13 +27651,13 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ msgstr "\t* Adresboek (server en client)"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux distribution is the result of collaborative "</div><div class='del'>-#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "</div><div class='add'>+#~ "Your new Mandrivalinux distribution is the result of collaborative "</div><div class='add'>+#~ "efforts between Mandriva developers and Mandrivalinux contributors "</div><div class='ctx'> #~ "throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Uw nieuwe Mandrakelinux besturingssysteem is het resultaat van "</div><div class='del'>-#~ "samenwerking en inspanningen van Mandrakesoft-ontwikkelaars en personen "</div><div class='del'>-#~ "vanuit de hele wereld die aan Mandrakelinux hebben bijgedragen."</div><div class='add'>+#~ "Uw nieuwe Mandrivalinux besturingssysteem is het resultaat van "</div><div class='add'>+#~ "samenwerking en inspanningen van Mandriva-ontwikkelaars en personen "</div><div class='add'>+#~ "vanuit de hele wereld die aan Mandrivalinux hebben bijgedragen."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "We would like to thank everyone who participated in the development of "</div><div class='hunk'>@@ -27729,13 +27729,13 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Before continuing, you should carefully read the terms of the license. "</div><div class='ctx'> #~ "It\n"</div><div class='del'>-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "</div><div class='add'>+#~ "covers the entire Mandrivalinux distribution. If you do agree with all "</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"</div><div class='ctx'> #~ "will reboot your computer."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Voordat u verdergaat dient u eerst de voorwaarden in de licentie\n"</div><div class='del'>-#~ "aandachtig te lezen. Zij beslaan de gehele Mandrakelinux distributie.\n"</div><div class='add'>+#~ "aandachtig te lezen. Zij beslaan de gehele Mandrivalinux distributie.\n"</div><div class='ctx'> #~ "Indien u akkoord gaat met alle voorwaarden erin kruist u het\n"</div><div class='ctx'> #~ "\"%s\"-vakje aan. Zoniet, dan zal het klikken van de \"%s\"-knop\n"</div><div class='ctx'> #~ "uw computer herstarten."</div><div class='hunk'>@@ -27846,26 +27846,26 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "het kruisje bij het vakje \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+#~ "The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> #~ "selected package is located on another CD-ROM, DrakX will eject the "</div><div class='ctx'> #~ "current\n"</div><div class='ctx'> #~ "CD and ask you to insert the correct CD as required."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "De Mandrakelinux-installatie is verdeeld over meerdere CD-ROMs. Als een \n"</div><div class='add'>+#~ "De Mandrivalinux-installatie is verdeeld over meerdere CD-ROMs. Als een \n"</div><div class='ctx'> #~ "geselecteerd pakket te vinden is op een andere CD-ROM, zal het \n"</div><div class='ctx'> #~ "installatieprogramma de huidige CD uitwerpen en u zonodig vragen om de\n"</div><div class='ctx'> #~ "correcte CD in te leggen."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "It is now time to specify which programs you wish to install on your\n"</div><div class='del'>-#~ "system. There are thousands of packages available for Mandrakelinux, and\n"</div><div class='add'>+#~ "system. There are thousands of packages available for Mandrivalinux, and\n"</div><div class='ctx'> #~ "to make it simpler to manage the packages have been placed into groups "</div><div class='ctx'> #~ "of\n"</div><div class='ctx'> #~ "similar applications.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Packages are sorted into groups corresponding to a particular use of "</div><div class='ctx'> #~ "your\n"</div><div class='del'>-#~ "machine. Mandrakelinux sorts packages groups in four categories. You can\n"</div><div class='add'>+#~ "machine. Mandrivalinux sorts packages groups in four categories. You can\n"</div><div class='ctx'> #~ "mix and match applications from the various categories, so a\n"</div><div class='ctx'> #~ "``Workstation'' installation can still have applications from the\n"</div><div class='ctx'> #~ "``Development'' category installed.\n"</div><div class='hunk'>@@ -27924,7 +27924,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "van vergelijkbare toepassingen geplaatst.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Pakketten zijn samengebracht in groepen die corresponderen met een\n"</div><div class='del'>-#~ "bepaald gebruik van uw computer. Mandrakelinux heeft vier "</div><div class='add'>+#~ "bepaald gebruik van uw computer. Mandrivalinux heeft vier "</div><div class='ctx'> #~ "voorgedefiniëerde\n"</div><div class='ctx'> #~ "installaties beschikbaar. U kunt deze installatieklasses zien als \n"</div><div class='ctx'> #~ "categorieën voor de diverse pakketten. U kunt de toepassingen uit de\n"</div><div class='hunk'>@@ -27995,11 +27995,11 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "chose the individual package or because it was part of a group of "</div><div class='ctx'> #~ "packages,\n"</div><div class='ctx'> #~ "you will be asked to confirm that you really want those servers to be\n"</div><div class='del'>-#~ "installed. By default Mandrakelinux will automatically start any "</div><div class='add'>+#~ "installed. By default Mandrivalinux will automatically start any "</div><div class='ctx'> #~ "installed\n"</div><div class='ctx'> #~ "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> #~ "the time the distribution was shipped, it is entirely possible that that\n"</div><div class='del'>-#~ "security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+#~ "security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> #~ "finalized. If you do not know what a particular service is supposed to "</div><div class='ctx'> #~ "do\n"</div><div class='ctx'> #~ "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"</div><div class='hunk'>@@ -28041,11 +28041,11 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "specifiek gekozen heeft ofwel omdat het onderdeel is van een hele groep\n"</div><div class='ctx'> #~ "pakketten, zal u gevraagd worden om te bevestigen dat u deze servers "</div><div class='ctx'> #~ "echt\n"</div><div class='del'>-#~ "wilt installeren. Onder Mandrakelinux worden alle geïnstalleerde servers\n"</div><div class='add'>+#~ "wilt installeren. Onder Mandrivalinux worden alle geïnstalleerde servers\n"</div><div class='ctx'> #~ "standaard ingeschakeld tijdens het opstarten. Zelfs wanneer zij veilig\n"</div><div class='ctx'> #~ "zijn en geen bekende beveiligingsgebreken hadden op het moment dat de\n"</div><div class='ctx'> #~ "distributie werd uitgebracht, kan het gebeuren dat beveiligingsfouten\n"</div><div class='del'>-#~ "ontdekt worden nadat deze versie van Mandrakelinux afgemaakt werd.\n"</div><div class='add'>+#~ "ontdekt worden nadat deze versie van Mandrivalinux afgemaakt werd.\n"</div><div class='ctx'> #~ "Indien u niet weet wat een bepaalde dienst geacht wordt te doen of "</div><div class='ctx'> #~ "waarom\n"</div><div class='ctx'> #~ "deze geïnstalleerd wordt, klikt u dan \"%s\". Klikken op \"%s\" zal\n"</div><div class='hunk'>@@ -28073,7 +28073,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "You will now set up your Internet/network connection. If you wish to\n"</div><div class='ctx'> #~ "connect your computer to the Internet or to a local network, click \"%s"</div><div class='ctx'> #~ "\".\n"</div><div class='del'>-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"</div><div class='add'>+#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"</div><div class='ctx'> #~ "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"</div><div class='ctx'> #~ "configure the network, or to do it later, in which case clicking the \"%s"</div><div class='ctx'> #~ "\"\n"</div><div class='hunk'>@@ -28094,7 +28094,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "modems\n"</div><div class='ctx'> #~ "that require additional software to work compared to Normal modems. Some "</div><div class='ctx'> #~ "of\n"</div><div class='del'>-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"</div><div class='add'>+#~ "those modems actually work under Mandrivalinux, some others do not. You\n"</div><div class='ctx'> #~ "can consult the list of supported modems at LinModems.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You can consult the ``Starter Guide'' chapter about Internet connections\n"</div><div class='hunk'>@@ -28104,7 +28104,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Het is nu mogelijk om uw internet- of netwerkverbinding in te stellen.\n"</div><div class='ctx'> #~ "Indien u wenst uw computer aan het Internet of aan een lokaal netwerk te\n"</div><div class='del'>-#~ "verbinden, klik dan op \"%s\". Mandrakelinux zal trachten om\n"</div><div class='add'>+#~ "verbinden, klik dan op \"%s\". Mandrivalinux zal trachten om\n"</div><div class='ctx'> #~ "netwerkapparaten en modems automatisch te bespeuren. Als deze bespeuring\n"</div><div class='ctx'> #~ "mislukt, deselecteer dan het \"%s\"-vakje. \n"</div><div class='ctx'> #~ "U kunt ook besluiten het netwerk niet te configureren of het later pas\n"</div><div class='hunk'>@@ -28127,7 +28127,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "eenvoudige modems die extra software vereisen om te kunnen werken, in \n"</div><div class='ctx'> #~ "vergelijking met normale modems. Sommige van deze modems kunnen "</div><div class='ctx'> #~ "functioneren\n"</div><div class='del'>-#~ "onder Mandrakelinux, sommige andere niet. U kunt de lijst van "</div><div class='add'>+#~ "onder Mandrivalinux, sommige andere niet. U kunt de lijst van "</div><div class='ctx'> #~ "ondersteunde\n"</div><div class='ctx'> #~ "modems raadplegen op de LinModems-webpagina.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28262,7 +28262,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "X (for X Window System) is the heart of the GNU/Linux graphical "</div><div class='ctx'> #~ "interface\n"</div><div class='ctx'> #~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-#~ "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You will be presented with a list of different parameters to change to "</div><div class='ctx'> #~ "get\n"</div><div class='hunk'>@@ -28327,7 +28327,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "Linux\n"</div><div class='ctx'> #~ "waarvan alle grafische omgevingen (KDE, GNOME, AfterStep, WindowMaker, "</div><div class='ctx'> #~ "etc.)\n"</div><div class='del'>-#~ "die bij Mandrakelinux worden geleverd, afhankelijk zijn.\n"</div><div class='add'>+#~ "die bij Mandrivalinux worden geleverd, afhankelijk zijn.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "U krijgt een lijst te zien van verschillende parameters die u kunt "</div><div class='ctx'> #~ "aanpassen\n"</div><div class='hunk'>@@ -28462,7 +28462,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "have to partition the drive. Basically, partitioning a hard drive "</div><div class='ctx'> #~ "consists\n"</div><div class='ctx'> #~ "of logically dividing it to create the space needed to install your new\n"</div><div class='del'>-#~ "Mandrakelinux system.\n"</div><div class='add'>+#~ "Mandrivalinux system.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> #~ "and can lead to lost data if there is an existing operating system "</div><div class='hunk'>@@ -28501,7 +28501,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> #~ "data, provided you have previously defragmented the Windows partition.\n"</div><div class='ctx'> #~ "Backing up your data is strongly recommended.. Using this option is\n"</div><div class='del'>-#~ "recommended if you want to use both Mandrakelinux and Microsoft Windows "</div><div class='add'>+#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "</div><div class='ctx'> #~ "on\n"</div><div class='ctx'> #~ "the same computer.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28511,7 +28511,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "Windows to store your data or to install new software.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": if you want to delete all data and all partitions present on\n"</div><div class='del'>-#~ "your hard drive and replace them with your new Mandrakelinux system,\n"</div><div class='add'>+#~ "your hard drive and replace them with your new Mandrivalinux system,\n"</div><div class='ctx'> #~ "choose this option. Be careful, because you will not be able to undo "</div><div class='ctx'> #~ "your\n"</div><div class='ctx'> #~ "choice after you confirm.\n"</div><div class='hunk'>@@ -28536,14 +28536,14 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "refer to the ``Managing Your Partitions'' section in the ``Starter "</div><div class='ctx'> #~ "Guide''."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Op dit punt dient u te kiezen waar op uw harde schijf u uw Mandrakelinux\n"</div><div class='add'>+#~ "Op dit punt dient u te kiezen waar op uw harde schijf u uw Mandrivalinux\n"</div><div class='ctx'> #~ "besturingssysteem wilt installeren. Als uw harde schijf leeg is of als "</div><div class='ctx'> #~ "een\n"</div><div class='ctx'> #~ "ander besturingssysteem alle beschikbare ruimte inneemt, dan zult u\n"</div><div class='ctx'> #~ "de harde schijf moeten partitioneren. Partitioneren houdt in dat u uw "</div><div class='ctx'> #~ "harde\n"</div><div class='ctx'> #~ "schijf in logische stukken onderverdeelt om ruimte te creëren voor uw\n"</div><div class='del'>-#~ "nieuwe Mandrakelinux besturingssysteem.\n"</div><div class='add'>+#~ "nieuwe Mandrivalinux besturingssysteem.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Omdat de effecten van het partitioneringsproces over het algemeen niet\n"</div><div class='ctx'> #~ "terug te draaien zijn en kan leiden tot gegevensverlies als er reeds een\n"</div><div class='hunk'>@@ -28579,7 +28579,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "partitie\n"</div><div class='ctx'> #~ "gedefragmenteerd heeft. Een reservekopie maken van uw gegevens kan\n"</div><div class='ctx'> #~ "bepaald geen kwaad. Deze optie is aanbevolen indien u zowel\n"</div><div class='del'>-#~ "Mandrakelinux als Microsoft Windows op dezelfde computer wilt gebruiken.\n"</div><div class='add'>+#~ "Mandrivalinux als Microsoft Windows op dezelfde computer wilt gebruiken.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "   Laat het goed tot u doordringen, voordat u deze optie kiest, dat uw\n"</div><div class='ctx'> #~ "Microsoft Windows partitie na afloop van deze procedure minder groot\n"</div><div class='hunk'>@@ -28588,7 +28588,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "installeren.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": indien u alle gegevens en alle partities op uw\n"</div><div class='del'>-#~ "harde schijf wilt verwijderen en vervangen door uw nieuwe Mandrakelinux-\n"</div><div class='add'>+#~ "harde schijf wilt verwijderen en vervangen door uw nieuwe Mandrivalinux-\n"</div><div class='ctx'> #~ "systeem, kiest u deze optie. Weest u voorzichtig met deze oplossing omdat "</div><div class='ctx'> #~ "u\n"</div><div class='ctx'> #~ "na bevestiging deze keuze niet meer ongedaan kunt maken.\n"</div><div class='hunk'>@@ -28709,7 +28709,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "Click on \"%s\" when you are ready to format the partitions.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-#~ "Mandrakelinux operating system installation.\n"</div><div class='add'>+#~ "Mandrivalinux operating system installation.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click on \"%s\" if you wish to select partitions that will be checked "</div><div class='ctx'> #~ "for\n"</div><div class='hunk'>@@ -28736,13 +28736,13 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "Klik op \"%s\" wanneer u klaar bent om de partities te formatteren.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Klik op \"%s\" indien u een andere partitie voor uw nieuwe\n"</div><div class='del'>-#~ "Mandrakelinux besturingssysteem wilt kiezen.\n"</div><div class='add'>+#~ "Mandrivalinux besturingssysteem wilt kiezen.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Klik op \"%s\" indien u partities wenst te selecteren die op\n"</div><div class='ctx'> #~ "onleesbare blokken gecontroleerd moeten worden."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "At the time you are installing Mandrakelinux, it is likely that some\n"</div><div class='add'>+#~ "At the time you are installing Mandrivalinux, it is likely that some\n"</div><div class='ctx'> #~ "packages will have been updated since the initial release. Bugs may have\n"</div><div class='ctx'> #~ "been fixed, security issues resolved. To allow you to benefit from these\n"</div><div class='ctx'> #~ "updates, you are now able to download them from the Internet. Check \"%s"</div><div class='hunk'>@@ -28757,7 +28757,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "selected package(s), or \"%s\" to abort."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Op het moment dat u Mandrakelinux installeert, is het waarschijnlijk\n"</div><div class='add'>+#~ "Op het moment dat u Mandrivalinux installeert, is het waarschijnlijk\n"</div><div class='ctx'> #~ "dat sommige pakketten vernieuwd zijn sinds het moment dat het werd\n"</div><div class='ctx'> #~ "uitgebracht. Sommige onvolkomenheden kunnen gerepareerd zijn en\n"</div><div class='ctx'> #~ "beveiligingsproblemen opgelost. Om u te kunnen laten profiteren van\n"</div><div class='hunk'>@@ -28825,7 +28825,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "DrakX now needs to know if you want to perform a new install or an "</div><div class='ctx'> #~ "upgrade\n"</div><div class='del'>-#~ "of an existing Mandrakelinux system:\n"</div><div class='add'>+#~ "of an existing Mandrivalinux system:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": For the most part, this completely wipes out the old system. "</div><div class='ctx'> #~ "If\n"</div><div class='hunk'>@@ -28837,22 +28837,22 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "written.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": this installation class allows you to update the packages\n"</div><div class='del'>-#~ "currently installed on your Mandrakelinux system. Your current\n"</div><div class='add'>+#~ "currently installed on your Mandrivalinux system. Your current\n"</div><div class='ctx'> #~ "partitioning scheme and user data is not altered. Most of other\n"</div><div class='ctx'> #~ "configuration steps remain available, similar to a standard "</div><div class='ctx'> #~ "installation.\n"</div><div class='ctx'> #~ "\n"</div><div class='del'>-#~ "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> #~ "running version \"8.1\" or later. Performing an Upgrade on versions "</div><div class='ctx'> #~ "prior\n"</div><div class='del'>-#~ "to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+#~ "to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Deze stap activeert slechts wanneer een bestaande GNU/Linux-partitie\n"</div><div class='ctx'> #~ "gevonden is op uw computer.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Nu is het noodzakelijk dat u het installatieprogramma informeert of u "</div><div class='ctx'> #~ "een \n"</div><div class='del'>-#~ "nieuwe installatie of een opwaardering van een bestaand Mandrakelinux\n"</div><div class='add'>+#~ "nieuwe installatie of een opwaardering van een bestaand Mandrivalinux\n"</div><div class='ctx'> #~ "systeem wilt uitvoeren:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": Dit verwijdert het oude systeem vrijwel volledig.\n"</div><div class='hunk'>@@ -28862,7 +28862,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "overschreven. Dit is afhankelijk van uw partitioneringsschema.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": deze installatieklasse stelt u in staat de pakketten\n"</div><div class='del'>-#~ "die momenteel op uw Mandrakelinux-systeem zijn geïnstalleerd te "</div><div class='add'>+#~ "die momenteel op uw Mandrivalinux-systeem zijn geïnstalleerd te "</div><div class='ctx'> #~ "verversen.\n"</div><div class='ctx'> #~ "Uw huidige partitioneringsschema en gebruikersgegevens worden niet "</div><div class='ctx'> #~ "veranderd.\n"</div><div class='hunk'>@@ -28870,8 +28870,8 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "gewone installatie.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Het gebruik van de ``Opwaardering''-optie zou prima moeten werken op\n"</div><div class='del'>-#~ "Mandrakelinux versie \"8.1\" of recenter. Het uitvoeren van een\n"</div><div class='del'>-#~ "opwaardering op versies eerder dan Mandrakelinux versie \"8.1\" is "</div><div class='add'>+#~ "Mandrivalinux versie \"8.1\" of recenter. Het uitvoeren van een\n"</div><div class='add'>+#~ "opwaardering op versies eerder dan Mandrivalinux versie \"8.1\" is "</div><div class='ctx'> #~ "afgeraden."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -28938,7 +28938,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "About UTF-8 (unicode) support: Unicode is a new character encoding meant "</div><div class='ctx'> #~ "to\n"</div><div class='ctx'> #~ "cover all existing languages. Though full support for it in GNU/Linux is\n"</div><div class='del'>-#~ "still under development. For that reason, Mandrakelinux will be using it\n"</div><div class='add'>+#~ "still under development. For that reason, Mandrivalinux will be using it\n"</div><div class='ctx'> #~ "or not depending on the user choices:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * If you choose a languages with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -28984,7 +28984,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "Over UTF-8 (unicode)-ondersteuning: Unicode is een nieuwe tekencodering\n"</div><div class='ctx'> #~ "bedoeld om alle bestaande geschreven talen te omvatten. Volledige\n"</div><div class='ctx'> #~ "GNU/Linux-ondersteuning ervoor is echter nog in ontwikkeling.\n"</div><div class='del'>-#~ "Daarom gebruikt Mandrakelinux het al dan niet, afhankelijk van de keuze\n"</div><div class='add'>+#~ "Daarom gebruikt Mandrivalinux het al dan niet, afhankelijk van de keuze\n"</div><div class='ctx'> #~ "van de gebruiker:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * Indien u talen kiest met een sterke coderingstraditie (latin1\n"</div><div class='hunk'>@@ -29224,7 +29224,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "checking this box.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"</div><div class='del'>-#~ "\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"</div><div class='add'>+#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"</div><div class='ctx'> #~ "system! Be sure you know what you are doing before changing any of the\n"</div><div class='ctx'> #~ "options. !!\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -29266,7 +29266,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "!! Let op dat indien u geen opstartlader installeert (door hier \n"</div><div class='ctx'> #~ "\"%s\" te kiezen) u ervoor moet zorgen dat u een manier heeft om\n"</div><div class='del'>-#~ "uw Mandrakelinux-systeem op te starten! Zorg ervoor dat u weet wat u "</div><div class='add'>+#~ "uw Mandrivalinux-systeem op te starten! Zorg ervoor dat u weet wat u "</div><div class='ctx'> #~ "doet\n"</div><div class='ctx'> #~ "voordat u één van de opties wijzigt. !!\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -29364,7 +29364,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Now, it's time to select a printing system for your computer. Other OSs "</div><div class='ctx'> #~ "may\n"</div><div class='del'>-#~ "offer you one, but Mandrakelinux offers two. Each of the printing "</div><div class='add'>+#~ "offer you one, but Mandrivalinux offers two. Each of the printing "</div><div class='ctx'> #~ "systems\n"</div><div class='ctx'> #~ "is best suited to particular types of configuration.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -29400,7 +29400,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "Center and clicking the expert button."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Het is nu tijd een afdruksysteem voor uw computer te selecteren. Andere\n"</div><div class='del'>-#~ "besturingssystemen geven u er wellicht maar één, maar Mandrakelinux\n"</div><div class='add'>+#~ "besturingssystemen geven u er wellicht maar één, maar Mandrivalinux\n"</div><div class='ctx'> #~ "biedt er twee. Elk van deze afdruksystemen is het meest geschikt voor\n"</div><div class='ctx'> #~ "bepaalde typen configuraties.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -29935,10 +29935,10 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "vereenvoudigen."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='add'>+#~ "Find all Mandriva products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='ctx'> #~ "our full service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "U kunt alle Mandrakesoft-produkten en diensten vinden op "</div><div class='add'>+#~ "U kunt alle Mandriva-produkten en diensten vinden op "</div><div class='ctx'> #~ "&lt;b&gt;MandrakeStore&lt;/b&gt; -- ons uitgebreide service e-commerce-platform."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "Become a &lt;b&gt;MandrakeClub&lt;/b&gt; member!"</div><div class='hunk'>@@ -29958,25 +29958,25 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ msgid "\t* Special discounts for products and services at MandrakeStore"</div><div class='ctx'> #~ msgstr "\t* Speciale kortingen voor produkten en diensten bij MandrakeStore"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with &lt;b&gt;MandrakeMove&lt;/b&gt;"</div><div class='add'>+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with &lt;b&gt;Mandriva Move&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Ontdek Mandrakelinux op een opstartbare CD met &lt;b&gt;MandrakeMove&lt;/b&gt;"</div><div class='add'>+#~ "\t* Ontdek Mandrivalinux op een opstartbare CD met &lt;b&gt;Mandriva Move&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products at &lt;b&gt;MandrakeStore&lt;/b&gt; -- our full "</div><div class='add'>+#~ "Find all Mandriva products at &lt;b&gt;MandrakeStore&lt;/b&gt; -- our full "</div><div class='ctx'> #~ "service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Alle Mandrakesoft-produkten zijn te vinden op &lt;b&gt;MandrakeStore&lt;/b&gt; -- ons "</div><div class='add'>+#~ "Alle Mandriva-produkten zijn te vinden op &lt;b&gt;MandrakeStore&lt;/b&gt; -- ons "</div><div class='ctx'> #~ "uitgebreide service/e-commerce platform."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Become a MandrakeClub member!&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Wordt MandrakeClub-lid!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "</div><div class='add'>+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "</div><div class='ctx'> #~ "tasks:"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "In het Mandrakelinux-menu vindt u makkelijk te gebruiken toepassingen "</div><div class='add'>+#~ "In het Mandrivalinux-menu vindt u makkelijk te gebruiken toepassingen "</div><div class='ctx'> #~ "voor alle werkzaamheden:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -30014,8 +30014,8 @@ msgstr "Installatie mislukt"</div><div class='ctx'> #~ "  --report          - moet een mandrake-hulpprogramma zijn\n"</div><div class='ctx'> #~ "  --incident        - moet een mandrake-hulpprogramma zijn"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "This interface has not been configured yet.\n"</div><div class='hunk'>@@ -30142,7 +30142,7 @@ msgstr "Installatie mislukt"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Take advantage of valuable benefits, products and services by joining "</div><div class='del'>-#~ "Mandrake Club, such as:"</div><div class='add'>+#~ "Mandriva Club, such as:"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Profiteer van waardevolle voordelen, produkten en diensten door u aan te "</div><div class='ctx'> #~ "sluiten bij MandrakeClub, zoals:"</div><div class='head'>diff --git a/perl-install/share/po/nn.po b/perl-install/share/po/nn.po<br/>index d11ec5f7d..4e6df334a 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/nn.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/nn.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/nn.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/nn.po</a></div><div class='hunk'>@@ -69,7 +69,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB-nøkkelen er skriveverna, men du kan ikkje sikkert fjerna han no.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -93,7 +93,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB-nøkkelen inneheld ikkje ein Windows-partisjon (FAT-partisjon).\n"</div><div class='hunk'>@@ -109,7 +109,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -117,7 +117,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Fann ikkje USB-nøkkel på systemet. Viss du set inn\n"</div><div class='hunk'>@@ -250,7 +250,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1296,7 +1296,7 @@ msgstr "Språkval"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3695,7 +3695,7 @@ msgstr "Bruk radiostøtte"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3891,7 +3891,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3906,11 +3906,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4065,10 +4065,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4242,7 +4242,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4414,12 +4414,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4446,7 +4446,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4455,7 +4455,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4685,7 +4685,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4721,7 +4721,7 @@ msgstr "Førre"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4765,7 +4765,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4792,7 +4792,7 @@ msgstr "Tryggleiksansvarleg"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4943,7 +4943,7 @@ msgstr "Byt mellom normal- og ekspertmodus"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5014,7 +5014,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5023,13 +5023,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -5086,7 +5086,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5245,7 +5245,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5266,7 +5266,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5369,7 +5369,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5386,7 +5386,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5448,7 +5448,7 @@ msgstr "Tenester"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vel harddisken du ønskjer å sletta for å installera den nye Mandriva Linux-\n"</div><div class='hunk'>@@ -5806,7 +5806,7 @@ msgstr "Reknar ut storleik på Windows-partisjon"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Windows-partisjonen for fragmentert. Start maskina på nytt under Windows, og "</div><div class='hunk'>@@ -5926,19 +5926,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5960,7 +5960,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5968,14 +5968,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5985,7 +5985,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6005,10 +6005,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6019,11 +6019,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6039,7 +6039,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -6103,7 +6103,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6111,7 +6111,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gratulerer! Installeringa er fullført.\n"</div><div class='ctx'> "Fjern oppstartsmediet, og trykk «Enter» for å starta maskina på nytt.\n"</div><div class='hunk'>@@ -6160,7 +6160,7 @@ msgstr "Køyrer steg «%s»\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -6702,7 +6702,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr "Kontaktar Mandriva Linux-nettstaden for oversikt over speglar ..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6927,7 +6927,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr "Mandriva Linux-installering %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -9514,7 +9514,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13529,7 +13529,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15390,18 +15390,18 @@ msgstr "Stopp"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Kva er Mandriva Linux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "Velkommen til &lt;b&gt;Mandriva Linux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15413,7 +15413,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mandriva Linux er den mest &lt;b&gt;brukarvenlege&lt;/b&gt; Linux-distribusjonen "</div><div class='hunk'>@@ -15433,9 +15433,9 @@ msgstr "Velkommen til &lt;b&gt;open kjeldekode-verda&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15456,7 +15456,7 @@ msgstr "&lt;b&gt;GPL-lisensen&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dei fleste programma i distribusjonen, samt alle Mandriva Linux-verktøya er "</div><div class='ctx'> "lisensiert under &lt;b&gt;GNU General Public License&lt;/b&gt;."</div><div class='hunk'>@@ -15484,10 +15484,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15506,8 +15506,8 @@ msgstr "&lt;b&gt;Nedlastingsversjon&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15536,7 +15536,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15546,7 +15546,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15565,13 +15565,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15583,7 +15583,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15597,19 +15597,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Mandriva-produkt&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr "Mandriva Linux-produkta er:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -15630,61 +15630,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15722,7 +15722,7 @@ msgstr "&lt;b&gt;Vel grafisk skrivebordsmiljø&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15743,7 +15743,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15862,7 +15862,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16100,14 +16100,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Mandriva Linux-kontrollsenter&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16129,9 +16129,9 @@ msgstr "&lt;b&gt;Open kjeldekode-modellen&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16143,7 +16143,7 @@ msgstr "&lt;b&gt;Nettbutikk&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Du finn alle Mandriva-produkta og -tenestene på &lt;b&gt;e-handelsplattforma&lt;/b&gt; "</div><div class='hunk'>@@ -16168,20 +16168,20 @@ msgstr "Stikk innom &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; i dag!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Mandriva-klubben&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16200,33 +16200,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr "\t– Delta i &lt;b&gt;brukarforum&lt;/b&gt; for Mandriva Linux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16251,32 +16251,32 @@ msgstr "\t– Fleksible &lt;b&gt;oppdateringsplanar&lt;/b&gt; updates."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16569,7 +16569,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "Mandriva-vegvisarar"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -16665,7 +16665,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16713,7 +16713,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -19256,12 +19256,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Feilrapporteringsverktøy for Mandriva Linux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "Kontrollsenter"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -19282,7 +19282,7 @@ msgstr "Maskinvareoppsett"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -19327,7 +19327,7 @@ msgstr "Oppsettvegvisarar"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19738,7 +19738,7 @@ msgstr "Starta ved oppstart"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Grensesnittet er ikkje sett opp enno.\n"</div><div class='ctx'> "Køyr «Legg til grensesnitt»-vegvisaren i kontrollsenteret."</div><div class='hunk'>@@ -19747,7 +19747,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Du har ikkje sett opp noko Internett-samband.\n"</div><div class='ctx'> "Køyr «%s»-vegvisaren i Mandriva Linux-kontrollsenteret."</div><div class='hunk'>@@ -19800,7 +19800,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -20085,7 +20085,7 @@ msgstr "Importer"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20543,7 +20543,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -20570,7 +20570,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Mandriva Linux-hjelpesenter"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -23557,7 +23557,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Loggverktøy for Mandriva Linux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -24074,7 +24074,7 @@ msgstr "Har kopla til."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Feil ved tilkopling.\n"</div><div class='ctx'> "Sjå etter at oppsett er rett i kontrollsenteret."</div><div class='head'>diff --git a/perl-install/share/po/pa_IN.po b/perl-install/share/po/pa_IN.po<br/>index 1f5b62b18..c9cc5e23a 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/pa_IN.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/pa_IN.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/pa_IN.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/pa_IN.po</a></div><div class='hunk'>@@ -66,7 +66,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB ਕੁੰਜੀ ਲਿਖਣ ਯੋਗ ਨਹੀਂ ਹੈ, ਪਰ ਅਸੀਂ ਇਸ ਨੂੰ ਲਾ ਨਹੀਂ \n"</div><div class='ctx'> "ਸਕਦੇ।\n"</div><div class='hunk'>@@ -91,7 +91,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਤੁਹਾਡੀ USB ਕੁੰਜੀ ਕੋਲ ਯੋਗ Windows (FAT) ਭਾਗ ਨਹੀਂ ਹੈ।\n"</div><div class='hunk'>@@ -102,14 +102,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "ਤੁਸੀਂ USB ਕੁੰਜੀ ਤੋਂ ਬਿਨਾ ਜਾਰੀ ਕਰ ਸਕਦੇ ਹੋ - ਤੁਸੀਂ ਹਾਲੇ ਵੀ \n"</div><div class='del'>-"Mandrake Move ਨੂੰ ਸਧਾਰਨ ਲਾਈਵ ਮੈਂਡਰਿਕ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ \n"</div><div class='add'>+"Mandriva Move ਨੂੰ ਸਧਾਰਨ ਲਾਈਵ ਮੈਂਡਰਿਕ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ \n"</div><div class='ctx'> "ਤੌਰ ਤੇ ਵਰਤਣ ਦੇ ਯੋਗ ਹੋ।"</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -117,11 +117,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਸਾਨੂੰ ਕੋਈ USB ਕੁੰਜੀ ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਨਹੀਂ ਲੱਭੀ। ਜੇ ਤੁਸੀਂ\n"</div><div class='del'>-"USB ਕੁੰਜੀ ਹੁਣ ਜੋੜ ਦਿੱਤੀ, Mandrake Move ਤੁਹਾਡੀ ਘਰ \n"</div><div class='add'>+"USB ਕੁੰਜੀ ਹੁਣ ਜੋੜ ਦਿੱਤੀ, Mandriva Move ਤੁਹਾਡੀ ਘਰ \n"</div><div class='ctx'> "ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਡਾਟਾ ਪਾਰਦਰਸ਼ੀ ਹੀ ਸੰਭਾਲਣ ਦੇ ਯੋਗ ਹੈ ਅਤੇ \n"</div><div class='ctx'> "ਇਸ ਕੰਪਿਊਟਰ ਜਾ ਹੋਰ ਨੂੰ ਅਗਲੀ ਵਾਰ ਬੂਟ ਕਰਨ ਲਈ ਸਿਸਟਮ \n"</div><div class='ctx'> "ਲਈ ਸੰਰਚਨਾ। ਸੂਚਨਾ: ਜੇ ਤੁਸੀਂ ਹੁਣ ਕੁੰਜੀ ਜੋੜੀ, ਫਿਰ ਖੋਜ ਲਈ ਕੁਝ\n"</div><div class='hunk'>@@ -129,7 +129,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "ਤੁਸੀਂ USB ਕੁੰਜੀ ਤੋਂ ਬਿਨਾ ਜਾਰੀ ਕਰ ਸਕਦੇ ਹੋ - ਤੁਸੀਂ ਹਾਲੇ ਵੀ \n"</div><div class='del'>-"Mandrake Move ਨੂੰ ਸਧਾਰਨ ਲਾਈਵ ਮੈਂਡਰਿਕ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ \n"</div><div class='add'>+"Mandriva Move ਨੂੰ ਸਧਾਰਨ ਲਾਈਵ ਮੈਂਡਰਿਕ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ \n"</div><div class='ctx'> "ਤੌਰ ਤੇ ਵਰਤਣ ਦੇ ਯੋਗ ਹੋ।"</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -255,7 +255,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1300,7 +1300,7 @@ msgstr "ਬੋਲੀ ਚੋਣ"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3687,7 +3687,7 @@ msgstr "ਰੇਡੀਓ ਸਹਿਯੋਗ ਯੋਗ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3801,7 +3801,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3817,11 +3817,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3928,10 +3928,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4044,7 +4044,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4162,12 +4162,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4194,7 +4194,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4203,7 +4203,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4332,7 +4332,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4350,7 +4350,7 @@ msgstr "ਪਿੱਛੇ"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4379,7 +4379,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4395,7 +4395,7 @@ msgstr "ਸੁਰੱਖਿਆ ਪ੍ਰਬੰਧਕ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4481,7 +4481,7 @@ msgstr "ਸਧਾਰਨ/ਮਾਹਿਰ ਵਿਧੀ ਵਿਚਕਾਰ ਤਬ�</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4529,7 +4529,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4538,13 +4538,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4585,7 +4585,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4744,7 +4744,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4765,7 +4765,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4868,7 +4868,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4885,7 +4885,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4947,7 +4947,7 @@ msgstr "ਸੇਵਾਵਾਂ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਤੁਹਾਡਾ ਨਵਾਂ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਭਾਗ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸਾਫ ਕਰਨ ਵਾਸਤੇ\n"</div><div class='hunk'>@@ -5290,7 +5290,7 @@ msgstr "Windows ਭਾਗ ਦਾ ਅਕਾਰ ਪਤਾ ਕਰ ਰਿਹਾ ਹ�</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਤੁਹਾਡਾ Windows ਭਾਗ ਬਹੁਤ ਫਰੈਗਮਿੰਟਡ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਕੰਪਿਊਟਰ Windows ਅਧੀਨ ਮੁੜ ਚਲਾਓ, "</div><div class='hunk'>@@ -5398,19 +5398,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5432,7 +5432,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5440,14 +5440,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5457,7 +5457,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5477,10 +5477,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5491,11 +5491,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5511,7 +5511,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5573,7 +5573,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5581,7 +5581,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5616,7 +5616,7 @@ msgstr "ਪਗ਼ `%s' ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -6146,7 +6146,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr "ਉਪਲੱਬਧ ਪ੍ਰਤੀਬਿੰਬਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਲਈ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵੈਬ ਸਾਈਟ ਨਾਲ ਸੰਪਰਕ ਜਾਰੀ ਹੈ..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6364,7 +6364,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਇੰਸਟਾਲੇਸ਼ਨ %s "</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -8950,7 +8950,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12780,7 +12780,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14605,18 +14605,18 @@ msgstr "ਰੋਕੋ"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੀ ਹੈ?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "&lt;b&gt;ਮੈਂਡਰਿਕ-ਲੀਨਕਸ&lt;/b&gt; ਵੱਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14628,7 +14628,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਅੱਜ ਇੱਕ &lt;b&gt;ਉਪਭੋਗੀ-ਮਿੱਤਰ&lt;/b&gt; ਲੀਨਕਸ ਵੰਡ ਹੈ। ਇਹ &lt;b&gt;ਜਿਆਦਾ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ&lt;/"</div><div class='hunk'>@@ -14647,9 +14647,9 @@ msgstr "&lt;b&gt;ਮੁਕਤ ਸਰੋਤ ਦੀ ਦੁਨੀਆਂ&lt;/b&gt; ਵੱਲੋ�</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14669,7 +14669,7 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਬਹੁਤੇ ਸਾਫਟਵੇਅਰ ਵੰਢ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹਨ ਅਤੇ ਸਭ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸੰਦ &lt;b&gt;ਜਨਰਲ ਪਬਲਿਕ ਲਾਈਸਿੰਸ&lt;/b&gt; "</div><div class='ctx'> "ਅਧੀਨ ਲਾਈਸਿੰਸੀ ਹਨ।"</div><div class='hunk'>@@ -14701,10 +14701,10 @@ msgstr "&lt;b&gt;ਸੰਗਠਨ ਨਾਲ ਜੁੜੋ&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14726,8 +14726,8 @@ msgstr "&lt;b&gt;ਵਰਜ਼ਨ ਡਾਊਨਲੋਡ&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਤੁਸੀਂ ਹੁਣ &lt;b&gt;ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਡਾਊਨਲੋਡ&lt;/b&gt; ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ। ਇਹ ਮੁਕਤ ਵਰਜ਼ਨ ਹੈ ਜੋ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ "</div><div class='ctx'> "ਨੇ &lt;b&gt;ਹਰੇਕ ਨੂੰ ਉਪਲੱਬਧ&lt;/b&gt; ਕੀਤਾ ਹੈ।"</div><div class='hunk'>@@ -14759,7 +14759,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਤੁਹਾਨੂੰ ਹੋਰ ਮੈਂਡਰਿਕ-ਸਾਫਟ ਉਤਪਾਦ ਵਿੱਚ &lt;b&gt;ਸ਼ਾਮਿਲ ਸੇਵਾਵਾਂ&lt;/b&gt; ਵਰਤਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੋਵੇਗੀ।"</div><div class='ctx'> </div><div class='hunk'>@@ -14770,7 +14770,7 @@ msgstr "&lt;b&gt;ਖੋਜ, ਤੁਹਾਡਾ ਪਹਿਲਾ ਲੀਨਕਸ ਵਿ�</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr "ਤੁਸੀਂ ਹੁਣ &lt;b&gt;ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਖੋਜ&lt;/b&gt; ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14789,13 +14789,13 @@ msgstr "&lt;b&gt;PowerPack, ਮੁਢਲਾ ਲੀਨਕਸ ਵਿਹੜਾ&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr "ਤੁਸੀਂ ਹੁਣ &lt;b&gt;ਮੈਂਡਰਿਕ-ਲੀਨਕਸ PowerPack&lt;/b&gt; ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14809,7 +14809,7 @@ msgstr "&lt;b&gt;PowerPack+, ਵਿਹੜੇ ਅਤੇ ਸਰਵਰਾਂ ਲਈ ਲ�</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr "ਤੁਸੀਂ ਹੁਣ &lt;b&gt;ਮੈਂਡਰਿਕ-ਲੀਨਕਸ PowerPack+&lt;/b&gt; ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14823,19 +14823,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ਮੈਂਡਰਿਕ-ਸਾਫਟ ਉਤਪਾਦ&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr "&lt;b&gt;ਮੈਂਡਰਿਕ-ਸਾਫਟ&lt;/b&gt; ਨੇ ਬਹੁਤ ਸਾਰੇ &lt;b&gt;ਮੈਂਡਰਿਕ-ਲੀਨਕਸ&lt;/b&gt; ਉਤਪਾਦਾਂ ਦਾ ਵਿਕਾਸ ਕੀਤਾ।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ 10.1 ਦੇ ਉਤਪਾਦ ਹਨ:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14856,7 +14856,7 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, ਵਿਹੜੇ ਅਤੇ ਸਰਵਰਾਂ ਲ�</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;x86-64 ਲਈ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ 10.1&lt;/b&gt;, ਤੁਹਾਡੇ ਬਹੁਤੇ 64-ਬਿੱਟ ਪਰੋਸੈੱਸਰਾਂ ਲਈ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ "</div><div class='hunk'>@@ -14864,13 +14864,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ਮੈਂਡਰਿਕ-ਸਾਫਟ ਉਤਪਾਦ (Nomad ਉਤਪਾਦ)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਮੈਂਡਰਿਕ-ਸਾਫਟ ਨੇ ਦੋ ਉਤਪਾਦਾਂ ਦਾ ਵਿਕਾਸ ਕੀਤਾ ਹੈ ਤੁਹਾਨੂੰ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਨੂੰ &lt;b&gt;ਕਿਸੇ ਕੰਪਿਊਟਰ ਤੇ&lt;/b&gt; "</div><div class='hunk'>@@ -14879,7 +14879,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;ਲਿਜਾਓ&lt;/b&gt;, ਇੱਕ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵੰਡ ਜੋ ਪੂਰੀ ਤਰਾਂ ਬੂਟ ਹੋਣ ਯੋਗ CD-ROM ਤੋਂ ਚੱਲਦੀ ਹੈ।"</div><div class='hunk'>@@ -14887,7 +14887,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, ਇੱਕ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵੰਡ ਜੋ ultra-compact “LaCie ਮੋਬਾਈਲ ਹਾਰਡ "</div><div class='hunk'>@@ -14895,29 +14895,29 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ਮੈਂਡਰਿਕ-ਸਾਫਟ ਉਤਪਾਦ (ਪੇਸ਼ੇਵਰ ਹੱਲ)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr "ਹੇਠਾਂ &lt;b&gt;ਪੇਸ਼ੇਵਰ ਲੋੜਾਂ&lt;/b&gt; ਦੀ ਪੂਰਤੀ ਲਈ ਬਣਾਏ ਉਤਪਾਦ ਹਨ:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr "\t* &lt;b&gt;ਸਹਿਕਾਰੀ ਵਿਹੜਾ&lt;/b&gt;, ਕਿੱਤੇ ਲਈ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵਿਹੜਾ।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr "\t* &lt;b&gt;ਸਹਿਕਾਰੀ ਸਰਵਰ&lt;/b&gt;, ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਰਵਰ ਹੱਲ।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr "\t* &lt;b&gt;ਬਹੁ-ਨੈੱਟਵਰਕ ਫਾਇਰਵਾਲ&lt;/b&gt;, ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸੁਰੱਖਿਆ ਹੱਲ।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14961,7 +14961,7 @@ msgstr "&lt;b&gt;ਆਪਣਾ ਪਿਆਰਾ ਵਿਹੜਾ ਵਾਤਾਵਰਨ �</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PowerPack ਨਾਲ, ਤੁਹਾਡੇ ਕੋਲ &lt;b&gt;ਗਰਾਫੀਕਲ ਵਿਹੜਾ ਵਾਤਾਵਰਨ&lt;/b&gt; ਦੀ ਚੋਣ ਹੈ। ਮੈਂਡਰਿਕ-ਸਾਫਟ ਨੇ "</div><div class='ctx'> "&lt;b&gt;ਕੇ ਡੀ ਈ&lt;/b&gt; ਨੂੰ ਮੂਲ ਚੁਣਿਆ ਹੈ।"</div><div class='hunk'>@@ -14988,7 +14988,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PowerPack+ ਨਾਲ, ਤੁਹਾਡੇ ਕੋਲ &lt;b&gt;ਗਰਾਫੀਕਲ ਵਿਹੜਾ ਵਾਤਾਵਰਨ&lt;/b&gt; ਦੀ ਚੋਣ ਹੋਵੇਗੀ। ਮੈਂਡਰਿਕ-ਸਾਫਟ "</div><div class='ctx'> "ਨੇ &lt;b&gt;ਕੇ ਡੀ ਈ&lt;/b&gt; ਮੂਲ ਤੌਰ ਤੇ ਚੁਣਿਆ ਹੈ।"</div><div class='hunk'>@@ -15113,7 +15113,7 @@ msgstr "&lt;b&gt;ਕਈ ਕਾਰਜਾਂ ਦਾ ਆਨੰਦ ਮਾਣੋ&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਮੇਨੂ ਵਿੱਚ ਤੁਸੀਂ &lt;b&gt;ਆਪਣੇ ਸਭ ਕਾਰਜਾਂ&lt;/b&gt; ਲਈ &lt;b&gt;ਵਰਤਣ-ਲਈ-ਸੌਖੇ&lt;/b&gt; ਕਾਰਜ ਵੇਖੋਗੇ:"</div><div class='hunk'>@@ -15367,14 +15367,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "&lt;b&gt;ਮੈਂਡਰਿਕਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ&lt;/b&gt; ਮੈਂਡਰਿਕਲੀਨਕਸ-ਖਾਸ ਸਹੂਲਤਾਂ ਦਾ ਸਮੂਹ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਤੁਹਾਡੇ "</div><div class='hunk'>@@ -15398,9 +15398,9 @@ msgstr "&lt;b&gt;ਮੁਕਤ ਸਰੋਤ ਮਾਡਲ&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15412,7 +15412,7 @@ msgstr "&lt;b&gt;ਆਨਲਾਈਨ ਭੰਡਾਰ&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr "ਮੈਂਡਰਿਕ-ਸਾਫਟ ਅਤੇ ਸੇਵਾਵਾਂ ਬਾਰੇ ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਸਾਡਾ &lt;b&gt;ਈ-ਕਮਰਸ ਪਲੇਟਫਾਰਮ&lt;/b&gt; ਵੇਖੋ"</div><div class='ctx'> </div><div class='hunk'>@@ -15435,20 +15435,20 @@ msgstr "ਅੱਜ &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; ਤੇ ਰੁਕੋ!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ਮੈਂਡਰਿਕ-ਕਲੱਬ&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr "&lt;b&gt;ਮੈਂਡਰਿਕ-ਕਲੱਬ&lt;/b&gt; ਤੁਹਾਡੇ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਉਤਪਾਦ ਲਈ ਇੱਕ &lt;b&gt;ਸੰਪੂਰਣ ਸਾਥੀ&lt;/b&gt; ਹੈ.."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr "ਮੈਂਡਰਿਕ-ਕਲੱਬ ਨਾਲ ਜੁੜ ਕੇ &lt;b&gt;ਯੋਗ ਫਾਇਦਿਆਂ&lt;/b&gt; ਦਾ ਲਾਭ ਲਵੋ, ਜਿਵੇਂ:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15469,27 +15469,27 @@ msgstr "\t* &lt;b&gt;ਵਪਾਰਿਕ ਕਾਰਜਾਂ&lt;/b&gt; ਨੂੰ ਪਹੁੰ�</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr "\t* ਮੈਂਡਰਿਕ-ਲੀਨਕਸ &lt;b&gt;ਉਪਭੋਗੀ ਲੋਕ-ਚਰਚਾ-ਸਥਾਨ&lt;/b&gt; ਵਿੱਚ ਸਹਿਯੋਗ।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* ਪਬਲਿਕ ਜਾਰੀ ਤੋਂ ਪਹਿਲਾਂ, ਮੈਂਡਰਿਕ-ਲੀਨਕਸ &lt;b&gt;ISO ਪ੍ਰਤੀਬਿੰਬ&lt;/b&gt; ਨੂੰ, &lt;b&gt;ਪਹਿਲੀ ਅਤੇ ਮਨਜੂਰ "</div><div class='ctx'> "ਪਹੁੰਚ&lt;/b&gt;।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ਮੈਂਡਰਿਕ-ਆਨਲਾਈਨ&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "&lt;b&gt;ਮੈਂਡਰਿਕ-ਆਨਲਾਈਨ&lt;/b&gt; ਇੱਕ ਨਵੀਂ ਲਾਭਅੰਸ਼ ਸੇਵਾ ਹੈ ਜਿਸ ਨੂੰ ਮੈਂਡਰਿਕ-ਸਾਫਟ ਆਪਣੇ ਗਾਹਕਾਂ ਨੂੰ ਮੁਹੱਈਆ ਕਰਨ "</div><div class='hunk'>@@ -15498,8 +15498,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਤੁਹਾਡੇ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਿਸਟਮ &lt;b&gt;ਸੌਖੇ ਨਵਿਨੀਕਰਨ&lt;/b&gt; ਲਈ ਬਹੁਤ ਸਾਰੀਆਂ ਸੇਵਾਵਾਂ "</div><div class='ctx'> "ਮੁਹੱਈਆ ਕਰਦਾ ਹੈ:"</div><div class='hunk'>@@ -15524,18 +15524,18 @@ msgstr "\t* ਲਚਕਦਾਰ &lt;b&gt;ਕ੍ਰਮਬੱਧ&lt;/b&gt; ਨਵਿਨੀਕ�</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr "\t* ਇੱਕ ਖਾਤੇ ਨਾਲ &lt;b&gt;ਤੁਹਾਡੇ ਸਭ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਿਸਟਮਾਂ&lt;/b&gt; ਦਾ ਪ੍ਰਬੰਧਨ।"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;ਮੈਂਡਰਿਕ-ਮਾਹਿਰ&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਕੀ ਤੁਹਾਨੂੰ &lt;b&gt;ਸਹਾਇਕ?&lt;/b&gt; ਦੀ ਲੋੜ ਹੈ, &lt;b&gt;ਸਾਡੇ ਤਕਨੀਕੀ ਸਹਿਯੋਗ ਪਲੇਟਫਾਰਮ&lt;/b&gt; www."</div><div class='hunk'>@@ -15544,7 +15544,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "&lt;b&gt;ਸਿੱਖਿਅਤ ਮੈਡਰਿਕ-ਲੀਨਕਸ ਮਾਹਿਰ&lt;/b&gt; ਦੀ ਸਹਾਇਤਾ ਲਈ ਧੰਨਵਾਦ, ਤੁਸੀਂ ਸਮੇਂ ਦੀ ਬਚਤ ਕੀਤੀ।"</div><div class='hunk'>@@ -15552,7 +15552,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਨਾਲ ਸੰਬੰਧਿਤ ਕਿਸੇ ਪ੍ਰਸ਼ਨ ਲਈ, ਤੁਹਾਡੇ ਕੋਲ &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; ਤੇ "</div><div class='hunk'>@@ -15849,7 +15849,7 @@ msgstr "ਪ੍ਰਬੰਧਨ ਸੰਦ, ਕਾਰਜ ਅਕਾਊਂਟਿੰ�</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "ਮੈਂਡਰਿਕ-ਸਾਫਟ ਤਖਤੀ"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -15951,7 +15951,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16011,7 +16011,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -18600,12 +18600,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਬੱਗ ਰਿਪੋਰਟ ਸੰਦ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -18626,7 +18626,7 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr "ਮੈਂਡਰਿਕ-ਆਨਲਾਈਨ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -18671,7 +18671,7 @@ msgstr "ਸੰਰਚਨਾ ਤਖਤੀ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr "ਮੈਂਡਰਿਕ-ਸਾਫਟ ਸੰਦ ਚੁਣੋ:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19090,7 +19090,7 @@ msgstr "ਬੂਟ ਦੌਰਾਨ ਚਲਾਓ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਹਾਲੇ ਕੋਈ ਵੀ ਇੰਟਰਫੇਸ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।\n"</div><div class='ctx'> "ਮੈਂਡਰਿਕਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ \"ਇੰਟਰਫੇਸ ਸ਼ਾਮਲ\" ਚਲਾਓ।"</div><div class='hunk'>@@ -19099,7 +19099,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਤੁਹਾਡੇ ਕੋਲ ਹਾਲੇ ਕੋਈ ਵੀ ਇੰਟਰਨੈਟ ਕੁਨੈਕਸ਼ਨ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।\n"</div><div class='ctx'> "ਮੈਂਡਰਿਕਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ \"ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ\" ਚਲਾਓ।"</div><div class='hunk'>@@ -19152,7 +19152,7 @@ msgstr "KDM (KDE ਦ੍ਰਿਸ਼ ਮੈਨੇਜਰ)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr "MdkKDM (ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਦ੍ਰਿਸ਼ ਮੈਨੇਜਰ)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -19452,7 +19452,7 @@ msgstr "ਆਯਾਤ"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19969,7 +19969,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -20002,7 +20002,7 @@ msgstr " --doc &lt;link&gt;          - ਹੋਰ ਵੈਬ ਸਫਿਆਂ ਨੂੰ �</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਹਾਇਤਾ ਕੇਂਦਰ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -23337,7 +23337,7 @@ msgstr "ਤਬਦੀਲੀ ਕੀਤੀ ਗਈ, ਪਰ ਲਾਗੂ ਕਰਨ �</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸੰਦ ਲਾਗ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -23850,7 +23850,7 @@ msgstr "ਕੁਨੈਕਸ਼ਨ ਮੁਕੰਮਲ।"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ਕੁਨੈਕਸ਼ਨ ਅਸਫਲ।\n"</div><div class='ctx'> "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ ਆਪਣੀ ਸੰਰਚਨਾ ਦੀ ਜਾਂਚ ਕਰੋ।"</div><div class='head'>diff --git a/perl-install/share/po/pl.po b/perl-install/share/po/pl.po<br/>index 894503cc6..b673d562b 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/pl.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/pl.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/pl.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/pl.po</a></div><div class='hunk'>@@ -69,7 +69,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Wygląda na to, że klucz USB posiada włączone zabezpieczenie przed zapisem,\n"</div><div class='ctx'> "lecz wciąż można go bezpiecznie odłączyć.\n"</div><div class='hunk'>@@ -77,7 +77,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknij przycisk aby uruchomić ponownie komputer, wyłącz klucz, usuń\n"</div><div class='ctx'> "zabezpieczenie przed zapisem oraz włóż go ponownie.\n"</div><div class='del'>-"Następnie należy ponownie uruchomić Mandrake Move."</div><div class='add'>+"Następnie należy ponownie uruchomić Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Twój klucz USB nie zawiera żadnych prawidłowych partycji Windows (FAT).\n"</div><div class='hunk'>@@ -106,14 +106,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Można także kontynuować bez klucza USB - wciąż będzie można\n"</div><div class='del'>-"korzystać z Mandrake Move tak jak z normalnego systemu\n"</div><div class='add'>+"korzystać z Mandriva Move tak jak z normalnego systemu\n"</div><div class='ctx'> "operacyjnego Mandrake."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -121,11 +121,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "W twoim systemie nie wykryto żadnego klucza USB. Jeśli\n"</div><div class='del'>-"teraz włożysz klucz USB, Mandrake Move będzie posiadać\n"</div><div class='add'>+"teraz włożysz klucz USB, Mandriva Move będzie posiadać\n"</div><div class='ctx'> "możliwość przezroczystego zapisu danych w twoim katalogu\n"</div><div class='ctx'> "domowym oraz całą konfigurację systemu, które będą używane\n"</div><div class='ctx'> "podczas uruchomienia tego lub innego komputera.\n"</div><div class='hunk'>@@ -134,7 +134,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Można także kontynuować bez klucza USB - wciąż będzie można\n"</div><div class='del'>-"korzystać z Mandrake Move tak jak z normalnego systemu\n"</div><div class='add'>+"korzystać z Mandriva Move tak jak z normalnego systemu\n"</div><div class='ctx'> "operacyjnego Mandrake."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -261,7 +261,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -277,7 +277,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Może być to spowodowane uszkodzonymi plikami konfiguracyjnymi\n"</div><div class='ctx'> "systemu zapisanymi na kluczu USB. W tym przypadku usunięcie ich\n"</div><div class='del'>-"a następnie ponowne uruchomienie Mandrake Move może naprawić\n"</div><div class='add'>+"a następnie ponowne uruchomienie Mandriva Move może naprawić\n"</div><div class='ctx'> "sytuację. Aby to zrobić, kliknij odpowiedni przycisk.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1320,11 +1320,11 @@ msgstr "Wybór języka"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux obsługuje wiele języków. Wybierz\n"</div><div class='add'>+"Mandrivalinux obsługuje wiele języków. Wybierz\n"</div><div class='ctx'> "języki do zainstalowania. Będą one dostępne po zakończeniu\n"</div><div class='ctx'> "instalacji i ponownym uruchomieniu systemu."</div><div class='ctx'> </div><div class='hunk'>@@ -3751,12 +3751,12 @@ msgstr "włączona obsługa radia"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Przed kontynuowaniem, należy przeczytać uważnie warunki licencji dotyczącej "</div><div class='del'>-"całej dystrybucji Mandrakelinux. Jeśli zgadzasz się\n"</div><div class='add'>+"całej dystrybucji Mandrivalinux. Jeśli zgadzasz się\n"</div><div class='ctx'> "z wszystkimi warunkami w niej zawartymi, zaznacz opcję \"%s\".\n"</div><div class='ctx'> "Jeśli nie kliknij na przycisk \"%s\" w celu ponownego uruchomienia\n"</div><div class='ctx'> "komputera."</div><div class='hunk'>@@ -3934,13 +3934,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Instalacja Mandrakelinux jest rozpowszechniana na kilku płytach CD.\n"</div><div class='add'>+"Instalacja Mandrivalinux jest rozpowszechniana na kilku płytach CD.\n"</div><div class='ctx'> "Jeśli wybrany pakiet jest zlokalizowany na innej płycie CD\n"</div><div class='ctx'> " instalator wysunie bieżącą płytę CD oraz wyświetli prośbę\n"</div><div class='ctx'> "o włożenie wymaganej płyty CD. Jeśli nie posiadasz wymaganej\n"</div><div class='hunk'>@@ -3951,11 +3951,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4007,7 +4007,7 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nadszedł czas na określenie, jakie programy mają zostać zainstalowane w\n"</div><div class='del'>-"systemie. Dla Mandrakelinux są dostępne tysiące pakietów. Aby uczynić\n"</div><div class='add'>+"systemie. Dla Mandrivalinux są dostępne tysiące pakietów. Aby uczynić\n"</div><div class='ctx'> "zarządzanie pakietami łatwiejszym, zostały one uporządkowane na podstawie\n"</div><div class='ctx'> "podobieństwa aplikacji.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4121,10 +4121,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4155,7 +4155,7 @@ msgstr ""</div><div class='ctx'> "!! Jeśli zostanie wybrany pakiet serwera, niezależnie czy wybrany został\n"</div><div class='ctx'> "on w drodze indywidualnego wyboru pakietów, lub też jako pakiet grupy,\n"</div><div class='ctx'> "zostanie wyświetlona prośba o potwierdzenie wyboru pakietu serwera\n"</div><div class='del'>-"przed jego instalacją. W systemie Mandrakelinux, wszystkie zainstalowane\n"</div><div class='add'>+"przed jego instalacją. W systemie Mandrivalinux, wszystkie zainstalowane\n"</div><div class='ctx'> "serwery są uruchamiane domyślnie w trakcie\n"</div><div class='ctx'> "uruchamiania całego systemu. Nawet jeśli dany pakiet jest uważany\n"</div><div class='ctx'> "za bezpieczny i w trakcie instalacji nie są znane żadne problemy z nim\n"</div><div class='hunk'>@@ -4313,7 +4313,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4369,7 +4369,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (od systemu X Window) to serce graficznego interfejsu GNU/Linux,\n"</div><div class='ctx'> "z którego korzystają wszystkie środowiska graficzne (KDE, GNOME,\n"</div><div class='del'>-"AfterStep, WindowMaker, itd.) dostępne w systemie Mandrakelinux.\n"</div><div class='add'>+"AfterStep, WindowMaker, itd.) dostępne w systemie Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Zostanie wyświetlona lista różnych parametrów pozwalających\n"</div><div class='ctx'> "na zmianę sposobu wyświetlania.\n"</div><div class='hunk'>@@ -4489,12 +4489,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4521,7 +4521,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4530,7 +4530,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4551,11 +4551,11 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "W tym etapie instalacji należy określić, gdzie na dysku zostanie\n"</div><div class='del'>-"zainstalowany system operacyjny Mandrakelinux. Jeśli dysk jest pusty\n"</div><div class='add'>+"zainstalowany system operacyjny Mandrivalinux. Jeśli dysk jest pusty\n"</div><div class='ctx'> "lub istniejące systemy operacyjne zajmują całe dostępne miejsce,\n"</div><div class='ctx'> "należy podzielić dysk na partycje.\n"</div><div class='ctx'> "Partycjonowanie to po prostu logiczny podział twardego dysku na oddzielne\n"</div><div class='del'>-"obszary w celu zainstalowania systemu Mandrakelinux.\n"</div><div class='add'>+"obszary w celu zainstalowania systemu Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ponieważ efekt partycjonowania jest nieodwracalny, czynność wydaje się\n"</div><div class='ctx'> "niebezpieczna i jest stresująca dla niedoświadczonych użytkowników.\n"</div><div class='hunk'>@@ -4592,7 +4592,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Jeśli chcesz usunąć z dysku\n"</div><div class='ctx'> "wszystkie dane i wszystkie partycje istniejące na dysku oraz zainstalować\n"</div><div class='del'>-"w to miejsce nowy system Mandrakelinux, wybierz to rozwiązanie.\n"</div><div class='add'>+"w to miejsce nowy system Mandrivalinux, wybierz to rozwiązanie.\n"</div><div class='ctx'> "Pamiętaj, że po zatwierdzeniu tego wyboru nie nie będzie możliwości "</div><div class='ctx'> "odwrotu.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4756,7 +4756,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4778,7 +4778,7 @@ msgstr ""</div><div class='ctx'> "Kliknij \"%s\", jeśli już można przystąpić do formatowania partycji.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknij \"%s\", jeśli chcesz wybrać inne partycje dla nowej instalacji\n"</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknij \"%s\" jeśli chcesz wybrać sprawdzanie niektórych partycji\n"</div><div class='ctx'> "w poszukiwaniu uszkodzonych sektorów na dysku."</div><div class='hunk'>@@ -4795,7 +4795,7 @@ msgstr "Wstecz"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4807,7 +4807,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Podczas instalacji Mandrakelinux, być może niektóre pakiety\n"</div><div class='add'>+"Podczas instalacji Mandrivalinux, być może niektóre pakiety\n"</div><div class='ctx'> "zostały zaktualizowane od wydania początkowego. Niektóre błędy mogą\n"</div><div class='ctx'> "zostać naprawione, zaś problemy z bezpieczeństwem rozwiązane. Aby\n"</div><div class='ctx'> "skorzystać z możliwości aktualizacji, dobrze jest pobrać część danych\n"</div><div class='hunk'>@@ -4836,7 +4836,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4851,7 +4851,7 @@ msgstr ""</div><div class='ctx'> "Jeśli nie wiesz co wybrać, użyj domyślnej opcji. Będzie można zmienić "</div><div class='ctx'> "poziom\n"</div><div class='ctx'> "bezpieczeństwa w późniejszym czasie przy użyciu narzędzia draksec\n"</div><div class='del'>-"uruchamianego z Centrum Sterowania Mandrakelinux.\n"</div><div class='add'>+"uruchamianego z Centrum Sterowania Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Pole \"%s\" może informować system o użytkowniku komputera odpowiedzialnego\n"</div><div class='ctx'> "za bezpieczeństwo. Komunikaty bezpieczeństwa będą przesyłane na ten adres."</div><div class='hunk'>@@ -4865,7 +4865,7 @@ msgstr "Administrator zabezpieczeń"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4936,7 +4936,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "W tym etapie instalacji wybierasz partycje, na których będzie instalowany\n"</div><div class='del'>-"Mandrakelinux. Jeśli istnieją (np. pozostały po poprzedniej instalacji,\n"</div><div class='add'>+"Mandrivalinux. Jeśli istnieją (np. pozostały po poprzedniej instalacji,\n"</div><div class='ctx'> "lub też zostały założone innym narzędziem), można ich użyć do instalacji.\n"</div><div class='ctx'> "W innym przypadku należy je utworzyć.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5025,7 +5025,7 @@ msgstr "Przełącz między trybem zwykłym a zaawansowanym"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5054,7 +5054,7 @@ msgid ""</div><div class='ctx'> "disk or partition is called \"C:\")."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Na dysku wykryto więcej niż jedną partycję Windows. Wybierz, którą\n"</div><div class='del'>-"z nich chcesz zmniejszyć w celu zainstalowania systemu Mandrakelinux\n"</div><div class='add'>+"z nich chcesz zmniejszyć w celu zainstalowania systemu Mandrivalinux\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Każda partycja jest określana za pomocą informacji: \"Nazwa linuksowa\",\n"</div><div class='ctx'> "\"Nazwa Windows\" i \"Rozmiar\".\n"</div><div class='hunk'>@@ -5100,7 +5100,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5109,19 +5109,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ten krok jest aktywowany tylko jeśli na twoim komputerze została\n"</div><div class='ctx'> "znaleziona stara partycja GNU/Linux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Instalator musi teraz otrzymać informację czy chcesz przeprowadzić nową\n"</div><div class='del'>-"instalację, czy też uaktualnić istniejący system Mandrakelinux:\n"</div><div class='add'>+"instalację, czy też uaktualnić istniejący system Mandrivalinux:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": W większości przypadków, ta opcja powoduje całkowite\n"</div><div class='ctx'> "usunięcie starego systemu. Jednak w zależności od schematu\n"</div><div class='hunk'>@@ -5131,13 +5131,13 @@ msgstr ""</div><div class='ctx'> "opcji.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Ta klasa instalacji umożliwia uaktualnienie pakietów\n"</div><div class='del'>-"aktualnie zainstalowanych w systemie Mandrakelinux. Twój bieżący\n"</div><div class='add'>+"aktualnie zainstalowanych w systemie Mandrivalinux. Twój bieżący\n"</div><div class='ctx'> "schemat partycjonowania oraz dane użytkownika nie zostaną zmienione.\n"</div><div class='ctx'> "Większość z innych kroków konfiguracyjnych pozostanie dostępnych,\n"</div><div class='ctx'> "podobnie do instalacji standardowej.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Użycie wersji \"Uaktualnienie\" powinno zadziałać dobrze na systemach\n"</div><div class='del'>-"Mandrakelinux w wersji \"8.1\" i późniejszych. Przeprowadzanie\n"</div><div class='add'>+"Mandrivalinux w wersji \"8.1\" i późniejszych. Przeprowadzanie\n"</div><div class='ctx'> "uaktualnienia z wersji wcześniejszych niż \"8.1\" nie jest zalecane."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -5196,7 +5196,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5240,7 +5240,7 @@ msgstr ""</div><div class='ctx'> "Uwaga dotycząca obsługi UTF-8 (unikodu): Unikod jest nowym kodowaniem\n"</div><div class='ctx'> "znaków umożliwiającym równoczesną osługę wszystkich istniejących\n"</div><div class='ctx'> "języków. Jednak pełna obsługa tego standardu jest wciąż w trakcie\n"</div><div class='del'>-"rozwoju w systemach GNU/Linux. Z tego powodu, Mandrakelinux\n"</div><div class='add'>+"rozwoju w systemach GNU/Linux. Z tego powodu, Mandrivalinux\n"</div><div class='ctx'> "używa go lub nie w zależności od wyboru użytkownika:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "* Po wybraniu języków z często używanym kodowaniem (języki latin1,\n"</div><div class='hunk'>@@ -5485,7 +5485,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5506,11 +5506,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nadszedł czas na wybranie systemu drukowania. Inne systemy operacyjne\n"</div><div class='del'>-"mogą zaoferować jeden, lecz Mandrakelinux oferuje dwa. Każdy z tych\n"</div><div class='add'>+"mogą zaoferować jeden, lecz Mandrivalinux oferuje dwa. Każdy z tych\n"</div><div class='ctx'> "systemów wydruku jest najlepszy dla określonego typu konfiguracji.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" oznaczający \"print, do not queue\" (drukuj, nie buforuj),\n"</div><div class='hunk'>@@ -5657,7 +5657,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5674,7 +5674,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5728,7 +5728,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": jeśli chcesz skonfigurować połączenie z Internetem lub\n"</div><div class='ctx'> "sieć lokalną użyj tej opcji. Zobacz na wydrukowaną dokumentację lub\n"</div><div class='del'>-"użyj Centrum Sterownia Mandrakelinux po zakończeniu instalacji\n"</div><div class='add'>+"użyj Centrum Sterownia Mandrivalinux po zakończeniu instalacji\n"</div><div class='ctx'> "aby otrzymać pełną pomoc.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": umożliwia konfigurację adresów pośrednika HTTP i FTP,\n"</div><div class='hunk'>@@ -5806,11 +5806,11 @@ msgstr "Usługi"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Wybierz dysk, który chcesz wykasować, by założyć na nim\n"</div><div class='del'>-"partycję Mandrakelinux. Pamiętaj, że wszystkie dane z tego\n"</div><div class='add'>+"partycję Mandrivalinux. Pamiętaj, że wszystkie dane z tego\n"</div><div class='ctx'> "dysku zostaną utracone bez możliwości odzyskania!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6162,12 +6162,12 @@ msgstr "Obliczanie rozmiaru partycji Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Partycja Windows jest zbyt pofragmentowana. Należy uruchomić komputer pod "</div><div class='ctx'> "systemem Windows, uruchomić narzędzie \"defrag\" i następnie ponownie "</div><div class='del'>-"rozpocząć instalację Mandrakelinux."</div><div class='add'>+"rozpocząć instalację Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6287,19 +6287,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6321,7 +6321,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6329,14 +6329,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6346,7 +6346,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6366,10 +6366,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6380,11 +6380,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6400,23 +6400,23 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Wprowadzenie\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "System operacyjny wraz z innymi komponentami dostępnymi w dystrybucji "</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "zwany jest dalej \"Oprogramowaniem\". Oprogramowanie zawiera między innymi "</div><div class='ctx'> "zbiór \n"</div><div class='ctx'> "programów, metod, zasad oraz dokumentacji związanej z systemem operacyjnym "</div><div class='ctx'> "oraz \n"</div><div class='del'>-"innych komponentów dystrybucji Mandrakelinux.\n"</div><div class='add'>+"innych komponentów dystrybucji Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Umowa licencyjna\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Należy przeczytać uważnie ten dokument. Jest on umową licencyjną pomiędzy "</div><div class='ctx'> "użytkownikiem\n"</div><div class='del'>-"a Mandrakesoft S.A. dotyczącą Oprogramowania.\n"</div><div class='add'>+"a Mandriva S.A. dotyczącą Oprogramowania.\n"</div><div class='ctx'> "Instalacja, kopiowanie lub używanie Oprogramowania w dowolny sposób, oznacza "</div><div class='ctx'> "pełną\n"</div><div class='ctx'> "i wyraźną zgodę na warunki licencyjne tej umowy.\n"</div><div class='hunk'>@@ -6435,7 +6435,7 @@ msgstr ""</div><div class='ctx'> "Oprogramowanie oraz dołączona dokumentacja dostarczana jest w formie "</div><div class='ctx'> "\"takiej jaka jest\",\n"</div><div class='ctx'> "bez żadnej gwarancji, w stopniu w jakim pozwala na to prawo.\n"</div><div class='del'>-"Firma Mandrakesoft S.A. nie będzie, bez względu na okoliczności i w zakresie "</div><div class='add'>+"Firma Mandriva S.A. nie będzie, bez względu na okoliczności i w zakresie "</div><div class='ctx'> "określonym przez \n"</div><div class='ctx'> "prawo, odpowiedzialna za żadne specjalne, uboczne, bezpośrednie i pośrednie "</div><div class='ctx'> "uszkodzenia\n"</div><div class='hunk'>@@ -6444,13 +6444,13 @@ msgstr ""</div><div class='ctx'> "firmy, straty finansowe, zasądzone grzywny i kary prawne lub inne straty) "</div><div class='ctx'> "powstałe w wyniku\n"</div><div class='ctx'> "używania lub niemożności używania Oprogramowania, nawet jeśli firma "</div><div class='del'>-"Mandrakesoft S.A.\n"</div><div class='add'>+"Mandriva S.A.\n"</div><div class='ctx'> "została ostrzeżona o możliwości wystąpienia takich uszkodzeń.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "OGRANICZONA ODPOWIEDZIALNOŚĆ ZWIĄZANA Z POSIADANIEM LUB UŻYWANIEM\n"</div><div class='ctx'> "OPROGRAMOWANIA W NIEKTÓRYCH KRAJACH\n"</div><div class='ctx'> "\n"</div><div class='del'>-"W zakresie określonym przez prawo firma Mandrakesoft S.A. lub jej "</div><div class='add'>+"W zakresie określonym przez prawo firma Mandriva S.A. lub jej "</div><div class='ctx'> "dystrybutorzy bez względu\n"</div><div class='ctx'> "na okoliczności nie będą odpowiedzialni za żadne specjalne, uboczne, "</div><div class='ctx'> "bezpośrednie i pośrednie uszkodzenia\n"</div><div class='hunk'>@@ -6460,7 +6460,7 @@ msgstr ""</div><div class='ctx'> "powstałe w wyniku\n"</div><div class='ctx'> "używania lub niemożności używania Oprogramowania lub w wyniku pobrania "</div><div class='ctx'> "komponentów\n"</div><div class='del'>-"oprogramowania z jednej ze stron Mandrakelinux, które są zabronione lub "</div><div class='add'>+"oprogramowania z jednej ze stron Mandrivalinux, które są zabronione lub "</div><div class='ctx'> "zastrzeżone w niektórych\n"</div><div class='ctx'> "krajach przez lokalne prawo. Ta ograniczona odpowiedzialność dotyczy między "</div><div class='ctx'> "innymi komponentów\n"</div><div class='hunk'>@@ -6480,9 +6480,9 @@ msgstr ""</div><div class='ctx'> "komponentu przed\n"</div><div class='ctx'> "jego użyciem. Dowolne pytanie dotyczące licencji powinno być przesyłane do "</div><div class='ctx'> "autora, nie\n"</div><div class='del'>-"do firmy Mandrakesoft. Programy stworzone przez Mandrakesoft S.A. są wydane "</div><div class='add'>+"do firmy Mandriva. Programy stworzone przez Mandrakesoft S.A. są wydane "</div><div class='ctx'> "na zasadach\n"</div><div class='del'>-"licencji GPL. Dokumentacja napisana przez Mandrakesoft S.A. jest wydana na "</div><div class='add'>+"licencji GPL. Dokumentacja napisana przez Mandriva S.A. jest wydana na "</div><div class='ctx'> "zasadach\n"</div><div class='ctx'> "wybranej licencji. Zajrzyj do dokumentacji, aby uzyskać więcej szczegółów.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6493,12 +6493,12 @@ msgstr ""</div><div class='ctx'> "chronione\n"</div><div class='ctx'> "przez prawo własności intelektualnej i prawo autorskie stosowane do "</div><div class='ctx'> "programów komputerowych.\n"</div><div class='del'>-"Firma Mandrakesoft S.A. zastrzega sobie prawo do zmiany lub przystosowania "</div><div class='add'>+"Firma Mandriva S.A. zastrzega sobie prawo do zmiany lub przystosowania "</div><div class='ctx'> "Oprogramowania,\n"</div><div class='ctx'> "jako całości lub w częściach, w każdym sensie i w dowolny celu.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" oraz związane znaki graficzne są znakami "</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" oraz związane znaki graficzne są znakami "</div><div class='ctx'> "handlowymi firmy\n"</div><div class='del'>-"Mandrakesoft S.A.\n"</div><div class='add'>+"Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Prawa Nadrzędne\n"</div><div class='hunk'>@@ -6515,7 +6515,7 @@ msgstr ""</div><div class='ctx'> "Paryża we Francji.\n"</div><div class='ctx'> "W przypadku jakichkolwiek wątpliwości dotyczących tego dokumentu, w celu ich "</div><div class='ctx'> "wyjaśnienia\n"</div><div class='del'>-"można skontaktować się z firmą Mandrakesoft S.A.\n"</div><div class='add'>+"można skontaktować się z firmą Mandriva S.A.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6609,7 +6609,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6617,13 +6617,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gratulacje, instalacja została zakończona.\n"</div><div class='ctx'> "Usuń nośniki wymienne i naciśnij enter, by ponownie uruchomić komputer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Informacje o poprawkach dotyczących tej wersji Mandrakelinux\n"</div><div class='add'>+"Informacje o poprawkach dotyczących tej wersji Mandrivalinux\n"</div><div class='ctx'> "znajdziesz na stronach:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6631,7 +6631,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informacje o konfiguracji systemu znajdują się\n"</div><div class='del'>-"w Oficjalnym Podręczniku Użytkownika Mandrakelinux."</div><div class='add'>+"w Oficjalnym Podręczniku Użytkownika Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6666,7 +6666,7 @@ msgstr "Przechodzę do kroku `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -7210,9 +7210,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Łączenie ze stroną Mandrakelinux w celu pobrania listy dostępnych serwerów..."</div><div class='add'>+"Łączenie ze stroną Mandrivalinux w celu pobrania listy dostępnych serwerów..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7437,8 +7437,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Instalacja Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Instalacja Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10027,7 +10027,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14099,11 +14099,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Uruchom Scannerdrake (Sprzęt/Skanery w Centrum Sterowania Mandrakelinux), "</div><div class='add'>+"Uruchom Scannerdrake (Sprzęt/Skanery w Centrum Sterowania Mandrivalinux), "</div><div class='ctx'> "aby udostępnić skaner w sieci.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -16057,23 +16057,23 @@ msgstr "Zatrzymaj"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Czym jest Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Czym jest Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Witamy w systemie &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Witamy w systemie &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux jest &lt;b&gt;dystrybucją Linuksa&lt;/b&gt; zawierającą podstawowy system "</div><div class='add'>+"Mandrivalinux jest &lt;b&gt;dystrybucją Linuksa&lt;/b&gt; zawierającą podstawowy system "</div><div class='ctx'> "zwany &lt;b&gt;systemem operacyjnym&lt;/b&gt; (opartym o jądro Linuksa) wraz z &lt;b&gt;dużą "</div><div class='ctx'> "liczbą aplikacji&lt;/b&gt; realizujących wszystkie zadania o jakich można tylko "</div><div class='ctx'> "pomyśleć."</div><div class='hunk'>@@ -16081,10 +16081,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux jest  najbardziej &lt;b&gt;przyjazną dla użytkownika&lt;/b&gt; dystrybucją "</div><div class='add'>+"Mandrivalinux jest  najbardziej &lt;b&gt;przyjazną dla użytkownika&lt;/b&gt; dystrybucją "</div><div class='ctx'> "Linuksa. Jest ona także jedną z &lt;b&gt;najczęściej używanych&lt;/b&gt; dystrybucji "</div><div class='ctx'> "Linuksa na świecie!"</div><div class='ctx'> </div><div class='hunk'>@@ -16101,15 +16101,15 @@ msgstr "Witaj w &lt;b&gt;świecie Otwartego Oprogramowania&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux został wydany na zasadzie Open Source. To oznacza, że to nowe "</div><div class='add'>+"Mandrivalinux został wydany na zasadzie Open Source. To oznacza, że to nowe "</div><div class='ctx'> "wydanie jest wynikiem &lt;b&gt;współpracy&lt;/b&gt; pomiędzy &lt;b&gt;zespołem programistów "</div><div class='del'>-"Mandrakesoft&lt;/b&gt; oraz &lt;b&gt;światową społecznością&lt;/b&gt; współpracownikół "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"Mandriva&lt;/b&gt; oraz &lt;b&gt;światową społecznością&lt;/b&gt; współpracownikół "</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16129,10 +16129,10 @@ msgstr "&lt;b&gt;Licencja GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Większość oprogramowania załączonego w dystrybucji oraz wszystkie narzędzia "</div><div class='del'>-"Mandrakelinux jest licencjonowana na zasadach &lt;b&gt;Powszechnej Licencji "</div><div class='add'>+"Mandrivalinux jest licencjonowana na zasadach &lt;b&gt;Powszechnej Licencji "</div><div class='ctx'> "Publicznej&lt;/b&gt; (GPL)."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16164,15 +16164,15 @@ msgstr "&lt;b&gt;Dołącz do społeczności&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux posiada jedną z &lt;b&gt;największych społeczności&lt;/b&gt; użytkowników "</div><div class='add'>+"Mandrivalinux posiada jedną z &lt;b&gt;największych społeczności&lt;/b&gt; użytkowników "</div><div class='ctx'> "i deweloperów. Rola takiej społeczności jest bardzo szeroka, poczynając od "</div><div class='ctx'> "zgłaszania błędów a kończąc na tworzeniu nowych aplikacji. Społeczność "</div><div class='del'>-"odgrywa &lt;b&gt;kluczową rolę&lt;/b&gt; w świecie Mandrakelinux."</div><div class='add'>+"odgrywa &lt;b&gt;kluczową rolę&lt;/b&gt; w świecie Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16194,11 +16194,11 @@ msgstr "&lt;b&gt;Wersja Download&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Właśnie instalujesz &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Ta wersja jest wersją "</div><div class='del'>-"bezpłatną, którą Mandrakesoft chce utrzymać jako &lt;b&gt;dostępną dla wszystkich&lt;/"</div><div class='add'>+"Właśnie instalujesz &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Ta wersja jest wersją "</div><div class='add'>+"bezpłatną, którą Mandriva chce utrzymać jako &lt;b&gt;dostępną dla wszystkich&lt;/"</div><div class='ctx'> "b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -16231,10 +16231,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Użytkownik nie będzie miał dostępu do &lt;b&gt;usług dołączanych&lt;/b&gt; do innych "</div><div class='del'>-"produktów Mandrakesoft."</div><div class='add'>+"produktów Mandriva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16243,8 +16243,8 @@ msgstr "&lt;b&gt;Discovery,Twój Pierwszy Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Właśnie instalujesz &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Właśnie instalujesz &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16267,17 +16267,17 @@ msgstr "&lt;b&gt;PowerPack, Potężny System Linuksowy&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Właśnie instalujesz &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Właśnie instalujesz &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack jest &lt;b&gt;głównym produktem Linuksowym&lt;/b&gt; firmy Mandrakesoft. "</div><div class='add'>+"PowerPack jest &lt;b&gt;głównym produktem Linuksowym&lt;/b&gt; firmy Mandriva. "</div><div class='ctx'> "PowerPack zawiera &lt;b&gt;tysiące aplikacji&lt;/b&gt; - wszystko od najbardziej "</div><div class='ctx'> "popularnych aplikacji do tych najbardziej zaawansowanych."</div><div class='ctx'> </div><div class='hunk'>@@ -16288,8 +16288,8 @@ msgstr "&lt;b&gt;PowerPack+, Linuksowe rozwiązanie na biurka i serwery&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Właśnie instalujesz &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Właśnie instalujesz &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16306,22 +16306,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produkty Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produkty Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Firma &lt;b&gt;Mandrakesoft&lt;/b&gt; stworzyła szeroką gamę produktów dla dystrybucji "</div><div class='del'>-"&lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"Firma &lt;b&gt;Mandriva&lt;/b&gt; stworzyła szeroką gamę produktów dla dystrybucji "</div><div class='add'>+"&lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Produktami Mandrakelinux są:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Produktami Mandrivalinux są:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16341,77 +16341,77 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;,  Linuksowe rozwiązanie na biurka i serwery"</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux dla x86-64&lt;/b&gt;, edycja Mandrakelinux dla procesorów 64-"</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux dla x86-64&lt;/b&gt;, edycja Mandrivalinux dla procesorów 64-"</div><div class='ctx'> "ro bitowych."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produkty Mandrakesoft (Produkty Nomada)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produkty Mandriva (Produkty Nomada)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft storzył dwa produkty umożliwiające używanie dystrybucji "</div><div class='del'>-"Mandrakelinux &lt;b&gt;na dowolnym komputerze&lt;/b&gt; bez potrzeby jej instalowania."</div><div class='add'>+"Mandriva storzył dwa produkty umożliwiające używanie dystrybucji "</div><div class='add'>+"Mandrivalinux &lt;b&gt;na dowolnym komputerze&lt;/b&gt; bez potrzeby jej instalowania."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, dystrybucja Mandrakelinux uruchamiana bezpośrednio z płyty "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, dystrybucja Mandrivalinux uruchamiana bezpośrednio z płyty "</div><div class='ctx'> "CD-ROM."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, dystrybucja Mandrakelinux preinstalowana na "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, dystrybucja Mandrivalinux preinstalowana na "</div><div class='ctx'> "ultrakompaktowym dysku LaCie Mobile."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produkty Mandrakesoft (Rozwiązania Profesjonalne)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produkty Mandriva (Rozwiązania Profesjonalne)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Poniżej wymienione są produkty Mandrakesoft zaprojektowane z myślą&lt;b&gt;o "</div><div class='add'>+"Poniżej wymienione są produkty Mandriva zaprojektowane z myślą&lt;b&gt;o "</div><div class='ctx'> "zastosowaniach profesjonalnych&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Biurkowa edycja Mandrakelinux do zastosowań "</div><div class='add'>+"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Biurkowa edycja Mandrivalinux do zastosowań "</div><div class='ctx'> "biznesowych."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Serwerowa edycja Mandrakelinux do zastosowań "</div><div class='add'>+"\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Serwerowa edycja Mandrivalinux do zastosowań "</div><div class='ctx'> "biznesowych."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Edycja Mandrakelinux do zastosowań w "</div><div class='add'>+"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Edycja Mandrivalinux do zastosowań w "</div><div class='ctx'> "zakresie bezpieczeństwa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -16456,9 +16456,9 @@ msgstr "&lt;b&gt;Wybierz swoje ulubione środowisko graficzne&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='del'>-"W PowerPacku możesz wybrać &lt;b&gt;środowisko graficzne&lt;/b&gt;. Firma Mandrakesoft "</div><div class='add'>+"W PowerPacku możesz wybrać &lt;b&gt;środowisko graficzne&lt;/b&gt;. Firma Mandriva "</div><div class='ctx'> "wybrała &lt;b&gt;KDE&lt;/b&gt; jako środowisko domyślne."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -16484,9 +16484,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='del'>-"W PowerPacku+ możesz wybrać &lt;b&gt;środowisko graficzne&lt;/b&gt;. Firma Mandrakesoft "</div><div class='add'>+"W PowerPacku+ możesz wybrać &lt;b&gt;środowisko graficzne&lt;/b&gt;. Firma Mandriva "</div><div class='ctx'> "wybrała &lt;b&gt;KDE&lt;/b&gt; jako środowisko domyślne."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16616,10 +16616,10 @@ msgstr "&lt;b&gt;Korzystaj z szerokiej gamy aplikacji&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"W menu systemu Mandrakelinux znajdziesz &lt;b&gt;łatwe w użyciu&lt;/b&gt; aplikacje do "</div><div class='add'>+"W menu systemu Mandrivalinux znajdziesz &lt;b&gt;łatwe w użyciu&lt;/b&gt; aplikacje do "</div><div class='ctx'> "&lt;b&gt;wielu swoich zadań&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16887,18 +16887,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Centrum Sterowania Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Centrum Sterowania Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Centrum Sterowania Mandrakelinux&lt;/b&gt; jest zbiorem autorskich narzędzi "</div><div class='del'>-"Mandrakelinux ułatwiających konfigurację komputera."</div><div class='add'>+"&lt;b&gt;Centrum Sterowania Mandrivalinux&lt;/b&gt; jest zbiorem autorskich narzędzi "</div><div class='add'>+"Mandrivalinux ułatwiających konfigurację komputera."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16921,16 +16921,16 @@ msgstr "&lt;b&gt;Model Open Source&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tak jak każde oprogramowanie komputerowe, oprogramowanie Open Source "</div><div class='ctx'> "&lt;b&gt;wymaga czasu i ludzi&lt;/b&gt; do tworzenia. W celu uszanowania filozofii Open "</div><div class='del'>-"Source, Mandrakesoft sprzedaje produkty wartości dodanej oraz usługi aby "</div><div class='del'>-"&lt;b&gt;ulepszyć dystrybucję Mandrakelinux&lt;/b&gt;. Jeśli chcesz &lt;b&gt;wesprzeć ruch "</div><div class='del'>-"Open Source&lt;/b&gt; oraz rozwój dystrybucji Mandrakelinux, &lt;b&gt;rozważ&lt;/b&gt; zakup "</div><div class='add'>+"Source, Mandriva sprzedaje produkty wartości dodanej oraz usługi aby "</div><div class='add'>+"&lt;b&gt;ulepszyć dystrybucję Mandrivalinux&lt;/b&gt;. Jeśli chcesz &lt;b&gt;wesprzeć ruch "</div><div class='add'>+"Open Source&lt;/b&gt; oraz rozwój dystrybucji Mandrivalinux, &lt;b&gt;rozważ&lt;/b&gt; zakup "</div><div class='ctx'> "jednego z naszych produktów lub usług!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16941,10 +16941,10 @@ msgstr "&lt;b&gt;Sklep internetowy Mandrake&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Aby dowiedzieć się więcej na temat produktów i usług Mandrakesoft, możesz "</div><div class='add'>+"Aby dowiedzieć się więcej na temat produktów i usług Mandriva, możesz "</div><div class='ctx'> "odwiedzić naszą &lt;b&gt;internetową platformę e-commerce&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16970,22 +16970,22 @@ msgstr "Zatrzymaj się pod adresem &lt;b&gt;www.mandrakestore.pl&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Klub Mandrake&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Klub Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Klub Mandrake&lt;/b&gt; jest &lt;b&gt;doskonałym dodatkiem&lt;/b&gt; do twojego produktu "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"&lt;b&gt;Klub Mandriva&lt;/b&gt; jest &lt;b&gt;doskonałym dodatkiem&lt;/b&gt; do twojego produktu "</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Skorzystaj z &lt;b&gt;wartościowych korzyści&lt;/b&gt; poprzez dołączenie do Klub "</div><div class='ctx'> "Mandrake, są to m.in.:"</div><div class='hunk'>@@ -17010,42 +17010,42 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* Możliwość brania udziału w dyskusjach na &lt;b&gt;forach użytkowników&lt;/b&gt; "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Wcześniejszy i uprzywilejowany dostęp&lt;/b&gt;, przed wydaniem publicznym, "</div><div class='del'>-"do &lt;b&gt;obrazów ISO&lt;/b&gt; dystrybucji Mandrakelinux."</div><div class='add'>+"do &lt;b&gt;obrazów ISO&lt;/b&gt; dystrybucji Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; jest nową usługą, którą Mandrakesoft z dumą oferuje "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; jest nową usługą, którą Mandriva z dumą oferuje "</div><div class='ctx'> "swoim klientom."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline dostarcza szeroką gamę wartościowych usług do &lt;b&gt;łatwiejszego "</div><div class='del'>-"uaktualniania&lt;/b&gt; swoich systemów Mandrakelinux:"</div><div class='add'>+"Mandriva Online dostarcza szeroką gamę wartościowych usług do &lt;b&gt;łatwiejszego "</div><div class='add'>+"uaktualniania&lt;/b&gt; swoich systemów Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17071,40 +17071,40 @@ msgstr "\t* Elastyczne &lt;b&gt;planowanie czasu&lt;/b&gt; aktualizacji."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Zarządzanie &lt;b&gt;całym systemem Mandrakelinux&lt;/b&gt; z użyciem jednego konta."</div><div class='add'>+"\t* Zarządzanie &lt;b&gt;całym systemem Mandrivalinux&lt;/b&gt; z użyciem jednego konta."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Potrzebujesz &lt;b&gt;pomocy?&lt;/b&gt;. Nasi eksperci techniczni Mandrakesoft &lt;b&gt;naszej "</div><div class='add'>+"Potrzebujesz &lt;b&gt;pomocy?&lt;/b&gt;. Nasi eksperci techniczni Mandriva &lt;b&gt;naszej "</div><div class='ctx'> "platformy wsparcia technicznego&lt;/b&gt; udzielą pomocy: www.mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Dzięki pomocy &lt;b&gt;wykwalifikowanych ekspertów Mandrakelinux&lt;/b&gt;, oszczędzisz "</div><div class='add'>+"Dzięki pomocy &lt;b&gt;wykwalifikowanych ekspertów Mandrivalinux&lt;/b&gt;, oszczędzisz "</div><div class='ctx'> "wiele czasu."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"W przypadku dowolnego pytania związanego z dystrybucją Mandrakelinux, masz "</div><div class='add'>+"W przypadku dowolnego pytania związanego z dystrybucją Mandrivalinux, masz "</div><div class='ctx'> "możliwość zakupu zdarzeń wsparcia pod adresem &lt;b&gt;www.mandrakestore.pl&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17404,8 +17404,8 @@ msgstr "Narzędzia do monitorowania, księgowania procesów, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Druidy Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Druidy Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17500,8 +17500,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "OPCJE:\n"</div><div class='ctx'> "  --help            - wyświetla ten komunikat pomocy.\n"</div><div class='del'>-"  --report          - program powinien być jednym z narzędzi Mandrakelinux\n"</div><div class='del'>-"  --incident        - program powinien być jednym z narzędzi Mandrakelinux"</div><div class='add'>+"  --report          - program powinien być jednym z narzędzi Mandrivalinux\n"</div><div class='add'>+"  --incident        - program powinien być jednym z narzędzi Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17555,7 +17555,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17569,7 +17569,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPCJE]...\n"</div><div class='del'>-"Konfigurator Serwera Terminali Mandrakelinux\n"</div><div class='add'>+"Konfigurator Serwera Terminali Mandrivalinux\n"</div><div class='ctx'> "--enable         : włącza MTS\n"</div><div class='ctx'> "--disable        : wyłącza MTS\n"</div><div class='ctx'> "--start          : uruchamia MTS\n"</div><div class='hunk'>@@ -17623,7 +17623,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17631,7 +17631,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPCJA]...\n"</div><div class='ctx'> "  --no-confirmation      nie pyta o pierwsze potwierdzenie w trybie "</div><div class='del'>-"MandrakeUpdate\n"</div><div class='add'>+"Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        nie sprawdza podpisów pakietów\n"</div><div class='ctx'> "  --changelog-first      wyświetla dziennik zmian przed listą plików w oknie "</div><div class='ctx'> "opisu.\n"</div><div class='hunk'>@@ -20411,13 +20411,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Narzędzie raportowania błędów Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Narzędzie raportowania błędów Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Centrum Sterowania Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Centrum Sterowania Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20437,8 +20437,8 @@ msgstr "Harddrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20482,8 +20482,8 @@ msgstr "Druidy konfiguracji"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Wybierz narzędzie Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Wybierz narzędzie Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20908,19 +20908,19 @@ msgstr "Uruchamiany przy starcie"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ten interfejs nie został jeszcze skonfigurowany.\n"</div><div class='del'>-"Uruchom druida \"Dodaj interfejs\" z Centrum Sterowania Mandrakelinux"</div><div class='add'>+"Uruchom druida \"Dodaj interfejs\" z Centrum Sterowania Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nie posiadasz żadnego skonfigurowanego połączenia internetowego. Uruchom "</div><div class='del'>-"asystenta \"%s\" z Centrum Sterowania Mandrakelinux"</div><div class='add'>+"asystenta \"%s\" z Centrum Sterowania Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20970,8 +20970,8 @@ msgstr "KDM (Menedżer wyświetlania KDE)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Menedżer wyświetlania Mandrakelinux)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Menedżer wyświetlania Mandrivalinux)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21270,7 +21270,7 @@ msgstr "Import"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21279,7 +21279,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (oryginalna wersja)\n"</div><div class='hunk'>@@ -21825,14 +21825,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "To jest wolnodostępne oprogramowanie i może być rozpowszechniane zgodnie\n"</div><div class='ctx'> "z zasadami licencji GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21862,8 +21862,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Centrum Pomocy Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Centrum Pomocy Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25296,8 +25296,8 @@ msgstr "Zostały dokonane zmiany, wyloguj się by je zastosować"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Dzienniki narzędzi Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Dzienniki narzędzi Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25821,10 +25821,10 @@ msgstr "Próba połączenia zakończona powodzeniem."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Próba połączenia zakończona niepowodzeniem.\n"</div><div class='del'>-"Sprawdź konfigurację w Centrum Sterowania Mandrakelinux."</div><div class='add'>+"Sprawdź konfigurację w Centrum Sterowania Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26706,19 +26706,19 @@ msgstr "Instalacja zakończyła się niepowodzeniem"</div><div class='ctx'> #~ msgid "You've not selected any font"</div><div class='ctx'> #~ msgstr "Nie wybrano żadnego fontu"</div><div class='ctx'> </div><div class='del'>-#~ msgid "The Mandrakelinux 10.1 products are:"</div><div class='del'>-#~ msgstr "Produktami Mandrakelinux 10.1 są:"</div><div class='add'>+#~ msgid "The Mandrivalinux 10.1 products are:"</div><div class='add'>+#~ msgstr "Produktami Mandrivalinux 10.1 są:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "\t* &lt;b&gt;Mandrakelinux 10.1 for x86-64&lt;/b&gt;, The Mandrakelinux solution for "</div><div class='add'>+#~ "\t* &lt;b&gt;Mandrivalinux 10.1 for x86-64&lt;/b&gt;, The Mandrivalinux solution for "</div><div class='ctx'> #~ "making the most of your 64-bit processor."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* &lt;b&gt;Mandrakelinux 10.1 dla x86-64&lt;/b&gt;, edycja Mandrakelinux dla "</div><div class='add'>+#~ "\t* &lt;b&gt;Mandrivalinux 10.1 dla x86-64&lt;/b&gt;, edycja Mandrivalinux dla "</div><div class='ctx'> #~ "procesorów 64-ro bitowych."</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Druidy Mandrakesoft"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Druidy Mandriva"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Brak dostępnych przeglądarek! Proszę jakąś zainstalować"</div><div class='head'>diff --git a/perl-install/share/po/pt.po b/perl-install/share/po/pt.po<br/>index 6b11a8229..3698de870 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/pt.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/pt.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/pt.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/pt.po</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Latest versions of po files are at http://www.mandrakelinux.com/l10n/pt.php3</div><div class='ctx'> #</div><div class='del'>-# Copyright (C) 2000 MandrakeSoft</div><div class='add'>+# Copyright (C) 2000 Mandriva</div><div class='ctx'> # Fernando Moreira &lt;fmoreira@netc.pt&gt;, 1999.</div><div class='ctx'> # Jorge Costa &lt;Jorgercosta@netc.pt&gt;, 2001.</div><div class='ctx'> # José JORGE &lt;jose.jorge@oreka.com&gt;, 2002,2003.</div><div class='hunk'>@@ -85,14 +85,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A chave USB parece ter a protecção de escrita activada, mas não\n"</div><div class='ctx'> "podemos desliga-la com segurança.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Clique no botão para reiniciar o computador, desligue-a, retire a\n"</div><div class='del'>-"protecção de escrita, volte-a a ligar e, execute o Mandrake Move."</div><div class='add'>+"protecção de escrita, volte-a a ligar e, execute o Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -110,7 +110,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A sua chave USB não contém nenhuma partição Windows (FAT)\n"</div><div class='hunk'>@@ -121,14 +121,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Pode também proceder sem uma chave USB - continuará na\n"</div><div class='del'>-"mesma a poder usar o Mandrake Move como um sistema\n"</div><div class='add'>+"mesma a poder usar o Mandriva Move como um sistema\n"</div><div class='ctx'> "operativo Mandrake normal."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -136,11 +136,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Não foi detectada nenhuma chave USB no seu sistema. Se ligar\n"</div><div class='del'>-"uma chave USB agora, o Mandrake Move irá ter a capacidade de\n"</div><div class='add'>+"uma chave USB agora, o Mandriva Move irá ter a capacidade de\n"</div><div class='ctx'> "guardar transparentemente os dados na sua directoria pessoal\n"</div><div class='ctx'> "e na configuração global do sistema, para o próximo arranque\n"</div><div class='ctx'> "neste computador ou num outro. Nota: se ligar agora uma chave,\n"</div><div class='hunk'>@@ -148,7 +148,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Pode também proceder sem uma chave USB - continuará a poder\n"</div><div class='del'>-"usar na mesma o Mandrake Move como um sistema operativo\n"</div><div class='add'>+"usar na mesma o Mandriva Move como um sistema operativo\n"</div><div class='ctx'> "Mandrake normal."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -275,7 +275,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1331,11 +1331,11 @@ msgstr "Escolha da língua"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"O Mandrakelinux suporta várias línguas. Seleccione as\n"</div><div class='add'>+"O Mandrivalinux suporta várias línguas. Seleccione as\n"</div><div class='ctx'> "linguagens que deseja instalar. Estas estarão disponíveis\n"</div><div class='ctx'> "quando terminar a instalação e reiniciar o seu sistema."</div><div class='ctx'> </div><div class='hunk'>@@ -3760,12 +3760,12 @@ msgstr "activar o suporte de rádio"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Antes de continuar, deve ler atentamente os termos da licença. Ela\n"</div><div class='del'>-"cobre toda a distribuição Mandrakelinux. Se concorda com todos os termos\n"</div><div class='add'>+"cobre toda a distribuição Mandrivalinux. Se concorda com todos os termos\n"</div><div class='ctx'> "presentes, active a caixa \"%s\". Se não, pode clicar no botão \"%s\" para\n"</div><div class='ctx'> "reiniciar o seu computador."</div><div class='ctx'> </div><div class='hunk'>@@ -3941,13 +3941,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A instalação Mandrakelinux é distribuída em vários CD-ROMs. Se um pacote\n"</div><div class='add'>+"A instalação Mandrivalinux é distribuída em vários CD-ROMs. Se um pacote\n"</div><div class='ctx'> "seleccionado estiver localizado noutro CD-ROM, o DrakX irá ejectar o actual\n"</div><div class='ctx'> "CD e pedir para inserir o CD pedido. Se não tiver o CD em questão à mão,\n"</div><div class='ctx'> "clique apenas em \"%s\", o pacote correspondente não será instalado."</div><div class='hunk'>@@ -3956,11 +3956,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4012,10 +4012,10 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "É agora tempo de especificar que programas deseja instalar no seu\n"</div><div class='del'>-"sistema. Há centenas de pacotes disponíveis para o Mandrakelinux, e para\n"</div><div class='add'>+"sistema. Há centenas de pacotes disponíveis para o Mandrivalinux, e para\n"</div><div class='ctx'> " simplificar a gestão, foram colocados em grupos de aplicações similares.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"O Mandrakelinux classifica os grupos de pacotes em quatro categorias.\n"</div><div class='add'>+"O Mandrivalinux classifica os grupos de pacotes em quatro categorias.\n"</div><div class='ctx'> "Pode misturar e combinar aplicações de várias categorias, para que a\n"</div><div class='ctx'> "instalação de uma ``Estação de trabalho'' possa ainda ter aplicações da\n"</div><div class='ctx'> "categoria ``Servidor'' instaladas.\n"</div><div class='hunk'>@@ -4120,10 +4120,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4154,11 +4154,11 @@ msgstr ""</div><div class='ctx'> "!! Se um pacote servidor foi seleccionado, ou porque escolheu\n"</div><div class='ctx'> "especificamente o pacote individual ou porque fazia parte de um grupo de\n"</div><div class='ctx'> "pacotes, será-lhe pedido para confirmar que realmente quer que esses\n"</div><div class='del'>-"servidores sejam instalados. Por omissão o Mandrakelinux irá\n"</div><div class='add'>+"servidores sejam instalados. Por omissão o Mandrivalinux irá\n"</div><div class='ctx'> "automaticamente iniciar qualquer serviço instalado no arranque. Mesmo\n"</div><div class='ctx'> "que sejam seguros e não tenham qualquer problema conhecido na altura\n"</div><div class='ctx'> "da saída da distribuição, é bem possível que sejam descobertos 'buracos'\n"</div><div class='del'>-"na segurança a seguir à finalização desta versão Mandrakelinux. Se não\n"</div><div class='add'>+"na segurança a seguir à finalização desta versão Mandrivalinux. Se não\n"</div><div class='ctx'> "souber que serviço particular é suposto fazer ou porque é instalado, então\n"</div><div class='ctx'> "clique em \"%s\". Ao clicar em \"%s\" irá instalar os serviços listados e\n"</div><div class='ctx'> "serºao iniciados automaticamente no arranque. !!\n"</div><div class='hunk'>@@ -4309,7 +4309,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4365,7 +4365,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (para Sistema X Window) é o coração do interface gráfico GNU/Linux no\n"</div><div class='ctx'> "qual todos os ambientes gráficos (KDE, GNOME, AfterStep, WindowMaker,\n"</div><div class='del'>-"etc.) fornecidos com o Mandrakelinux, funcionam.\n"</div><div class='add'>+"etc.) fornecidos com o Mandrivalinux, funcionam.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Irá ver uma lista de parâmetros diferentes para mudar, para poder\n"</div><div class='ctx'> "ter uma boa apresentação gráfica\n"</div><div class='hunk'>@@ -4486,12 +4486,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4518,7 +4518,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4527,7 +4527,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4548,11 +4548,11 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Agora precisa decidir onde deseja instalar o sistema operativo\n"</div><div class='del'>-"Mandrakelinux no seu disco rígido. Se o seu disco rígido estiver vazio\n"</div><div class='add'>+"Mandrivalinux no seu disco rígido. Se o seu disco rígido estiver vazio\n"</div><div class='ctx'> "ou, se um sistema operativo existente usa todo o espaço disponível,\n"</div><div class='ctx'> "irá ser preciso particionar o disco. Básicamente, particionar um disco\n"</div><div class='ctx'> "rígido significa dividi-lo de maneira lógica para criar o espaço\n"</div><div class='del'>-"necessário para instalar o seu novo sistema Mandrakelinux.\n"</div><div class='add'>+"necessário para instalar o seu novo sistema Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Como os efeitos da operação de particionamento são geralmente\n"</div><div class='ctx'> "irreversíveis, e pode levar a perda de dados, particionar pode ser\n"</div><div class='hunk'>@@ -4589,7 +4589,7 @@ msgstr ""</div><div class='ctx'> "seus dados ou instalar novo software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". Se deseja apagar todos os dados e todas as partições presentes\n"</div><div class='del'>-"no disco rígido e substituí-los pelo seu novo sistema Mandrakelinux, "</div><div class='add'>+"no disco rígido e substituí-los pelo seu novo sistema Mandrivalinux, "</div><div class='ctx'> "escolha\n"</div><div class='ctx'> "esta opção. Seja cuidadoso, porque não será mais capaz de desfazer esta\n"</div><div class='ctx'> "operação após ter confirmado.\n"</div><div class='hunk'>@@ -4752,7 +4752,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4774,7 +4774,7 @@ msgstr ""</div><div class='ctx'> "Clique em \"%s\" quando estiver pronto para formatar as partições.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Clique em \"%s\" se deseja escolher outra partição para o seu novo\n"</div><div class='del'>-"sistema operativo Mandrakelinux.\n"</div><div class='add'>+"sistema operativo Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Clique em \"%s\" se deseja escolher partições para verificar se fisicamente\n"</div><div class='ctx'> "há blocos defeituosos (\"bad blocks\") no disco."</div><div class='hunk'>@@ -4791,7 +4791,7 @@ msgstr "Anterior"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4803,7 +4803,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"No momento que instala o Mandrakelinux, é quase certo que alguns\n"</div><div class='add'>+"No momento que instala o Mandrivalinux, é quase certo que alguns\n"</div><div class='ctx'> "pacotes terão sido actualizados desde a distribuição inicial. Alguns\n"</div><div class='ctx'> "erros podem ter sido corrigidos, e problemas de segurança resolvidos.\n"</div><div class='ctx'> "Para lhe permitir beneficiar destas actualizações, está agora apto a fazer\n"</div><div class='hunk'>@@ -4832,7 +4832,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4846,7 +4846,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Se não sabe o que escolher, deixe o valor predefinido. Poderá alterá-lo\n"</div><div class='ctx'> "mais tarde com a ferramenta draksec, que faz parte do Centro de Controlo\n"</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Preencha o campo \"%s\" com o e-mail da pessoa responsável pela\n"</div><div class='ctx'> "segurança. As mensagens de segurança serão enviadas para esse e-mail."</div><div class='hunk'>@@ -4860,7 +4860,7 @@ msgstr "Administrador de Segurança"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4931,7 +4931,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Neste fase, precisa escolher que partições vão ser utilizadas para a\n"</div><div class='del'>-"instalação do seu sistema Mandrakelinux. Se já foram definidas partições,\n"</div><div class='add'>+"instalação do seu sistema Mandrivalinux. Se já foram definidas partições,\n"</div><div class='ctx'> "seja por uma instalação anterior do GNU/Linux seja por outra ferramenta de\n"</div><div class='ctx'> "particionamento, pode utilizar-las . Senão, precisa definir partições no\n"</div><div class='ctx'> "disco rígido.\n"</div><div class='hunk'>@@ -5018,7 +5018,7 @@ msgstr "Alterna entre os modos normal/perito"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5048,7 +5048,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mais do que uma partição Microsoft foi detectada no seu disco rígido.\n"</div><div class='ctx'> "Por favor escolha qual deseja redimencionar para poder instalar o seu\n"</div><div class='del'>-"novo sistema operativo Mandrakelinux.\n"</div><div class='add'>+"novo sistema operativo Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cada partição é listada da seguinte maneira: \"Nome Linux\",\n"</div><div class='ctx'> "\"Nome Windows\", \"Capacidade\".\n"</div><div class='hunk'>@@ -5095,7 +5095,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5104,19 +5104,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Este passo só fica disponível se uma partição GNU/Linux existente for\n"</div><div class='ctx'> "encontrada na sua máquina.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "O DrakX agora precisa saber se deseja fazer uma nova instalação ou uma\n"</div><div class='del'>-"actualização num sistema Mandrakelinux existente:\n"</div><div class='add'>+"actualização num sistema Mandrivalinux existente:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Para a maior parte, isto apaga completamente o sistema antigo.\n"</div><div class='ctx'> "No entanto, dependendo no seu esquema de particionamento, pode prevenir\n"</div><div class='hunk'>@@ -5128,14 +5128,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Este tipo de instalação permite actualizar os pacotes "</div><div class='ctx'> "actualmente\n"</div><div class='del'>-"instalados no seu sistema Mandrakelinux. O seu actual esquema de\n"</div><div class='add'>+"instalados no seu sistema Mandrivalinux. O seu actual esquema de\n"</div><div class='ctx'> "particionamento, assim como os dados dos utilizadores não serão alterados.\n"</div><div class='ctx'> "A maior parte dos outros passos da configuração permanece disponível e "</div><div class='ctx'> "similar a uma instalação standard.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "A opção ``Actualizar'' deverá funcionar correctamente nos sistemas\n"</div><div class='del'>-"Mandrakelinux versão \"8.1\" ou superior. É desaconselhável actualizar\n"</div><div class='del'>-"versões anteriores à versão \"8.1\" do Mandrakelinux."</div><div class='add'>+"Mandrivalinux versão \"8.1\" ou superior. É desaconselhável actualizar\n"</div><div class='add'>+"versões anteriores à versão \"8.1\" do Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5191,7 +5191,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5233,7 +5233,7 @@ msgstr ""</div><div class='ctx'> "Sobre o suporte UTF-8 (unicode): Unicode é uma codificação de caracter\n"</div><div class='ctx'> "feito para cobrir todas as linguagens existentes. No entanto o seu suporte\n"</div><div class='ctx'> "completo em GNU/Linux ainda está a ser desenvolvido. Por essa razão,\n"</div><div class='del'>-"o uso de UTF-8 em Mandrakelinux depende das escolhas do utilizador:\n"</div><div class='add'>+"o uso de UTF-8 em Mandrivalinux depende das escolhas do utilizador:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Se escolher uma linguagem com um forte legado de codificação\n"</div><div class='ctx'> "(linguagens latin1, Russo, Japonês, ChinêsCoreano, Tailandês, grego, turco,\n"</div><div class='hunk'>@@ -5474,7 +5474,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5495,11 +5495,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Agora, é tempo de escolher o sistema de impressão para o seu computador.\n"</div><div class='del'>-"Outros sistemas operativos podem oferecer um, mas o Mandrakelinux\n"</div><div class='add'>+"Outros sistemas operativos podem oferecer um, mas o Mandrivalinux\n"</div><div class='ctx'> "oferece dois. Cada um dos sistemas de impressão é bem servido para tipos\n"</div><div class='ctx'> "particulares de configuração.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5520,7 +5520,7 @@ msgstr ""</div><div class='ctx'> "interfaces gráficos para imprimir ou escolher as opções de impressão.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Poderá mudar a sua escolha de sistema após a instalação correndo o\n"</div><div class='del'>-"PrinterDrake a partir do Centro de Controlo Mandrakelinux e clicando\n"</div><div class='add'>+"PrinterDrake a partir do Centro de Controlo Mandrivalinux e clicando\n"</div><div class='ctx'> "no botão \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='hunk'>@@ -5640,7 +5640,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5657,7 +5657,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5706,7 +5706,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": se deseja configurar a sua internet ou acesso de rede local\n"</div><div class='ctx'> "pode fazê-lo. Refira-se a documentação impressa ou use o Centro de\n"</div><div class='del'>-"Controlo do Mandrakelinux a seguir a instalação ter terminado de\n"</div><div class='add'>+"Controlo do Mandrivalinux a seguir a instalação ter terminado de\n"</div><div class='ctx'> "beneficiar da ajuda incluída.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": permite-lhe configurar endereços HTTP e FTP proxy se a máquina\n"</div><div class='hunk'>@@ -5724,7 +5724,7 @@ msgstr ""</div><div class='ctx'> "clique nesse botão. Isto deveria ser reservado aos utilizadores\n"</div><div class='ctx'> "avançados.Referira-se à documentação impressa, ou à linha de ajuda\n"</div><div class='ctx'> "sobre a configuração de carregador de arranque (bootloader) no\n"</div><div class='del'>-"Centro de Controlo Mandrakelinux.\n"</div><div class='add'>+"Centro de Controlo Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": através desta entrada pode ajustar quais os serviços que serão\n"</div><div class='ctx'> "executados na sua máquina. Se planeia configurar esta máquina como\n"</div><div class='hunk'>@@ -5785,11 +5785,11 @@ msgstr "Serviços"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Escolha o disco que deseja apagar para instalar a sua nova partição\n"</div><div class='del'>-"Mandrakelinux. Tenha cuidado, todos os ficheiros no disco serão\n"</div><div class='add'>+"Mandrivalinux. Tenha cuidado, todos os ficheiros no disco serão\n"</div><div class='ctx'> "perdidos de forma irrecuperável!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6141,12 +6141,12 @@ msgstr "A calcular o tamanho da partição Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A sua partição Windows está demasiado fragmentada. Por favor reinicie o seu "</div><div class='ctx'> "computador em Windows, execute a utilidade ``defrag'', depois recomece a "</div><div class='del'>-"instalação Mandrakelinux"</div><div class='add'>+"instalação Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6261,19 +6261,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6295,7 +6295,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6303,14 +6303,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6320,7 +6320,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6340,10 +6340,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6354,11 +6354,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6374,24 +6374,24 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Introdução\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "O sistema operativo e os diferentes elementos disponíveis na distribuição "</div><div class='del'>-"Mandrakelinux \n"</div><div class='add'>+"Mandrivalinux \n"</div><div class='ctx'> "deveriam ser chamados os \"Produtos de Software\" a partir daqui. Os "</div><div class='ctx'> "Produtos de Software incluem, \n"</div><div class='ctx'> "mas não se limitam a, o grupo de programas, métodos, regras e documentações "</div><div class='ctx'> "relativos ao sistema operativo \n"</div><div class='del'>-"assim como os diferentes elementos da distribuição Mandrakelinux.\n"</div><div class='add'>+"assim como os diferentes elementos da distribuição Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Termo de licença\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Por favor leia com atenção este documento. Este documento é o termo de "</div><div class='ctx'> "licença entre você e \n"</div><div class='del'>-"a Mandrakesoft S.A. que se aplica aos Produtos de Software.\n"</div><div class='add'>+"a Mandriva S.A. que se aplica aos Produtos de Software.\n"</div><div class='ctx'> "Ao instalar, duplicar ou usar os Produtos de Software de qualquer maneira, "</div><div class='ctx'> "aceita explicitamente \n"</div><div class='ctx'> "e completamente os termos e condições desta Licença. \n"</div><div class='hunk'>@@ -6412,20 +6412,20 @@ msgstr ""</div><div class='ctx'> "Os Produtos de Software e a documentação são fornecidos \"como estão\", sem "</div><div class='ctx'> "nenhuma garantia, \n"</div><div class='ctx'> "quanto permitido pela lei.\n"</div><div class='del'>-"Mandrakesoft S.A. não vai ser, em nenhuma circunstância e quanto permitido "</div><div class='add'>+"Mandriva S.A. não vai ser, em nenhuma circunstância e quanto permitido "</div><div class='ctx'> "pela lei, responsável de qualquer\n"</div><div class='ctx'> "acidente particular, dos danos directos ou indirectos (inclusive os "</div><div class='ctx'> "resultantes de perda de lucros, interrupção\n"</div><div class='ctx'> "de negócios, perda de informações e dividas legais resultando dum julgamento,"</div><div class='ctx'> "ou qualquer ou perca consequente) \n"</div><div class='ctx'> "decorrentes do uso ou da impossibilidade de usar os Produtos de Software, "</div><div class='del'>-"mesmo se a Mandrakesoft S.A. foi \n"</div><div class='add'>+"mesmo se a Mandriva S.A. foi \n"</div><div class='ctx'> "avisada da possibilidade de ocorrimento de tais danos.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITAÇÃO DE RESPONSABILIDADE LIGADA A POSSESSÃO OU UTILIZAÇÃO DE PROGRAMAS "</div><div class='ctx'> "PROIBIDOS EM CERTOS PAÍSES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Pelo que é permitido por lei, a Mandrakesoft S.A. ou os seus distribuidores "</div><div class='add'>+"Pelo que é permitido por lei, a Mandriva S.A. ou os seus distribuidores "</div><div class='ctx'> "não vão ser, em nenhuma\n"</div><div class='ctx'> "circunstância, ser responsável por quaisque danos directos ou indirectos "</div><div class='ctx'> "(inclusive os resultantes\n"</div><div class='hunk'>@@ -6433,7 +6433,7 @@ msgstr ""</div><div class='ctx'> "legais resultado de um\n"</div><div class='ctx'> "julgamento, ou qualquer perca consequente) decorrentes da possessão, do uso "</div><div class='ctx'> "ou do descarregamento\n"</div><div class='del'>-"dos Produtos de Software a partir de um dos servidores da Mandrakelinux que "</div><div class='add'>+"dos Produtos de Software a partir de um dos servidores da Mandrivalinux que "</div><div class='ctx'> "sejam proibidos\n"</div><div class='ctx'> "ou limitados pela lei em certos países pelas leis locais.\n"</div><div class='ctx'> "Este limite de responsabilidade inclui, mas não se limita aos elementos de "</div><div class='hunk'>@@ -6455,9 +6455,9 @@ msgstr ""</div><div class='ctx'> "usar qualquer\n"</div><div class='ctx'> "componente. Qualquer pergunta sobre uma da licença deve ser endereçada ao "</div><div class='ctx'> "autor do componente\n"</div><div class='del'>-"e não à Mandrakesoft. O programas desenvolvidos pela Mandrakesoft S.A. são "</div><div class='add'>+"e não à Mandriva. O programas desenvolvidos pela Mandrakesoft S.A. são "</div><div class='ctx'> "publicados sob os\n"</div><div class='del'>-"termos da licença GPL. A documentação escrita por Mandrakesoft S.A. é "</div><div class='add'>+"termos da licença GPL. A documentação escrita por Mandriva S.A. é "</div><div class='ctx'> "publicada sob uma licença\n"</div><div class='ctx'> "especifica. Por favor veja a documentação para mais detalhes.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6468,11 +6468,11 @@ msgstr ""</div><div class='ctx'> "autores respectivos \n"</div><div class='ctx'> "e são protegidos pela propriedade intelectual e pelas leis de Copyright "</div><div class='ctx'> "aplicáveis a produtos de software.\n"</div><div class='del'>-"Mandrakesoft S.A. reserva os seus direitos de modificar ou adaptar os "</div><div class='add'>+"Mandriva S.A. reserva os seus direitos de modificar ou adaptar os "</div><div class='ctx'> "Produtos de Software, como um \n"</div><div class='ctx'> "todo ou parcialmente, em qualquer sentido e para todos os fins.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" e os logotipos associados são marcas "</div><div class='del'>-"registradas da Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" e os logotipos associados são marcas "</div><div class='add'>+"registradas da Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Legislação em Vigor \n"</div><div class='hunk'>@@ -6487,7 +6487,7 @@ msgstr ""</div><div class='ctx'> "resolvidos sem tribunal. \n"</div><div class='ctx'> "Como ultima solução, o desacordo será referido ao Tribunal de Paris - "</div><div class='ctx'> "França.\n"</div><div class='del'>-"Para qualquer pergunta sobre este documento, contacte por favor Mandrakesoft "</div><div class='add'>+"Para qualquer pergunta sobre este documento, contacte por favor Mandriva "</div><div class='ctx'> "S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -6579,7 +6579,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6587,14 +6587,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Parabéns, a instalação está completa.\n"</div><div class='ctx'> "Retire a media de arranque e clique em Enter para reiniciar.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Para informação das correcções disponíveis para esta versão do "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consulte a Errata disponível em: \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6602,7 +6602,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informação em configurar o seu sistema está disponivel no\n"</div><div class='del'>-"capítulo pós-instalação do Guia Oficial do Utilizador do Mandrakelinux."</div><div class='add'>+"capítulo pós-instalação do Guia Oficial do Utilizador do Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6637,12 +6637,12 @@ msgstr "A entrar no passo `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "O seu sistema está baixo em recursos. Pode ter algum problema na\n"</div><div class='del'>-"instalação do Mandrakelinux. Se isso ocorrer, pode tentar instalar usando o\n"</div><div class='add'>+"instalação do Mandrivalinux. Se isso ocorrer, pode tentar instalar usando o\n"</div><div class='ctx'> "modo texto. Para isso, prima `F1' no quadro de inicialização e escreva "</div><div class='ctx'> "`text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7184,9 +7184,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"A contactar o site Mandrakelinux para transferir a lista dos mirrors "</div><div class='add'>+"A contactar o site Mandrivalinux para transferir a lista dos mirrors "</div><div class='ctx'> "disponíveis..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7411,8 +7411,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Instalação do Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Instalação do Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9998,13 +9998,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Configurador drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Isto configura uma firewall pessoal para esta máquina Mandrakelinux.\n"</div><div class='add'>+"Isto configura uma firewall pessoal para esta máquina Mandrivalinux.\n"</div><div class='ctx'> "Para uma solução firewall poderosa e dedicada, por favor veja a \n"</div><div class='ctx'> "distribuição especializada MandrakeSecurity Firewall."</div><div class='ctx'> </div><div class='hunk'>@@ -14080,7 +14080,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16047,23 +16047,23 @@ msgstr "Parar"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;O que é o Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;O que é o Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Bem-vindo ao &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Bem-vindo ao &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"O Mandrakelinux é uma &lt;b&gt;distribuição Linux&lt;/b&gt;que abrange o núcleo do "</div><div class='add'>+"O Mandrivalinux é uma &lt;b&gt;distribuição Linux&lt;/b&gt;que abrange o núcleo do "</div><div class='ctx'> "sistema, chamado de&lt;b&gt;sistema operativo&lt;/b&gt; (baseado no kernel Linux) junto "</div><div class='ctx'> "com &lt;b&gt;muitas aplicalçoes&lt;/b&gt; que vão de encontro a todas as vossas "</div><div class='ctx'> "necessidades."</div><div class='hunk'>@@ -16071,10 +16071,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"O Mandrakelinux é a distribuição Lunix que hoje é a mais &lt;b&gt;user-friendly&lt;/"</div><div class='add'>+"O Mandrivalinux é a distribuição Lunix que hoje é a mais &lt;b&gt;user-friendly&lt;/"</div><div class='ctx'> "b&gt;. É também uma das &lt;b&gt;mais usadas&lt;/b&gt; distribuições Linux a nível mundial!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16090,15 +16090,15 @@ msgstr "Bemvindo ao &lt;b&gt;mundo do Open Source&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"O Mandrakelinux está comprometido com o modelo open source. Isto significa "</div><div class='add'>+"O Mandrivalinux está comprometido com o modelo open source. Isto significa "</div><div class='ctx'> "que as novas versões são o resultado da &lt;b&gt;colaboração&lt;/b&gt; entre a &lt;b&gt; "</div><div class='del'>-"Equipa de programadores da Mandrakesoft&lt;/b&gt; e a &lt;b&gt;comunidade mundial&lt;/b&gt; de "</div><div class='del'>-"contribuidores Mandrakelinux."</div><div class='add'>+"Equipa de programadores da Mandriva&lt;/b&gt; e a &lt;b&gt;comunidade mundial&lt;/b&gt; de "</div><div class='add'>+"contribuidores Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16118,7 +16118,7 @@ msgstr "&lt;b&gt;O GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A maior parte do software incluido na distribuição e todas as ferramentas "</div><div class='ctx'> "Mandraelinux são licensiadas sob a licença &lt;b&gt;GPL&lt;/b&gt;."</div><div class='hunk'>@@ -16151,15 +16151,15 @@ msgstr "&lt;b&gt;Junte-se à Comunidade&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"O Mandrakelinux tem uma das &lt;b&gt;maiores comunidades&lt;/b&gt; de utilizadores e "</div><div class='add'>+"O Mandrivalinux tem uma das &lt;b&gt;maiores comunidades&lt;/b&gt; de utilizadores e "</div><div class='ctx'> "programadores. O papel de tal comunidade é muito variado, indo desde "</div><div class='ctx'> "comunicar um erro, à programação de novas aplicações. A comunidade "</div><div class='del'>-"desempenha &lt;b&gt;papel chave&lt;/b&gt; no mundo Mandrakelinux."</div><div class='add'>+"desempenha &lt;b&gt;papel chave&lt;/b&gt; no mundo Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16180,11 +16180,11 @@ msgstr "&lt;b&gt;Versão Download&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Está agora a instalar o &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Esta é a versão livre "</div><div class='del'>-"que o Mandrakesoft quer manter &lt;b&gt;disponivel para toda a gente&lt;/b&gt;."</div><div class='add'>+"Está agora a instalar o &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Esta é a versão livre "</div><div class='add'>+"que o Mandriva quer manter &lt;b&gt;disponivel para toda a gente&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16216,10 +16216,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Também não irá ter acesso aos &lt;b&gt;serviçõs incluidos&lt;/b&gt; nos outros produtos "</div><div class='del'>-"Mandrakesoft."</div><div class='add'>+"Mandriva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16228,8 +16228,8 @@ msgstr "&lt;b&gt;Discovery, O Seu Primeiro Linux Desktop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Está agora a instalar o &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Está agora a instalar o &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16251,17 +16251,17 @@ msgstr "&lt;b&gt;PowerPack, O Último Linux Desktop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Está agora a instalar o &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Está agora a instalar o &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack é o &lt;b&gt;premier&lt;/b&gt; Linux desktop da Mandrakesoft. O PowerPack "</div><div class='add'>+"PowerPack é o &lt;b&gt;premier&lt;/b&gt; Linux desktop da Mandriva. O PowerPack "</div><div class='ctx'> "contém &lt;b&gt;milhares de aplicações&lt;/b&gt; tudo desde o mais popular ao mais "</div><div class='ctx'> "avançado."</div><div class='ctx'> </div><div class='hunk'>@@ -16272,8 +16272,8 @@ msgstr "&lt;b&gt;PowerPack+, A Solução Linux Desktop e Servidores&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Está agora a instalar o &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Está agora a instalar o &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16289,22 +16289,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produtos Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produtos Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; desenvolveu uma grande variedade de produtos "</div><div class='del'>-"&lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; desenvolveu uma grande variedade de produtos "</div><div class='add'>+"&lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Os produtos Mandrakelinux são:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Os produtos Mandrivalinux são:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16324,74 +16324,74 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, A Solução Linux para Desktops e Servidores."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux para x86-64&lt;/b&gt;, A solução Mandrakelinux para tirar "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux para x86-64&lt;/b&gt;, A solução Mandrivalinux para tirar "</div><div class='ctx'> "melhor partido do seu processador 64-bit."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produtos Mandrakesoft (Produtos Nomad)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produtos Mandriva (Produtos Nomad)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"A Mandrakesoft desenvolveu dois produtos que lhe permitem usar o "</div><div class='del'>-"Mandrakelinux&lt;b&gt;em qualquer computer&lt;/b&gt; e sem qualquer necessidade de o "</div><div class='add'>+"A Mandriva desenvolveu dois produtos que lhe permitem usar o "</div><div class='add'>+"Mandrivalinux&lt;b&gt;em qualquer computer&lt;/b&gt; e sem qualquer necessidade de o "</div><div class='ctx'> "instalar:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, uma distribuição Mandrakelinux que corre inteiramente deCD-"</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, uma distribuição Mandrivalinux que corre inteiramente deCD-"</div><div class='ctx'> "Rom de arranque."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, uma distribuição Mandrakelinux pre-instalada no seu "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, uma distribuição Mandrivalinux pre-instalada no seu "</div><div class='ctx'> "ultra-compacto “LaCie Mobile Hard Drive”."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produtos Mandrakesoft (Soluções Profissionais)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produtos Mandriva (Soluções Profissionais)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Em baixo estão os produtos Mandrakesoft feitos para ir de encontro às suas "</div><div class='add'>+"Em baixo estão os produtos Mandriva feitos para ir de encontro às suas "</div><div class='ctx'> "&lt;b&gt;necessidades profissionais&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, O Desktop Mandrakelinux para Negócios."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, O Desktop Mandrivalinux para Negócios."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, A Solução Mandrakelinux para Servidores."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, A Solução Mandrivalinux para Servidores."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, A Solução Mandrakelinux de Segurança."</div><div class='add'>+"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, A Solução Mandrivalinux de Segurança."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16434,10 +16434,10 @@ msgstr "&lt;b&gt;Escolha o seu Ambiente de Trabalho Gráfico Favorito&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Com o PowerPack, irá ter a escolha do &lt;b&gt;ambiente de trabalho gráfico&lt;/b&gt;. A "</div><div class='del'>-"Mandrakesoft escolheu o &lt;b&gt;KDE&lt;/b&gt; como ambiente padrão."</div><div class='add'>+"Mandriva escolheu o &lt;b&gt;KDE&lt;/b&gt; como ambiente padrão."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16461,10 +16461,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Com o PowerPack+ irá ter a escolher de um &lt;b&gt;ambiente de trabalho gráfico&lt;/"</div><div class='del'>-"b&gt;. A Mandrakesoft escolheu o &lt;b&gt;KDE&lt;/b&gt; como ambiente padrão."</div><div class='add'>+"b&gt;. A Mandriva escolheu o &lt;b&gt;KDE&lt;/b&gt; como ambiente padrão."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16590,10 +16590,10 @@ msgstr "&lt;b&gt;Aprecie o Grande Número de Aplicações Disponiveis&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"No menu Mandrakelinux irá encontrar aplicações &lt;b&gt;fáceis de usar&lt;/b&gt;para "</div><div class='add'>+"No menu Mandrivalinux irá encontrar aplicações &lt;b&gt;fáceis de usar&lt;/b&gt;para "</div><div class='ctx'> "todas as suas tarefas:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16861,18 +16861,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Centro de Controlo Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Centro de Controlo Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"O &lt;b&gt;Centro de Controlo Mandrakelinux&lt;/b&gt; é uma colecção essencial de  "</div><div class='del'>-"utilidades específicas do Mandrakelinux para que simplificar a configuração "</div><div class='add'>+"O &lt;b&gt;Centro de Controlo Mandrivalinux&lt;/b&gt; é uma colecção essencial de  "</div><div class='add'>+"utilidades específicas do Mandrivalinux para que simplificar a configuração "</div><div class='ctx'> "do seu computador."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16897,16 +16897,16 @@ msgstr "&lt;b&gt;O Modelo Open Source&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Como todos os programas de computador, o software open source &lt;b&gt;requer "</div><div class='ctx'> "tempo e pessoas&lt;/b&gt; para programação. Para respeitar a filosofia open "</div><div class='del'>-"source, as vendas da Mandrakesoft adicionaram valiosos produtos e serviços "</div><div class='del'>-"para &lt;b&gt;continuar a melhorar o Mandrakelinux&lt;/b&gt;. Se quer dar &lt;b&gt;suporte à "</div><div class='del'>-"filosofia open source&lt;/b&gt; e programação do Mandrakelinux, &lt;b&gt;por favor&lt;/b&gt; "</div><div class='add'>+"source, as vendas da Mandriva adicionaram valiosos produtos e serviços "</div><div class='add'>+"para &lt;b&gt;continuar a melhorar o Mandrivalinux&lt;/b&gt;. Se quer dar &lt;b&gt;suporte à "</div><div class='add'>+"filosofia open source&lt;/b&gt; e programação do Mandrivalinux, &lt;b&gt;por favor&lt;/b&gt; "</div><div class='ctx'> "considere comprar um dos nossos produtos ou serviços!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16917,10 +16917,10 @@ msgstr "&lt;b&gt;Loja Online&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Para aprender mais acerca dos produtos e serviços Mandrakesoft, pode visitar "</div><div class='add'>+"Para aprender mais acerca dos produtos e serviços Mandriva, pode visitar "</div><div class='ctx'> "a nossa &lt;b&gt;plataforma comercial&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16944,24 +16944,24 @@ msgstr "Pare por hoje em &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; é a &lt;b&gt;companhia perfeita&lt;/b&gt; para o seu produto "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; é a &lt;b&gt;companhia perfeita&lt;/b&gt; para o seu produto "</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Tire proveito de &lt;b&gt;valiosos benefícios&lt;/b&gt;, juntando-se ao Mandrakeclub, "</div><div class='add'>+"Tire proveito de &lt;b&gt;valiosos benefícios&lt;/b&gt;, juntando-se ao Mandriva Club, "</div><div class='ctx'> "tais como:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16984,40 +16984,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Participação em &lt;b&gt;foruns para utilizadores&lt;/b&gt; Mandrakelinuxe."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Participação em &lt;b&gt;foruns para utilizadores&lt;/b&gt; Mandrivalinuxe."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Acesso em primeira mão e priviligeado, antes da saída pública das "</div><div class='del'>-"&lt;b&gt;imagens ISO&lt;/b&gt; Mandrakelinux."</div><div class='add'>+"&lt;b&gt;imagens ISO&lt;/b&gt; Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; é um novo serviço premium que a Mandrakesoft está "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; é um novo serviço premium que a Mandriva está "</div><div class='ctx'> "orgulhosa de apresentar aos seus clientes!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"A Mandrakeonline fornece uma grande variadade de valiosos serviçõs para "</div><div class='del'>-"&lt;b&gt;fácilmente actuaçizar&lt;/b&gt; os seus sistemas Mandrakelinux."</div><div class='add'>+"A Mandriva Online fornece uma grande variadade de valiosos serviçõs para "</div><div class='add'>+"&lt;b&gt;fácilmente actuaçizar&lt;/b&gt; os seus sistemas Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17043,40 +17043,40 @@ msgstr "\t* Actualizações flexiveis e &lt;b&gt;programadas&lt;/b&gt;."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Gerenciamento de &lt;b&gt;todo o seu sistema Mandrakelinux&lt;/b&gt; com uma conta."</div><div class='add'>+"\t* Gerenciamento de &lt;b&gt;todo o seu sistema Mandrivalinux&lt;/b&gt; com uma conta."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Requer &lt;b&gt;assitência?&lt;/b&gt; Conheça os tecnicos da Mandrakesoft peritos no "</div><div class='add'>+"Requer &lt;b&gt;assitência?&lt;/b&gt; Conheça os tecnicos da Mandriva peritos no "</div><div class='ctx'> "suporte tecnico da nossa plataforma&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Obirgado pela ajuda dos &lt;b&gt;peritos qualificados Mandrakelinux&lt;/b&gt;, irá "</div><div class='add'>+"Obirgado pela ajuda dos &lt;b&gt;peritos qualificados Mandrivalinux&lt;/b&gt;, irá "</div><div class='ctx'> "poupar muito tempo."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Para qualquer questão relacionada com o Mandrakelinux, tem a possibilidade "</div><div class='add'>+"Para qualquer questão relacionada com o Mandrivalinux, tem a possibilidade "</div><div class='ctx'> "de comprar suporte para os incidentes em &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17378,8 +17378,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Assistentes MandrakeSoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Assistentes Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17529,7 +17529,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17543,7 +17543,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPÇÕES]...\n"</div><div class='del'>-"Configurador do Servidor de Terminais Mandrakelinux\n"</div><div class='add'>+"Configurador do Servidor de Terminais Mandrivalinux\n"</div><div class='ctx'> "--enable         : activa o STM\n"</div><div class='ctx'> "--disable        : desactiva o STM\n"</div><div class='ctx'> "--start          : inicia o STM\n"</div><div class='hunk'>@@ -17601,7 +17601,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17609,7 +17609,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPÇÃO]...\n"</div><div class='ctx'> "  --no-confirmation      não pede pela primeira confirmação em modo "</div><div class='del'>-"MandrakeUpdate\n"</div><div class='add'>+"Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        não verifica as assinaturas dos pacotes\n"</div><div class='ctx'> "  --changelog-first      mostra o registo das mudanças antes da lista dos "</div><div class='ctx'> "ficheiros na janela de descrições\n"</div><div class='hunk'>@@ -20397,13 +20397,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Ferramenta Mandrakelinux para Comunicar Erros"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Ferramenta Mandrivalinux para Comunicar Erros"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Centro de Controlo Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Centro de Controlo Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20423,8 +20423,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20468,8 +20468,8 @@ msgstr "Assistentes de Configuração"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Seleccione a Ferramenta Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Seleccione a Ferramenta Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20893,20 +20893,20 @@ msgstr "Iniciado no arranque"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Este interface ainda não foi configurado.\n"</div><div class='ctx'> "Use o assistente \"Adicionar um interface\" a partir do Centro de Controlo "</div><div class='del'>-"Mandrakelinux"</div><div class='add'>+"Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Não tem qualquer conexão Internet configurada.\n"</div><div class='del'>-"Execute o assistente \"%s\" a partir do Centro de Controlo Mandrakelinux"</div><div class='add'>+"Execute o assistente \"%s\" a partir do Centro de Controlo Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20956,8 +20956,8 @@ msgstr "KDM (KDE Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21258,7 +21258,7 @@ msgstr "Importar"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21267,7 +21267,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright © 2001-2002 por Mandrakesoft \n"</div><div class='add'>+"Copyright © 2001-2002 por Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (versão original)\n"</div><div class='hunk'>@@ -21814,14 +21814,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright © 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright © 2003-2004 Mandriva.\n"</div><div class='ctx'> "Iste é software livre e pode ser redistribuido sob a licença GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Uso: \n"</div><div class='hunk'>@@ -21850,8 +21850,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Centro de Ajuda Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Centro de Ajuda Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25390,8 +25390,8 @@ msgstr "A mudança está feita, mas para ser efectiva é preciso sair/logout"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Registos das Ferramentas Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Registos das Ferramentas Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25905,10 +25905,10 @@ msgstr "Conexão completa"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A conexão falhou.\n"</div><div class='del'>-"Verifique a sua configuração no Centro de Controlo Mandrakelinux."</div><div class='add'>+"Verifique a sua configuração no Centro de Controlo Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/pt_BR.po b/perl-install/share/po/pt_BR.po<br/>index 4ae0e9d84..ac51ea271 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/pt_BR.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/pt_BR.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/pt_BR.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/pt_BR.po</a></div><div class='hunk'>@@ -81,14 +81,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A chave USB deve estar com proteção de gravação e não é possível desconectá\n"</div><div class='ctx'> "-la com segurança agora.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Clique no botão para reiniciar o computador, retire a chave USB, remova a\n"</div><div class='del'>-"proteção de gravação, conecte a chave, e execute o Mandrake Move outra vez."</div><div class='add'>+"proteção de gravação, conecte a chave, e execute o Mandriva Move outra vez."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -106,7 +106,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sua chave USB não tem nenhuma partição válida de Windows (FAT).\n"</div><div class='hunk'>@@ -115,13 +115,13 @@ msgstr ""</div><div class='ctx'> "máquinas que rodam Windows.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Você pode também continuar sem uma chave USB e usar o Mandrake\n"</div><div class='del'>-"Move como um sistema operacional Live CD do Mandrakelinux."</div><div class='add'>+"Move como um sistema operacional Live CD do Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -129,11 +129,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nenhuma chave USB foi detectada em seu sistema.  Se você\n"</div><div class='del'>-"conectar uma chave USB agora, o Mandrake Move terá a\n"</div><div class='add'>+"conectar uma chave USB agora, o Mandriva Move terá a\n"</div><div class='ctx'> "habilidade de manter transparente seus dados em seu\n"</div><div class='ctx'> "diretório home e configurar inteligentemente o sistema para\n"</div><div class='ctx'> "montá-lo no próximo boot, neste computador ou em outro.\n"</div><div class='hunk'>@@ -141,7 +141,7 @@ msgstr ""</div><div class='ctx'> "segundos para detectar novamente.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Você pode também continuar sem uma chave USB e usar o Mandrake\n"</div><div class='del'>-"Move como um sistema operacional Live CD do Mandrakelinux."</div><div class='add'>+"Move como um sistema operacional Live CD do Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -269,7 +269,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -285,7 +285,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Pode ser configuração corrompida do sistema de arquivos\n"</div><div class='ctx'> "da chave USB, neste caso remoera a chave e reiniciar o\n"</div><div class='del'>-"Mandrake Move resolverá o problema.  Para fazer assim,\n"</div><div class='add'>+"Mandriva Move resolverá o problema.  Para fazer assim,\n"</div><div class='ctx'> "clique no botão correspondente.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1327,11 +1327,11 @@ msgstr "Escolha de linguagem"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux tem suporte a múltiplos idiomas. Selecione\n"</div><div class='add'>+"Mandrivalinux tem suporte a múltiplos idiomas. Selecione\n"</div><div class='ctx'> "os que você deseja instalar. Eles estarão disponíveis após a\n"</div><div class='ctx'> "instalação e quando você reiniciar o seu sistema"</div><div class='ctx'> </div><div class='hunk'>@@ -3757,12 +3757,12 @@ msgstr "habilita o suporte a rádio"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Antes de continuar você deve ler com atenção os termos da Licença. Ela \n"</div><div class='del'>-"cobre a distribuição Mandrakelinux. Se você concorda com todos os termos,\n"</div><div class='add'>+"cobre a distribuição Mandrivalinux. Se você concorda com todos os termos,\n"</div><div class='ctx'> "clique em \"%s\". Se não concordar, clique no botão \"%s\"\n"</div><div class='ctx'> "para reiniciar seu computador."</div><div class='ctx'> </div><div class='hunk'>@@ -3949,13 +3949,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"O instalador do Mandrakelinux está espalhado em diferentes CD-ROMS.\n"</div><div class='add'>+"O instalador do Mandrivalinux está espalhado em diferentes CD-ROMS.\n"</div><div class='ctx'> "Se o pacote selecionado estiver localizado em outro CD-ROM, O DrakX irá\n"</div><div class='ctx'> "ejetar o CD atual e pedir para você inserir o CD necessário. Se você não "</div><div class='ctx'> "tiver\n"</div><div class='hunk'>@@ -3966,11 +3966,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4022,11 +4022,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Agora você deverá especificar quais programas deseja instalar no seu\n"</div><div class='del'>-"sistema. Existem centenas de pacotes disponíveis para o Mandrakelinux, e\n"</div><div class='add'>+"sistema. Existem centenas de pacotes disponíveis para o Mandrivalinux, e\n"</div><div class='ctx'> "para facilitar sua escolha eles foram agrupados em grupos de aplicações\n"</div><div class='ctx'> "similares.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux separou os pacotes em quatro categorias. Você pode\n"</div><div class='add'>+"Mandrivalinux separou os pacotes em quatro categorias. Você pode\n"</div><div class='ctx'> "misturar as aplicações de vários grupos, assim a \"Estação de Trabalho\" "</div><div class='ctx'> "pode ter aplicações do grupo \"Servidor\".\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4134,10 +4134,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4168,11 +4168,11 @@ msgstr ""</div><div class='ctx'> "!! Quando um pacote de servidor foi selecionado, intencionalmente ou por\n"</div><div class='ctx'> "ser parte de um grupo, você será solicitado para confirmar se realmente "</div><div class='ctx'> "deseja\n"</div><div class='del'>-"estes servidores instalados. Por padrão, no Mandrakelinux qualquer\n"</div><div class='add'>+"estes servidores instalados. Por padrão, no Mandrivalinux qualquer\n"</div><div class='ctx'> "serviço instalado será iniciado no boot.\n"</div><div class='ctx'> "Mesmo que sejam seguros e não possuam quaisquer dúvidas a respeito\n"</div><div class='ctx'> "quando da distribuição do pacote, é possível que brechas de segurança\n"</div><div class='del'>-"sejam descobertas depois que esta versão do Mandrakelinux foi concluída.\n"</div><div class='add'>+"sejam descobertas depois que esta versão do Mandrivalinux foi concluída.\n"</div><div class='ctx'> "Se você não sabe o que um determinado serviço faz ou porque está sendo\n"</div><div class='ctx'> "instalado, clique em \"%s\". Clicando em \"%s\", os serviços listados\n"</div><div class='ctx'> "serão instalados e serão iniciados automaticamente por Padrão quando o\n"</div><div class='hunk'>@@ -4328,7 +4328,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4384,7 +4384,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (para Sistema X Window) é o coração da interface gráfica do GNU/Linux\n"</div><div class='ctx'> "no qual todos os ambientes gráficos (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) fornecidos com o Mandrakelinux funcionam.\n"</div><div class='add'>+"WindowMaker, etc.) fornecidos com o Mandrivalinux funcionam.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Você será apresentado a uma lista de parâmetros que pode alterar para\n"</div><div class='ctx'> "obter uma ótima resolução gráfica. \n"</div><div class='hunk'>@@ -4501,12 +4501,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4533,7 +4533,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4542,7 +4542,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4563,11 +4563,11 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Neste ponto, você precisa escolher onde você quer instalar o seu sistema\n"</div><div class='del'>-"Mandrakelinux no seu disco rígido. Se seu disco estiver vazio ou se um\n"</div><div class='add'>+"Mandrivalinux no seu disco rígido. Se seu disco estiver vazio ou se um\n"</div><div class='ctx'> "sistema operacional existente usa todo o espaço disponível, você terá que\n"</div><div class='ctx'> "particioná-lo. Basicamente, particionar um disco rígido consiste em\n"</div><div class='ctx'> "dividi-lo logicamente para criar espaço para o seu novo sistema "</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Como os efeitos de um processo de particionamento são normalmente\n"</div><div class='ctx'> "irreversíveis, podendo levar à perda de dados do sistema operacional atual,\n"</div><div class='hunk'>@@ -4595,7 +4595,7 @@ msgstr ""</div><div class='ctx'> "Windows. O redimensionamento pode ser feito sem a perda de dados, desde\n"</div><div class='ctx'> "que você tenha desfragmentado previamente sua partição e a mesma esteja\n"</div><div class='ctx'> "formatada em FAT ou NTFS. Recomendamos veementemente fazer backup de seus\n"</div><div class='del'>-"dados. Essa solução é útil se você quiser usar o Mandrakelinux e o\n"</div><div class='add'>+"dados. Essa solução é útil se você quiser usar o Mandrivalinux e o\n"</div><div class='ctx'> "Microsoft Windows no mesmo computador.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Antes de escolher essa solução, compreenda que o tamanho de sua partição\n"</div><div class='hunk'>@@ -4605,7 +4605,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "* \"%s\": se você quiser apagar todos os dados e todas as partições\n"</div><div class='ctx'> "existentes no disco rígido e substituí-las pelo seu novo sistema "</div><div class='del'>-"Mandrakelinux, você pode escolher essa opção. Tenha cuidado\n"</div><div class='add'>+"Mandrivalinux, você pode escolher essa opção. Tenha cuidado\n"</div><div class='ctx'> "você não pode reverter sua escolha após a confirmação.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Se você escolher essa opção, todos seus dados atuais serão perdidos. !!\n"</div><div class='hunk'>@@ -4770,7 +4770,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4791,7 +4791,7 @@ msgstr ""</div><div class='ctx'> "Clique em \"%s\" quando estiver pronto para formatar as partições.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Clique em \"%s\" se você desejar escolher outras partições para instalar\n"</div><div class='del'>-"o seu novo sistema operacional Mandrakelinux.\n"</div><div class='add'>+"o seu novo sistema operacional Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Clique em \"%s\" se você quiser selecionar partições para serem\n"</div><div class='ctx'> "verificadas por bad blocks no disco."</div><div class='hunk'>@@ -4808,7 +4808,7 @@ msgstr "Anterior"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4820,7 +4820,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Neste momento em que você está instalando o Mandrakelinux é possível que\n"</div><div class='add'>+"Neste momento em que você está instalando o Mandrivalinux é possível que\n"</div><div class='ctx'> "alguns pacotes tenham sido atualizados após o lançamento inicial. Alguns\n"</div><div class='ctx'> "erros e falhas de seguranças podem ter sido corrigidos. Para poder se\n"</div><div class='ctx'> "beneficiar destas atualizações, você pode fazer o download destes pacotes\n"</div><div class='hunk'>@@ -4850,7 +4850,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4865,7 +4865,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Se você não souber o que escolher, fique com a opção padrão. Você poderá\n"</div><div class='ctx'> "trocar o nível de segurança depois usando a ferramenta draksec no Centro\n"</div><div class='del'>-"de Controle Mandrakelinux.\n"</div><div class='add'>+"de Controle Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "O campo \"%s\" pode informar ao sistema qual usuário será responsável\n"</div><div class='ctx'> "pela segurança. Mensagens de segurança serão enviadas para esse endereço."</div><div class='hunk'>@@ -4879,7 +4879,7 @@ msgstr "Administrador de Segurança"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4950,7 +4950,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Agora você precisa escolher qual(is) partição(ões) usará para instalar o\n"</div><div class='del'>-"seu novo sistema Mandrakelinux. Se as partições já estiverem definidas \n"</div><div class='add'>+"seu novo sistema Mandrivalinux. Se as partições já estiverem definidas \n"</div><div class='ctx'> "(através de uma instalação anterior do GNU/Linux ou outro software\n"</div><div class='ctx'> "particionador), você pode utilizá-las. Caso contrário, as partições\n"</div><div class='ctx'> "devem ser definidas.\n"</div><div class='hunk'>@@ -5035,7 +5035,7 @@ msgstr "Mudar para modo normal/ expert"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5065,7 +5065,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Mais de uma partição Microsoft Windows foi detectada em seu disco\n"</div><div class='ctx'> "rígido. Favor escolher a que você quer redimensionar para instalar o seu\n"</div><div class='del'>-"novo sistema operacional Mandrakelinux.\n"</div><div class='add'>+"novo sistema operacional Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Cada partição é listada da seguinte forma: \"Nome Linux\", \"Nome\n"</div><div class='ctx'> "Windows\" \"Capacidade\".\n"</div><div class='hunk'>@@ -5113,7 +5113,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5122,19 +5122,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Este passo só é mostrado se uma partição antiga do GNU/Linux foi\n"</div><div class='ctx'> "encontrada em seu computador.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "O DrakX precisa saber agora se você quer executar uma nova instalação\n"</div><div class='del'>-"ou fazer um upgrade no Mandrakelinux existente no seu sistema:\n"</div><div class='add'>+"ou fazer um upgrade no Mandrivalinux existente no seu sistema:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": A maioria das vezes, isto remove completamente o sistema antigo.\n"</div><div class='ctx'> "Porém, dependendo do seu modo de particionamento, você pode prevenir que\n"</div><div class='hunk'>@@ -5143,14 +5143,14 @@ msgstr ""</div><div class='ctx'> "sistema de arquivos, você deveria usar esta opção.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": este método de instalação lhe permite atualizar os pacotes\n"</div><div class='del'>-"atualmente instalado em seu sistema Mandrakelinux. Seu esquema\n"</div><div class='add'>+"atualmente instalado em seu sistema Mandrivalinux. Seu esquema\n"</div><div class='ctx'> "atual de particionamento e dados de usuário não serão alterados. A maioria\n"</div><div class='ctx'> "dos outro passos de configuração permanecem disponíveis, semelhantes a uma "</div><div class='ctx'> "instalação normal.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Usando a opção 'Upgrade' deve funcionar bem em sistemas Mandrakelinux da\n"</div><div class='add'>+"Usando a opção 'Upgrade' deve funcionar bem em sistemas Mandrivalinux da\n"</div><div class='ctx'> "versão \"8.1\" ou superior. Executar um Upgrade para versões anteriores\n"</div><div class='del'>-"ao Mandrakelinux \"8.1\" não é recomendado."</div><div class='add'>+"ao Mandrivalinux \"8.1\" não é recomendado."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5207,7 +5207,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5248,7 +5248,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Sobre o suporte a UTF-8 (unicode): Unicode é o novo conjunto de caracteres\n"</div><div class='ctx'> "para todas as linguagens existentes. O suporte completo em GNU/Linux ainda\n"</div><div class='del'>-"está em desenvolvimento. Por essa razão, Mandrakelinux irá usá-lo ou não\n"</div><div class='add'>+"está em desenvolvimento. Por essa razão, Mandrivalinux irá usá-lo ou não\n"</div><div class='ctx'> "dependendo da escolha do usuário:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "* Se você escolher linguagens legadas com uma forte codificação (linguagens\n"</div><div class='hunk'>@@ -5501,7 +5501,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5522,11 +5522,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Aqui você seleciona o sistema de impressão para o seu computador.\n"</div><div class='del'>-"Outros S.O.s podem oferecer-lhe apenas um, mas o Mandrakelinux \n"</div><div class='add'>+"Outros S.O.s podem oferecer-lhe apenas um, mas o Mandrivalinux \n"</div><div class='ctx'> "oferece dois.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- que significa 'print, do not queue', é a escolha caso você\n"</div><div class='hunk'>@@ -5551,7 +5551,7 @@ msgstr ""</div><div class='ctx'> "gerenciar a impressão.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Você poderá mudar a sua escolha após a instalação utilizando o\n"</div><div class='del'>-"PrinterDrake no Centro de Controle Mandrakelinux, e clicando no botão \"%s\"."</div><div class='add'>+"PrinterDrake no Centro de Controle Mandrivalinux, e clicando no botão \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5674,7 +5674,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5691,7 +5691,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5738,7 +5738,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": se você deseja configurar a Internet ou o acesso a uma rede\n"</div><div class='ctx'> "local, você pode fazê-lo agora. Verifique documentação impressa ou use\n"</div><div class='del'>-"o Centro de Controle Mandrakelinux após a instalação ter terminado para "</div><div class='add'>+"o Centro de Controle Mandrivalinux após a instalação ter terminado para "</div><div class='ctx'> "utilizar\n"</div><div class='ctx'> "total help in-line.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5756,7 +5756,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": se você deseja mudar sua configuração do gerenciador de\n"</div><div class='ctx'> "inicialização, clique no botão. Recomendado apenas aos usuários avançados.\n"</div><div class='ctx'> "Veja documentação impressa ou help in-line sobre configuração de bootloader\n"</div><div class='del'>-"no Centro de Controle do Mandrakelinux.\n"</div><div class='add'>+"no Centro de Controle do Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": você poderá escolher aqui quais serviços que serão iniciados\n"</div><div class='ctx'> "em sua máquina. Se você pretende usar sua máquina como servidor, é uma\n"</div><div class='hunk'>@@ -5817,11 +5817,11 @@ msgstr "Serviços"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Escolha o disco rígido que você quer apagar para instalar sua nova\n"</div><div class='del'>-"partição Mandrakelinux. Tenha cuidado, pois todos os dados existentes\n"</div><div class='add'>+"partição Mandrivalinux. Tenha cuidado, pois todos os dados existentes\n"</div><div class='ctx'> "serão perdidos e não poderão ser recuperados!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6176,12 +6176,12 @@ msgstr "Calculando o tamanho da partição Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sua partição Windows está muito fragmentada. Por favor reinicie seu "</div><div class='ctx'> "computador no modo Windows, execute o utilitário 'defrag' e então reinicie a "</div><div class='del'>-"instalação do Mandrakelinux."</div><div class='add'>+"instalação do Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6298,19 +6298,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6332,7 +6332,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6340,14 +6340,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6357,7 +6357,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6377,10 +6377,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6391,11 +6391,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6411,24 +6411,24 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Introdução\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "O sistema operacional e os diferentes elementos disponíveis na distribuição "</div><div class='del'>-"Mandrakelinux \n"</div><div class='add'>+"Mandrivalinux \n"</div><div class='ctx'> "deveriam ser chamados os \"Softwares\" a partir daqui. Os softwares "</div><div class='ctx'> "incluem, \n"</div><div class='ctx'> "mas não se limitam a eles, o grupo de programas, métodos, regras e "</div><div class='ctx'> "documentações relativos ao sistema operacional \n"</div><div class='del'>-"assim como os diferentes elementos da distribuição Mandrakelinux.\n"</div><div class='add'>+"assim como os diferentes elementos da distribuição Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Termo de licença\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Por favor leia com atenção este documento. Este documento é o termo de "</div><div class='ctx'> "licença entre você e \n"</div><div class='del'>-"a Mandrakesoft S.A. que se aplica aos Programas de Informática.\n"</div><div class='add'>+"a Mandriva S.A. que se aplica aos Programas de Informática.\n"</div><div class='ctx'> "Ao instalar, duplicar ou utilizar os Programas Informativos de qualquer "</div><div class='ctx'> "maneira, aceita explicitamente \n"</div><div class='ctx'> "e completamente os termos e condições desta Licença. \n"</div><div class='hunk'>@@ -6449,20 +6449,20 @@ msgstr ""</div><div class='ctx'> "Os Programas Informativos e a documentação são fornecidos \"assim como\", "</div><div class='ctx'> "com nenhuma garantia, \n"</div><div class='ctx'> "quanto permitido pela lei.\n"</div><div class='del'>-"Mandrakesoft S.A. não vai ser, em nenhuma circunstância e quanto permitido "</div><div class='add'>+"Mandriva S.A. não vai ser, em nenhuma circunstância e quanto permitido "</div><div class='ctx'> "pela lei, responsável de qualquer\n"</div><div class='ctx'> "acidente particular, dos danos diretos ou indiretos (inclusive os "</div><div class='ctx'> "resultantes de perda de lucros, interrupção\n"</div><div class='ctx'> "de negócios, perda de informações e dividas legais resultando dum julgamento,"</div><div class='ctx'> "ou qualquer ou perca conseqüente) \n"</div><div class='ctx'> "decorrentes do uso ou da impossibilidade de usar os Programas de "</div><div class='del'>-"Informática, mesmo se a Mandrakesoft S.A. foi \n"</div><div class='add'>+"Informática, mesmo se a Mandriva S.A. foi \n"</div><div class='ctx'> "avisada da possibilidade de ocorrimento de tais danos.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITAÇÃO DE RESPONSABILIDADE LIGADA A POSSE OU UTILIZAÇÃO DE PROGRAMAS "</div><div class='ctx'> "PROIBIDOS EM CERTOS PAÍSES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakesoft S.A. e os seus distribuidores não vão ser, em nenhuma "</div><div class='add'>+"Mandriva S.A. e os seus distribuidores não vão ser, em nenhuma "</div><div class='ctx'> "circunstância e quanto permitido \n"</div><div class='ctx'> "pela lei, responsável de quaisqueres danos diretos ou indiretos (inclusive "</div><div class='ctx'> "os resultantes de perda de lucros, interrupção\n"</div><div class='hunk'>@@ -6470,7 +6470,7 @@ msgstr ""</div><div class='ctx'> "ou qualquer ou perca conseqüente) \n"</div><div class='ctx'> "decorrentes da posse, do uso ou do descarregamento dos Programas  a partir "</div><div class='ctx'> "dum dos servidores da \n"</div><div class='del'>-"Mandrakelinux que sejam proibidos ou limitados pela lei em certos países "</div><div class='add'>+"Mandrivalinux que sejam proibidos ou limitados pela lei em certos países "</div><div class='ctx'> "pelas leis locais.\n"</div><div class='ctx'> "Esta limitação de responsabilidade inclui, mas não se limita aos elementos "</div><div class='ctx'> "de codificação inclusos nos \n"</div><div class='hunk'>@@ -6490,10 +6490,10 @@ msgstr ""</div><div class='ctx'> "os termos e condições de licença de cada elemento antes de o utilizar. "</div><div class='ctx'> "qualquer pergunta sobre a \n"</div><div class='ctx'> "licença dum elemento devera ser feita ao autor do elemento e não á "</div><div class='del'>-"Mandrakesoft.\n"</div><div class='del'>-"O programas desenvolvidos por Mandrakesoft S.A. são publicados sob os termos "</div><div class='add'>+"Mandriva.\n"</div><div class='add'>+"O programas desenvolvidos por Mandriva S.A. são publicados sob os termos "</div><div class='ctx'> "da licença GPL. \n"</div><div class='del'>-"A documentação escrita por Mandrakesoft S.A. é publicada sob uma licença "</div><div class='add'>+"A documentação escrita por Mandriva S.A. é publicada sob uma licença "</div><div class='ctx'> "especifica. Por favor veja \n"</div><div class='ctx'> "a documentação para mais detalhes.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6504,11 +6504,11 @@ msgstr ""</div><div class='ctx'> "respectivos \n"</div><div class='ctx'> "e são protegidos pela propriedade intelectual e pelas leis de Copyright "</div><div class='ctx'> "aplicáveis a programas de informática.\n"</div><div class='del'>-"Mandrakesoft S.A. reserva os seus direitos de modificar ou adaptar os "</div><div class='add'>+"Mandriva S.A. reserva os seus direitos de modificar ou adaptar os "</div><div class='ctx'> "Programas de informática, como um \n"</div><div class='ctx'> "tudo ou por partes, em qualquer sentido e para todos fins.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" e os logotipos associados são marcas "</div><div class='del'>-"registradas da Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" e os logotipos associados são marcas "</div><div class='add'>+"registradas da Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Leis Governando \n"</div><div class='hunk'>@@ -6523,7 +6523,7 @@ msgstr ""</div><div class='ctx'> "resolvidos sem tribunal. \n"</div><div class='ctx'> "Como ultima solução, o desacordo será referido ao Tribunal de Paris - "</div><div class='ctx'> "França.\n"</div><div class='del'>-"Para qualquer pergunta sobre este documento, contate por favor Mandrakesoft "</div><div class='add'>+"Para qualquer pergunta sobre este documento, contate por favor Mandriva "</div><div class='ctx'> "S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -6614,7 +6614,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6622,13 +6622,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Parabéns, a instalação foi completada.\n"</div><div class='ctx'> "Remova a mídia de inicialização e pressione enter para reiniciar.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Para informações sobre correções disponíveis para essa versão do "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consulte a Errata disponível em:.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6636,7 +6636,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informações sobre a configuração do sistema estão disponíveis no\n"</div><div class='del'>-"capítulo pós-instalação do Guia Oficial de Usuário Mandrakelinux."</div><div class='add'>+"capítulo pós-instalação do Guia Oficial de Usuário Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6670,12 +6670,12 @@ msgstr "Entrando no passo `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Seu sistema está com poucos recursos. Você pode ter algum problema na\n"</div><div class='del'>-"instalação do Mandrakelinux. Se isso ocorrer, você pode tentar instalar "</div><div class='add'>+"instalação do Mandrivalinux. Se isso ocorrer, você pode tentar instalar "</div><div class='ctx'> "usando o\n"</div><div class='ctx'> "modo texto. Para isso, aperte 'F1' na tela de inicialização e escreva 'text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7221,9 +7221,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Contatando o site da Mandrakelinux para pegar a lista de mirrors (espelhos) "</div><div class='add'>+"Contatando o site da Mandrivalinux para pegar a lista de mirrors (espelhos) "</div><div class='ctx'> "disponíveis..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7448,8 +7448,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Instalação do Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Instalação do Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10066,13 +10066,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Configurador do DrakFirewall\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Isso configura um firewall pessoal para essa máquina Mandrakelinux.\n"</div><div class='add'>+"Isso configura um firewall pessoal para essa máquina Mandrivalinux.\n"</div><div class='ctx'> "Para um firewall dedicado potente, favor procurar a distribuição\n"</div><div class='ctx'> "especializada MandrakeSecurity Firewall."</div><div class='ctx'> </div><div class='hunk'>@@ -14145,11 +14145,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Execute Scannerdrake (Hardware/Scanner no Centro de Controle Mandrakelinux) "</div><div class='add'>+"Execute Scannerdrake (Hardware/Scanner no Centro de Controle Mandrivalinux) "</div><div class='ctx'> "para compartilhar seu scanner na rede.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -16106,23 +16106,23 @@ msgstr "Parar"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;O que é Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;O que é Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Bem-vindo ao &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Bem-vindo ao &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux é uma &lt;b&gt;Distribuição Linux&lt;/b&gt; que compreende o core do "</div><div class='add'>+"Mandrivalinux é uma &lt;b&gt;Distribuição Linux&lt;/b&gt; que compreende o core do "</div><div class='ctx'> "sistema, chamado de &lt;b&gt;sistema operacional&lt;/b&gt; (baseado no kernel Linux) "</div><div class='ctx'> "junto com &lt;b&gt; uma série de aplicações&lt;/b&gt; envolvendo todas as necessidades "</div><div class='ctx'> "que você poderia imaginar."</div><div class='hunk'>@@ -16130,10 +16130,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux é a mais importante distribuição Linux &lt;b&gt;amigável&lt;/b&gt;de hoje. "</div><div class='add'>+"Mandrivalinux é a mais importante distribuição Linux &lt;b&gt;amigável&lt;/b&gt;de hoje. "</div><div class='ctx'> "Ela é também uma das distribuições &lt;b&gt;mais usadas&lt;/b&gt; no mundo!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16149,15 +16149,15 @@ msgstr "Seja bem-vindo ao &lt;b&gt;mundo do código aberto&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux é comprometida com o Modelo de Código Aberto e respeita "</div><div class='add'>+"Mandrivalinux é comprometida com o Modelo de Código Aberto e respeita "</div><div class='ctx'> "integralmente a General Public License (GPL). Esta nova versão é o resultado "</div><div class='del'>-"da &lt;b&gt;colaboração&lt;/b&gt; entre a &lt;b&gt;equipe de desenvolvedores da Mandrakesoft&lt;/"</div><div class='del'>-"b&gt; e a &lt;b&gt;comunidade mundial&lt;/b&gt; de colaboradores do Mandrakelinux."</div><div class='add'>+"da &lt;b&gt;colaboração&lt;/b&gt; entre a &lt;b&gt;equipe de desenvolvedores da Mandriva&lt;/"</div><div class='add'>+"b&gt; e a &lt;b&gt;comunidade mundial&lt;/b&gt; de colaboradores do Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16177,10 +16177,10 @@ msgstr "&lt;b&gt;A GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "A maior parte do software inclusa na distribuição e todas as ferramentas "</div><div class='del'>-"Mandrakelinux são licenciadas pela &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux são licenciadas pela &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16210,15 +16210,15 @@ msgstr "&lt;b&gt;Junte-se à Comunidade&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux possui uma das &lt;b&gt;maiores comunidades&lt;/b&gt; de usuários e "</div><div class='add'>+"Mandrivalinux possui uma das &lt;b&gt;maiores comunidades&lt;/b&gt; de usuários e "</div><div class='ctx'> "desenvolvedores. O seu papel como comunidade é bastante amplo, envolvendo "</div><div class='ctx'> "desde reports de bugs ao desenvolvimento de novas aplicações. A comunidade "</div><div class='del'>-"participa como &lt;b&gt;papel chave&lt;/b&gt; no mundo Mandrakelinux."</div><div class='add'>+"participa como &lt;b&gt;papel chave&lt;/b&gt; no mundo Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16240,11 +16240,11 @@ msgstr "&lt;b&gt;Versão Download&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Você esta instalando agora &lt;b&gt;Mandrakelinux Download&lt;b/&gt;. Esta é a versão "</div><div class='del'>-"gratuíta que a Mandrakesoft quer manter &lt;b&gt;disponível para todo mundo&lt;/b&gt;."</div><div class='add'>+"Você esta instalando agora &lt;b&gt;Mandrivalinux Download&lt;b/&gt;. Esta é a versão "</div><div class='add'>+"gratuíta que a Mandriva quer manter &lt;b&gt;disponível para todo mundo&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16275,10 +16275,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Você não terá acesso aos &lt;b&gt;serviços incluídos&lt;/b&gt; em qualquer outro produto "</div><div class='del'>-"Mandrakesoft."</div><div class='add'>+"Mandriva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16287,8 +16287,8 @@ msgstr "&lt;b&gt;Discovery, Seu Primeiro Desktop Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Você agora esta instalando &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;"</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Você agora esta instalando &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16309,17 +16309,17 @@ msgstr "&lt;b&gt;PowerPack, O Máximo em Desktop Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Você esta instalando agora &lt;b&gt; Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Você esta instalando agora &lt;b&gt; Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack é o produto &lt;b&gt;Desktop Linux premier&lt;/b&gt; da Mandrakesoft. Além de "</div><div class='add'>+"PowerPack é o produto &lt;b&gt;Desktop Linux premier&lt;/b&gt; da Mandriva. Além de "</div><div class='ctx'> "ser a  distribuição Linux mais fácil de usar e a mais amigável, PowerPack "</div><div class='ctx'> "inclui também &lt;b&gt;milhares de aplicações&lt;/b&gt; - todas das mais populares às "</div><div class='ctx'> "mais técnicas."</div><div class='hunk'>@@ -16331,8 +16331,8 @@ msgstr "&lt;b&gt;PowerPack+, A Solução Linux para Desktops e Servidores&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Você esta instalando agora &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Você esta instalando agora &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16348,22 +16348,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produtos Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produtos Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; tem desenvolvido uma larga série de produtos "</div><div class='del'>-"&lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; tem desenvolvido uma larga série de produtos "</div><div class='add'>+"&lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Os produtos Mandrakelinux são:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Os produtos Mandrivalinux são:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16383,74 +16383,74 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, A Solução Linux para Desktops e Servidores."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux para x86-64&lt;/b&gt;, A solução Mandrakelinux para usar ao "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux para x86-64&lt;/b&gt;, A solução Mandrivalinux para usar ao "</div><div class='ctx'> "máximo seu processador de 64-bit."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produtos Mandrakesoft (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produtos Mandriva (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft tem desenvolvido dois produtos que permitem a você utilizar "</div><div class='del'>-"Mandrakelinux &lt;b&gt;em qualquer computador&lt;/b&gt; sem precisar instalá-lo:"</div><div class='add'>+"Mandriva tem desenvolvido dois produtos que permitem a você utilizar "</div><div class='add'>+"Mandrivalinux &lt;b&gt;em qualquer computador&lt;/b&gt; sem precisar instalá-lo:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, uma distribuição Mandrakelinux que roda totalmente a partir "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, uma distribuição Mandrivalinux que roda totalmente a partir "</div><div class='ctx'> "de um CD-ROM bootável."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, uma distribuição Mandrakelinux pré-instalada em um "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, uma distribuição Mandrivalinux pré-instalada em um "</div><div class='ctx'> "ultra-compacto disco rígido móvel LaCie."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Produtos Mandrakesoft (Soluções Profissionais)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Produtos Mandriva (Soluções Profissionais)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Abaixo estão os produtos Mandrakesoft desenhados para reunir as "</div><div class='add'>+"Abaixo estão os produtos Mandriva desenhados para reunir as "</div><div class='ctx'> "&lt;b&gt;necessidades profissionais&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Desktop Corporativo&lt;/b&gt;, O Desktop Mandrakelinux para negócios."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Desktop Corporativo&lt;/b&gt;, O Desktop Mandrivalinux para negócios."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Servidor Corporativo&lt;/b&gt;, A Solução Mandrakelinux para Servidor."</div><div class='add'>+"\t* &lt;b&gt;Servidor Corporativo&lt;/b&gt;, A Solução Mandrivalinux para Servidor."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Firewall Multi-Network&lt;/b&gt;, A solução de Segurança Mandrakelinux."</div><div class='add'>+"\t* &lt;b&gt;Firewall Multi-Network&lt;/b&gt;, A solução de Segurança Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16494,10 +16494,10 @@ msgstr "&lt;b&gt;Escolha seu ambiente gráfico de Desktop favorito!&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Com PowerPack, você terá a escolha de um &lt;b&gt;ambiente de desktop gráfico&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft tem escolhido &lt;b&gt;KDE&lt;/b&gt;como padrão."</div><div class='add'>+"Mandriva tem escolhido &lt;b&gt;KDE&lt;/b&gt;como padrão."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16521,10 +16521,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Com PowerPack+, você terá a escolha de um &lt;b&gt;ambiente de desktop gráfico&lt;/"</div><div class='del'>-"b&gt;. Mandrakesoft tem escolhido &lt;b&gt;KDE&lt;/b&gt;como padrão."</div><div class='add'>+"b&gt;. Mandriva tem escolhido &lt;b&gt;KDE&lt;/b&gt;como padrão."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16651,10 +16651,10 @@ msgstr "&lt;b&gt;Divirta-se com sua larga extensão de Aplicações&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"No menu do Mandrakelinux você encontrará aplicações &lt;b&gt;fácil de usar&lt;/b&gt; "</div><div class='add'>+"No menu do Mandrivalinux você encontrará aplicações &lt;b&gt;fácil de usar&lt;/b&gt; "</div><div class='ctx'> "para &lt;b&gt;todas as suas necessidades&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16923,18 +16923,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Centro de Controle Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Centro de Controle Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"O &lt;b&gt;Centro de Controle Mandrakelinux&lt;/b&gt; é uma coleção essencial de "</div><div class='del'>-"utilitários específicos da Mandrakelinux elaborados para simplificar a "</div><div class='add'>+"O &lt;b&gt;Centro de Controle Mandrivalinux&lt;/b&gt; é uma coleção essencial de "</div><div class='add'>+"utilitários específicos da Mandrivalinux elaborados para simplificar a "</div><div class='ctx'> "configuração de seu computador."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16959,17 +16959,17 @@ msgstr "&lt;b&gt;O Modelo de Código Aberto&lt;b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Como qualquer outro programa de computador, software open source (software "</div><div class='ctx'> "de código aberto) &lt;b&gt;requer tempo e pessoal&lt;/b&gt; para seu desenvolvimento. "</div><div class='ctx'> "Com o objetivo de respeitar a filosofia open source, os vendedores da "</div><div class='del'>-"Mandrakesoft adicionaram importantes produtos e serviços para &lt;b&gt;continuar "</div><div class='del'>-"melhorando o Mandrakelinux&lt;/b&gt;. Se você deseja &lt;b&gt;adotar a filosofia open "</div><div class='del'>-"source&lt;/b&gt; e o desenvolvimento do Mandrakelinux, &lt;b&gt;por favor&lt;/b&gt; considere "</div><div class='add'>+"Mandriva adicionaram importantes produtos e serviços para &lt;b&gt;continuar "</div><div class='add'>+"melhorando o Mandrivalinux&lt;/b&gt;. Se você deseja &lt;b&gt;adotar a filosofia open "</div><div class='add'>+"source&lt;/b&gt; e o desenvolvimento do Mandrivalinux, &lt;b&gt;por favor&lt;/b&gt; considere "</div><div class='ctx'> "comprar um de nossos produtos ou serviços."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16980,10 +16980,10 @@ msgstr "&lt;b&gt;Loja Online&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Encontre todos os produtos da Mandrakesoft na &lt;b&gt;Mandrakestore&lt;/b&gt; - nossa "</div><div class='add'>+"Encontre todos os produtos da Mandriva na &lt;b&gt;Mandriva Store&lt;/b&gt; - nossa "</div><div class='ctx'> "plataforma de serviços em e-commece."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -17008,25 +17008,25 @@ msgstr "Passe na &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; é a &lt;b&gt;companhia perfeita&lt;/b&gt; para seu produto "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; é a &lt;b&gt;companhia perfeita&lt;/b&gt; para seu produto "</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Obtenha vantagens e &lt;b&gt;valiosos benefícios&lt;/b&gt;, de produtos e de serviços, "</div><div class='del'>-"associando-se ao Mandrakeclub. Benefícios como:"</div><div class='add'>+"associando-se ao Mandriva Club. Benefícios como:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17048,40 +17048,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Participação nos &lt;b&gt;fóruns para usuários&lt;/b&gt; Mandrakelinux."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Participação nos &lt;b&gt;fóruns para usuários&lt;/b&gt; Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Acesso com antecedência e privilegiado&lt;/b&gt;, antes mesmo de seu "</div><div class='del'>-"lançamento público, às &lt;b&gt;imagens ISO&lt;/b&gt; do Mandrakelinux. "</div><div class='add'>+"lançamento público, às &lt;b&gt;imagens ISO&lt;/b&gt; do Mandrivalinux. "</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; é um novo serviço premiado que a Mandrakesoft se "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; é um novo serviço premiado que a Mandriva se "</div><div class='ctx'> "orgulha em oferecer para seus clientes!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline provê uma grande quantidade de serviços importantes para "</div><div class='del'>-"&lt;b&gt;fácil atualização&lt;/b&gt; de seus sistema Mandrakelinux:"</div><div class='add'>+"Mandriva Online provê uma grande quantidade de serviços importantes para "</div><div class='add'>+"&lt;b&gt;fácil atualização&lt;/b&gt; de seus sistema Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17107,41 +17107,41 @@ msgstr "\t* Atualização &lt;b&gt;programada&lt;/b&gt; flexível."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Gerenciamento de &lt;b&gt;todo o seu sistema Mandrakelinux&lt;/b&gt; com uma conta."</div><div class='add'>+"\t* Gerenciamento de &lt;b&gt;todo o seu sistema Mandrivalinux&lt;/b&gt; com uma conta."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Você precisa de &lt;b&gt;ajuda&lt;/b&gt;? Conheça os experientes técnicos da "</div><div class='del'>-"Mandrakesoft em &lt;b&gt;nossa plataforma de suporte técnico&lt;/b&gt; www."</div><div class='add'>+"Mandriva em &lt;b&gt;nossa plataforma de suporte técnico&lt;/b&gt; www."</div><div class='ctx'> "mandrakeexpert.com"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Recorra a ajuda dos &lt;b&gt;qualificados experts Mandrakelinux&lt;/b&gt;, você irá "</div><div class='add'>+"Recorra a ajuda dos &lt;b&gt;qualificados experts Mandrivalinux&lt;/b&gt;, você irá "</div><div class='ctx'> "economizar mais tempo."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Para qualquer questão relacionada ao Mandrakelinux, você tem a possibilidade "</div><div class='add'>+"Para qualquer questão relacionada ao Mandrivalinux, você tem a possibilidade "</div><div class='ctx'> "de comprar suporte em &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17443,8 +17443,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "&lt;b&gt;Assistentes Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "&lt;b&gt;Assistentes Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17595,7 +17595,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17609,7 +17609,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPÇÕES]...\n"</div><div class='del'>-"Configurador do Mandrakelinux Terminal Server (MTS)\n"</div><div class='add'>+"Configurador do Mandrivalinux Terminal Server (MTS)\n"</div><div class='ctx'> "--enable         : ativa MTS\n"</div><div class='ctx'> "--disable        : desativa MTS\n"</div><div class='ctx'> "--start          : inicia MTS\n"</div><div class='hunk'>@@ -17668,7 +17668,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17676,7 +17676,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPÇÃO]...\n"</div><div class='ctx'> "  --no-confirmation      não pergunta a primeira confirmação no modo "</div><div class='del'>-"MandrakeUpdate\n"</div><div class='add'>+"Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        não verifica as assinaturas dos pacotes\n"</div><div class='ctx'> "  --changelog-first      exibe o changelog antes da lista de arquivos na "</div><div class='ctx'> "janela de descrição\n"</div><div class='hunk'>@@ -17757,7 +17757,7 @@ msgstr "%s: %s requer nome do host...\n"</div><div class='ctx'> #: standalone/drakTermServ:211 standalone/drakTermServ:214</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Terminal Server Configuration"</div><div class='del'>-msgstr "Configuração do Mandrakelinux Terminal Server"</div><div class='add'>+msgstr "Configuração do Mandrivalinux Terminal Server"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakTermServ:220</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20445,13 +20445,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Ferramenta de Relatório de Erro Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Ferramenta de Relatório de Erro Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Centro de Controle Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Centro de Controle Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20471,8 +20471,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20516,8 +20516,8 @@ msgstr "Assistentes de Configuração"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Selecione a ferramenta Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Selecione a ferramenta Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20942,20 +20942,20 @@ msgstr "Iniciado na inicialização"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Esta interface ainda não foi configurada.\n"</div><div class='ctx'> "Execute o assistente \"Adicionar uma interface\" no Centro de Controle "</div><div class='del'>-"Mandrakelinux"</div><div class='add'>+"Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Você não possui nenhuma conexão de Internet configurada.\n"</div><div class='del'>-"Execute o assistente \"%s\" no Centro de Controle Mandrakelinux"</div><div class='add'>+"Execute o assistente \"%s\" no Centro de Controle Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21005,8 +21005,8 @@ msgstr "KDM (gerenciador de display do KDE)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (gerenciador de display do Mandrakelinux)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (gerenciador de display do Mandrivalinux)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21304,7 +21304,7 @@ msgstr "Importar"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21313,7 +21313,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright © 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright © 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (versão original)\n"</div><div class='hunk'>@@ -21856,14 +21856,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright © 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright © 2003-2004 Mandriva.\n"</div><div class='ctx'> "Este é um software livre e pode ser redistribuído sob os termos da GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Uso: \n"</div><div class='hunk'>@@ -21892,8 +21892,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Centro de Ajuda Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Centro de Ajuda Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25364,8 +25364,8 @@ msgstr "A alteração foi feita, mas para ser efetivada você deve fazer logout.</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Logs das ferramentas Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Logs das ferramentas Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25886,10 +25886,10 @@ msgstr "Conexão completa."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Conexão falhou.\n"</div><div class='del'>-"Verifique sua configuração no Centro de Controle Mandrakelinux."</div><div class='add'>+"Verifique sua configuração no Centro de Controle Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26781,8 +26781,8 @@ msgstr "Falha na instalação"</div><div class='ctx'> #~ msgid "You've not selected any font"</div><div class='ctx'> #~ msgstr "Você não selecionou nenhuma fonte"</div><div class='ctx'> </div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Assistentes MandrakeSoft"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Assistentes Mandriva"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "http://www.mandrakelinux.com/en/101errata.php3"</div><div class='ctx'> #~ msgstr "http://www.mandrakelinux.com/en/101errata.php3"</div><div class='head'>diff --git a/perl-install/share/po/ro.po b/perl-install/share/po/ro.po<br/>index 9c858a913..47170d01d 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/ro.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/ro.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/ro.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ro.po</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-# Translation file of Mandrakelinux graphic install</div><div class='del'>-# Copyright (c) 2000 Mandrakesoft</div><div class='add'>+# Translation file of Mandrivalinux graphic install</div><div class='add'>+# Copyright (c) 2000 Mandriva</div><div class='ctx'> # Florin Grad &lt;florin@mandrakesoft.com&gt;, 1999-2000</div><div class='ctx'> # Dragos Marian Barbu &lt;dragosb@softhome.net&gt;, 2000</div><div class='ctx'> # Ovidiu Constantin &lt;ovidiu.constantin@gmx.net&gt;, 2002, 2003</div><div class='hunk'>@@ -62,7 +62,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -81,7 +81,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +89,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -97,7 +97,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -223,7 +223,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1247,11 +1247,11 @@ msgstr "Myanmar"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux permite folosirea mai multor limbi.\n"</div><div class='add'>+"Mandrivalinux permite folosirea mai multor limbi.\n"</div><div class='ctx'> "Selectaţi limbile pe care doriţi să le instalaţi. Ele vor fi disponibile\n"</div><div class='ctx'> "după terminarea instalării şi repornirea sistemului."</div><div class='ctx'> </div><div class='hunk'>@@ -3565,7 +3565,7 @@ msgstr "activare sprijin radio"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3675,7 +3675,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3686,11 +3686,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3797,10 +3797,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3909,7 +3909,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4007,12 +4007,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4039,7 +4039,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4048,7 +4048,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4177,7 +4177,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4195,7 +4195,7 @@ msgstr "Precedentul"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4224,7 +4224,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4240,7 +4240,7 @@ msgstr "Administrator de securitate:"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4326,7 +4326,7 @@ msgstr "Schimbă între modul normal/expert"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4371,7 +4371,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4380,13 +4380,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4427,7 +4427,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4586,7 +4586,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4607,7 +4607,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4707,7 +4707,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4724,7 +4724,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4786,7 +4786,7 @@ msgstr "Servicii"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Alegeţi discul fix pe care doriţi să îl ştergeţi pentru a instala noua "</div><div class='hunk'>@@ -5129,7 +5129,7 @@ msgstr "Calculez dimensiunea partiţiei Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5246,19 +5246,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5280,7 +5280,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5288,14 +5288,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5305,7 +5305,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5325,10 +5325,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5339,11 +5339,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5359,7 +5359,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5416,7 +5416,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5424,14 +5424,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Felicitări, instalarea e completă.\n"</div><div class='ctx'> "Scoateţi media de demaraj şi apăsaţi Enter pentru redemaraj.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Pentru informaţii asupra corecţiilor disponibile pentru aceasta versiune\n"</div><div class='del'>-"Mandrakelinux, consultaţi Erata disponibilă la \n"</div><div class='add'>+"Mandrivalinux, consultaţi Erata disponibilă la \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='hunk'>@@ -5439,7 +5439,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Informaţiile asupra configurării sistemului sunt disponibile în \n"</div><div class='ctx'> "capitolul referitor la post instalare din \n"</div><div class='del'>-"Official Mandrakelinux User's Guide."</div><div class='add'>+"Official Mandrivalinux User's Guide."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -5475,7 +5475,7 @@ msgstr "Începe etapa `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -5992,9 +5992,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Contactez situl Mandrakelinux pentru obţinerea listei oglinzilor "</div><div class='add'>+"Contactez situl Mandrivalinux pentru obţinerea listei oglinzilor "</div><div class='ctx'> "disponibile..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6206,8 +6206,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Instalare Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Instalare Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -8780,7 +8780,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12412,7 +12412,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14157,18 +14157,18 @@ msgstr "Opreşte"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Bun venit la &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Bun venit la &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14177,7 +14177,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14194,9 +14194,9 @@ msgstr "Bine aţi venit în lumea Open Source (surse deschise)"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14216,7 +14216,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14242,10 +14242,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14264,8 +14264,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14292,7 +14292,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14302,7 +14302,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14321,13 +14321,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14339,7 +14339,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14353,20 +14353,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "Centrul de control Mandrakelinux"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "Centrul de control Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux Updates Applet"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux Updates Applet"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -14386,61 +14386,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14478,7 +14478,7 @@ msgstr "Selectaţi cheia de criptare pt. sistemul de fişiere"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14499,7 +14499,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14529,7 +14529,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/15.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Kontact&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/15.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -14616,7 +14616,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14851,14 +14851,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Centrul de control Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Centrul de control Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14880,21 +14880,21 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Online Store&lt;/b&gt;"</div><div class='del'>-msgstr "Centrul de control Mandrakelinux"</div><div class='add'>+msgstr "Centrul de control Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14917,20 +14917,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -14949,33 +14949,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -14998,32 +14998,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15308,7 +15308,7 @@ msgstr "Webcam-uri"</div><div class='ctx'> #: share/compssUsers.pl:187</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "Webmin Remote Configuration Server"</div><div class='del'>-msgstr "Configurare Mandrakelinux Terminal Server"</div><div class='add'>+msgstr "Configurare Mandrivalinux Terminal Server"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:191</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -15322,8 +15322,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Centrul de control Mandrakelinux"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Centrul de control Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -15418,7 +15418,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15466,7 +15466,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -15539,7 +15539,7 @@ msgstr ""</div><div class='ctx'> #: standalone/drakTermServ:211 standalone/drakTermServ:214</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "Terminal Server Configuration"</div><div class='del'>-msgstr "Configurare Mandrakelinux Terminal Server"</div><div class='add'>+msgstr "Configurare Mandrivalinux Terminal Server"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakTermServ:220</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15684,7 +15684,7 @@ msgstr ""</div><div class='ctx'> #: standalone/drakTermServ:509</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "Terminal Server Overview"</div><div class='del'>-msgstr "Configurare Mandrakelinux Terminal Server"</div><div class='add'>+msgstr "Configurare Mandrivalinux Terminal Server"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakTermServ:510</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17933,13 +17933,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Centrul de control Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Centrul de control Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Centrul de control Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Centrul de control Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17959,8 +17959,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18004,7 +18004,7 @@ msgstr "Asistenţi de configurare"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18413,7 +18413,7 @@ msgstr "Pornit la demaraj"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Această interfaţă nu a fost configurată încă.\n"</div><div class='ctx'> "Lansaţi asistentul de configurare în fereastra principală"</div><div class='hunk'>@@ -18422,7 +18422,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Această interfaţă nu a fost configurată încă.\n"</div><div class='ctx'> "Lansaţi asistentul de configurare în fereastra principală"</div><div class='hunk'>@@ -18475,7 +18475,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18766,7 +18766,7 @@ msgstr "Import"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19240,7 +19240,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -19267,8 +19267,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Centrul de control Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Centrul de control Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -22297,8 +22297,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Explicaţii utilitare Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Explicaţii utilitare Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -22806,10 +22806,10 @@ msgstr "Conectare reuşită."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Conectare eşuată.\n"</div><div class='del'>-"Verificaţi configurarea în Centrul de control Mandrakelinux."</div><div class='add'>+"Verificaţi configurarea în Centrul de control Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -23042,7 +23042,7 @@ msgstr "Re-generez lista de scannere configurate ..."</div><div class='ctx'> #: standalone/scannerdrake:101</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported by this version of %s."</div><div class='del'>-msgstr "%s nu are susţinere în această versiune a Mandrakelinux."</div><div class='add'>+msgstr "%s nu are susţinere în această versiune a Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:104</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -23082,7 +23082,7 @@ msgstr ""</div><div class='ctx'> #: standalone/scannerdrake:144</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported under Linux."</div><div class='del'>-msgstr "%s nu are susţinere în această versiune a Mandrakelinux."</div><div class='add'>+msgstr "%s nu are susţinere în această versiune a Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:171 standalone/scannerdrake:185</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -23184,7 +23184,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Scanner-ul %s trebuie configurat de către PrinterDrake.\n"</div><div class='ctx'> "Puteţi lansa PrinterDrake în secţiunea Echipamente a Centrului de control "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:308 standalone/scannerdrake:315</div><div class='ctx'> #: standalone/scannerdrake:345</div><div class='hunk'>@@ -23654,8 +23654,8 @@ msgstr "Instalarea a eşuat"</div><div class='ctx'> #~ msgstr "Nu aţi selectat nici un font"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Centrul de control Mandrakelinux"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Centrul de control Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "No browser is installed on your system, Please install one if you want to "</div><div class='hunk'>@@ -23764,13 +23764,13 @@ msgstr "Instalarea a eşuat"</div><div class='ctx'> #~ msgstr "Eroare la citirea  %s pentru a scrie: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Acesta este HardDrake, o unealtă Mandrakelinux de configurare a "</div><div class='add'>+#~ "Acesta este HardDrake, o unealtă Mandrivalinux de configurare a "</div><div class='ctx'> #~ "echipamentelor.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Versiune:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Autor:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='hunk'>@@ -24108,8 +24108,8 @@ msgstr "Instalarea a eşuat"</div><div class='ctx'> #~ msgid "mkraid failed"</div><div class='ctx'> #~ msgstr "mkraid a eşuat"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Connection failed.\n"</div><div class='head'>diff --git a/perl-install/share/po/ru.po b/perl-install/share/po/ru.po<br/>index 318449d6c..95eca5bae 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/ru.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/ru.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/ru.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ru.po</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> # translation of DrakX-ru.po to</div><div class='ctx'> # Translation of DrakX-ru.po to Russian</div><div class='ctx'> # Russian translation of drakX messages</div><div class='del'>-# Copyright (C) 1999-2003 Mandrakesoft</div><div class='add'>+# Copyright (C) 1999-2003 Mandriva</div><div class='ctx'> # Pavel Maryanov &lt;acid_jack@ukr.net&gt;, 2002,2003, 2005.</div><div class='ctx'> # Alice Lafox &lt;alice@lafox.com.ua&gt;, 2003.</div><div class='ctx'> # Alice Lafox &lt;alice@lafox.net&gt;, 2004, 2005.</div><div class='hunk'>@@ -72,7 +72,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Похоже, что на ключе USB установлена защита от записи, но сейчас\n"</div><div class='ctx'> "невозможно безопасно извлечь его.\n"</div><div class='hunk'>@@ -80,7 +80,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Нажмите на кнопку, чтобы перезагрузить машину, извлеките его,\n"</div><div class='ctx'> "снимите защиту от записи, снова подключите ключ, и еще раз\n"</div><div class='del'>-"запустите Mandrake Move."</div><div class='add'>+"запустите Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -98,7 +98,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ваш USB-ключ не имеет ни одного нормального раздела Windows (FAT).\n"</div><div class='hunk'>@@ -109,14 +109,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Вы также можете продолжить без USB-ключа - в этом случае вы\n"</div><div class='del'>-"сможете использовать Mandrake Move просто как live Mandrake\n"</div><div class='add'>+"сможете использовать Mandriva Move просто как live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -124,11 +124,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "В вашей системе не было обнаружено каких-либо ключей USB.\n"</div><div class='del'>-"Если вы подключите ключ USB сейчас, Mandrake Move будет иметь\n"</div><div class='add'>+"Если вы подключите ключ USB сейчас, Mandriva Move будет иметь\n"</div><div class='ctx'> "возможность явно сохранить данные в вашем домашнем каталоге\n"</div><div class='ctx'> "и конфигурацию всей системы для следующей загрузки на этом\n"</div><div class='ctx'> "или другом компьютере. Примечание: если вы подключили ключ\n"</div><div class='hunk'>@@ -136,7 +136,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Вы также можете продолжить и без ключа USB - вы все еще будете\n"</div><div class='del'>-"в состоянии использовать Mandrake Move как обычную операционную\n"</div><div class='add'>+"в состоянии использовать Mandriva Move как обычную операционную\n"</div><div class='ctx'> "систему Mandrake."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -265,7 +265,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -282,7 +282,7 @@ msgstr ""</div><div class='ctx'> "Это может быть вызвано повреждением\n"</div><div class='ctx'> "конфигурационных файлов системы на ключе USB,\n"</div><div class='ctx'> "в этом случае его извлечение с последующей\n"</div><div class='del'>-"перезагрузкой Mandrake Move решит проблему.\n"</div><div class='add'>+"перезагрузкой Mandriva Move решит проблему.\n"</div><div class='ctx'> "Для этого нажмите на соответствующую кнопку.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1331,11 +1331,11 @@ msgstr "Выбор языка"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux может поддерживать несколько языков. Выберите\n"</div><div class='add'>+"Mandrivalinux может поддерживать несколько языков. Выберите\n"</div><div class='ctx'> "языки, которые вы хотите установить. Они будут доступны, когда\n"</div><div class='ctx'> "завершится установка и вы перезапустите свою систему."</div><div class='ctx'> </div><div class='hunk'>@@ -3761,12 +3761,12 @@ msgstr "включить поддержку радио"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Прежде чем продолжить, вы должны внимательно прочитать условия лицензии.\n"</div><div class='del'>-"Лицензия распространяется на весь дистрибутив Mandrakelinux. Если вы\n"</div><div class='add'>+"Лицензия распространяется на весь дистрибутив Mandrivalinux. Если вы\n"</div><div class='ctx'> "согласны со всеми условиями лицензии, отметьте пункт \"%s\". Если нет -\n"</div><div class='ctx'> "нажатие на кнопку \"%s\" приведет к перезагрузке вашего компьютера."</div><div class='ctx'> </div><div class='hunk'>@@ -3945,13 +3945,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Инсталляция Mandrakelinux размещена на нескольких CD-ROMах. Если выбранный\n"</div><div class='add'>+"Инсталляция Mandrivalinux размещена на нескольких CD-ROMах. Если выбранный\n"</div><div class='ctx'> "пакет находится на другом CD-ROM, DrakX будет отдавать текущий CD и просить\n"</div><div class='ctx'> "вас вставить другой по мере надобности. Если у вас нет требуемого CD под "</div><div class='ctx'> "руками,\n"</div><div class='hunk'>@@ -3963,11 +3963,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4019,11 +4019,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Теперь настало время определить, какие программы вы хотите установить в\n"</div><div class='del'>-"вашу систему. С Mandrakelinux поставляются тысячи пакетов и, для упрощения\n"</div><div class='add'>+"вашу систему. С Mandrivalinux поставляются тысячи пакетов и, для упрощения\n"</div><div class='ctx'> "выбора, они разбиты на группы.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Пакеты сортированы по группам, которые соответствуют специфике\n"</div><div class='del'>-"использования вашей машины. В Mandrakelinux пакеты сортируются по четырем\n"</div><div class='add'>+"использования вашей машины. В Mandrivalinux пакеты сортируются по четырем\n"</div><div class='ctx'> "категориям. Вы можете смешивать и сочетать приложения из различных\n"</div><div class='ctx'> "категорий, например, вариант установки ``Рабочая станция'' может иметь\n"</div><div class='ctx'> "приложения из категории ``Разработка''.\n"</div><div class='hunk'>@@ -4124,10 +4124,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4157,10 +4157,10 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Если был выбран какой-либо серверный пакет, специально или он был частью\n"</div><div class='ctx'> "какой-либо группы, вас попросят подтвердить, действительно ли вы желаете\n"</div><div class='del'>-"установить эти сервера. Под Mandrakelinux все установленные сервера\n"</div><div class='add'>+"установить эти сервера. Под Mandrivalinux все установленные сервера\n"</div><div class='ctx'> "запускаются по умолчанию в процессе загрузки. Даже если они безопасны и не\n"</div><div class='ctx'> "имеют известных проблем на момент выпуска дистрибутива, в них могут быть\n"</div><div class='del'>-"обнаружены дыры в безопасности после выпуска данной версии Mandrakelinux.\n"</div><div class='add'>+"обнаружены дыры в безопасности после выпуска данной версии Mandrivalinux.\n"</div><div class='ctx'> "Если вы не знаете, зачем нужен данная служба и что она делает, нажмите\n"</div><div class='ctx'> "\"%s\". Если вы нажмете \"%s\", тогда все службы из списка будут\n"</div><div class='ctx'> "установлены и автоматически запущены при загрузке системы. !!\n"</div><div class='hunk'>@@ -4317,7 +4317,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4373,7 +4373,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (для системы X Window) это сердце графического интерфейса GNU/Linux, на\n"</div><div class='ctx'> "базе которого работают все графические среды (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, и т.д..), входящие в Mandrakelinux.\n"</div><div class='add'>+"WindowMaker, и т.д..), входящие в Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Вам будет представлен список различных параметров для получения\n"</div><div class='ctx'> "оптимального графического отображения: Видеокарта\n"</div><div class='hunk'>@@ -4496,12 +4496,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4528,7 +4528,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4537,7 +4537,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4558,11 +4558,11 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "На этом шаге вам прийдется решить, куда вы хотите установить операционную\n"</div><div class='del'>-"систему Mandrakelinux на вашем жестком диске. Если ваш жесткий диск пуст,\n"</div><div class='add'>+"систему Mandrivalinux на вашем жестком диске. Если ваш жесткий диск пуст,\n"</div><div class='ctx'> "или существующая операционная система на нем занимает все дисковое\n"</div><div class='ctx'> "пространство, вам прийдется диск переразбить (partition). Разделение диска\n"</div><div class='ctx'> "в основном состоит в том, чтобы логически выделить на нем свободное\n"</div><div class='del'>-"пространство для установки вашей новой системы Mandrakelinux.\n"</div><div class='add'>+"пространство для установки вашей новой системы Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Поскольку разделение диска - это обычно необратимый процесс и может\n"</div><div class='ctx'> "привести к потере данных, если на диске уже есть установленная операционная\n"</div><div class='hunk'>@@ -4589,7 +4589,7 @@ msgstr ""</div><div class='ctx'> "потери данных, особенно если вы предварительно провели дефрагментацию\n"</div><div class='ctx'> "раздела Windows. Резервное копирование ваших данных настойчиво\n"</div><div class='ctx'> "рекомендуется.. Рекомендуем выбрать эту опцию, если вы собираетесь\n"</div><div class='del'>-"использовать Mandrakelinux и Microsoft Windows на одном компьютере.\n"</div><div class='add'>+"использовать Mandrivalinux и Microsoft Windows на одном компьютере.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Перед тем, как выбрать эту опцию, вы должны осознать, что размер вашего\n"</div><div class='ctx'> "раздела Microsoft Windows станет меньше, чем был. У вас будет меньше\n"</div><div class='hunk'>@@ -4597,7 +4597,7 @@ msgstr ""</div><div class='ctx'> "новых программ.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" выберите эту опцию, если вы хотите удалить все данные на всех\n"</div><div class='del'>-"разделах вашего жесткого диска и заменить их новой системой Mandrakelinux.\n"</div><div class='add'>+"разделах вашего жесткого диска и заменить их новой системой Mandrivalinux.\n"</div><div class='ctx'> "Будьте осторожны в этом решении, потому что после подтверждения вы не\n"</div><div class='ctx'> "сможете вернуть обратно все как было.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4760,7 +4760,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4785,7 +4785,7 @@ msgstr ""</div><div class='ctx'> "Нажмите \"%s\", когда будете готовы начать форматирование разделов.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Нажмите \"%s\", если вы хотите выбрать другой раздел для установки\n"</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Нажмите \"%s\", если хотите выбрать разделы, которые следует проверить на\n"</div><div class='ctx'> "сбойные блоки (bad blocks)."</div><div class='hunk'>@@ -4804,7 +4804,7 @@ msgstr "Назад"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4816,7 +4816,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"В данный момент установки Mandrakelinux было бы неплохо обновить некоторые\n"</div><div class='add'>+"В данный момент установки Mandrivalinux было бы неплохо обновить некоторые\n"</div><div class='ctx'> "пакеты из исходного релиза. Некоторые баги могут быть уже исправлены и\n"</div><div class='ctx'> "решены проблемы безопасности. Чтобы получить пользу от этих обновлений,\n"</div><div class='ctx'> "сейчас вы можете загрузить их из Интернет. Нажмите \"%s\", если у вас есть\n"</div><div class='hunk'>@@ -4846,7 +4846,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4860,7 +4860,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Если вы не знаете что выбрать, оставьте выбор по умолчанию. Вы сможете\n"</div><div class='ctx'> "изменить этот уровень безопасности потом с помощью утилиты draksec из\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "В поле \"%s\" системе указывается пользователь, который будет отвечать за\n"</div><div class='ctx'> "безопасность. На этот адрес будут посылаться сообщения по безопасности."</div><div class='hunk'>@@ -4876,7 +4876,7 @@ msgstr "Администратор по безопасности"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4947,7 +4947,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Здесь вам предложат выбрать, какие разделы будут использоваться для\n"</div><div class='del'>-"установки вашей системы Mandrakelinux. Если разделы были уже определены\n"</div><div class='add'>+"установки вашей системы Mandrivalinux. Если разделы были уже определены\n"</div><div class='ctx'> "ранее, например, предыдущей инсталляцией GNU/Linux или другой утилитой\n"</div><div class='ctx'> "разбиения дисков, вы можете воспользоваться существующими разделами. В\n"</div><div class='ctx'> "противном случае, разделы жесткого диска должны быть определены.\n"</div><div class='hunk'>@@ -5035,7 +5035,7 @@ msgstr "Переключение между нормальным/эксперт�</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5065,7 +5065,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "На вашем жестом диске обнаружено несколько разделов Microsoft. Выберите\n"</div><div class='ctx'> "необходимый раздел для изменения его размера с целью установки вашей новой\n"</div><div class='del'>-"операционной системы Mandrakelinux.\n"</div><div class='add'>+"операционной системы Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Каждый раздел перечислен так: \"Linux имя\", \"Windows имя\" \"Размер\".\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5116,7 +5116,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5125,19 +5125,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Этот шаг появляется только в случае, если на вашей машине найден старый\n"</div><div class='ctx'> "раздел GNU/Linux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX теперь должен узнать, хотите ли вы провести новую установку или\n"</div><div class='del'>-"обновление существующей системы Mandrakelinux:\n"</div><div class='add'>+"обновление существующей системы Mandrivalinux:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": в большинстве случаев этот вариант приведет к уничтожению старой\n"</div><div class='ctx'> "системы. Если вы желаете изменить разделы вашего жесткого диска или\n"</div><div class='hunk'>@@ -5146,12 +5146,12 @@ msgstr ""</div><div class='ctx'> "от перезаписи некоторые свои данные.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": этот класс установки позволит вам обновить пакеты, установленные\n"</div><div class='del'>-"в вашей системе Mandrakelinux. Текущая схема разделов диска и\n"</div><div class='add'>+"в вашей системе Mandrivalinux. Текущая схема разделов диска и\n"</div><div class='ctx'> "пользовательские данные останутся нетронутыми. Большинство других шагов\n"</div><div class='ctx'> "будут доступны, как и при стандартной установке.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"``Обновление'' будет неплохо работать на системах Mandrakelinux начиная с\n"</div><div class='del'>-"\"8.1\" и выше. Проведение обновления на системах Mandrakelinux старше\n"</div><div class='add'>+"``Обновление'' будет неплохо работать на системах Mandrivalinux начиная с\n"</div><div class='add'>+"\"8.1\" и выше. Проведение обновления на системах Mandrivalinux старше\n"</div><div class='ctx'> "\"8.1\" не рекомендуется."</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -5213,7 +5213,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5251,7 +5251,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "О поддержке UTF-8 (unicode): Unicode это новая кодировка, которая включает\n"</div><div class='ctx'> "в себя все существующие языки. Однако ее полная поддержка в GNU/Linux пока\n"</div><div class='del'>-"находится в стадии разработки. Поэтому Mandrakelinux будет определять\n"</div><div class='add'>+"находится в стадии разработки. Поэтому Mandrivalinux будет определять\n"</div><div class='ctx'> "использовать ее или нет в зависимости от выбора пользователя:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Если вы выбираете языки, которые имеют свою традиционную устоявшуюся\n"</div><div class='hunk'>@@ -5502,7 +5502,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5523,11 +5523,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Теперь пришло время выбрать систему печати для вашего компьютера. Другие OS\n"</div><div class='del'>-"могут предложить вам одну, а Mandrakelinux предлагает две. Каждая из систем\n"</div><div class='add'>+"могут предложить вам одну, а Mandrivalinux предлагает две. Каждая из систем\n"</div><div class='ctx'> "является лучшей для определенной конфигурации.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- что означает ``печатать, не ставить в очередь'' (``print,\n"</div><div class='hunk'>@@ -5550,7 +5550,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Если вы сделаете свой выбор сейчас, а позже обнаружите, что система печати\n"</div><div class='ctx'> "вам не подходит, вы сможете изменить ее, запустив PrinterDrake из Центра\n"</div><div class='del'>-"Управления Mandrakelinux и нажав на кнопку  \"%s\"."</div><div class='add'>+"Управления Mandrivalinux и нажав на кнопку  \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5674,7 +5674,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5691,7 +5691,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5743,7 +5743,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": если вы хотите настроить доступ в Интернет или локальную сеть\n"</div><div class='ctx'> "прямо сейчас. Обратитесь к печатной документации или используйте\n"</div><div class='del'>-"Центр управления Mandrakelinux после установки чтобы почитать\n"</div><div class='add'>+"Центр управления Mandrivalinux после установки чтобы почитать\n"</div><div class='ctx'> "встроенную справку.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": позволяет настроить адреса HTTP и FTP прокси если машина,\n"</div><div class='hunk'>@@ -5760,7 +5760,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": если вы желаете изменить конфигурацию начального загрузчика,\n"</div><div class='ctx'> "нажмите эту кнопку. Эта опция предназначена для опытных пользователей.\n"</div><div class='ctx'> "Обратитесь к печатной документации или встроенной справке о настройке\n"</div><div class='del'>-"загрузчика в Центре управления Mandrakelinux.\n"</div><div class='add'>+"загрузчика в Центре управления Mandrivalinux.\n"</div><div class='ctx'> " * \"%s\": здесь вы сможете проконтролировать какие службы будут запущены\n"</div><div class='ctx'> "на вашей машине. Если ваша машина будет сервером, вам стоит проверить эти\n"</div><div class='ctx'> "установки."</div><div class='hunk'>@@ -5822,11 +5822,11 @@ msgstr "Службы"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Выберите жесткий диск, который нужно очистить для инсталляции вашего нового\n"</div><div class='del'>-"раздела Mandrakelinux. Будьте осторожны, все данные на нем будут потеряны\n"</div><div class='add'>+"раздела Mandrivalinux. Будьте осторожны, все данные на нем будут потеряны\n"</div><div class='ctx'> "и их нельзя будет восстановить!"</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='hunk'>@@ -6185,12 +6185,12 @@ msgstr "Вычисляется размер раздела Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ваш раздел Windows слишком фрагментирован. Пожалуйста, перезагрузите свой "</div><div class='ctx'> "компьютер под Windows, запустите утилиту ``defrag'', а затем повторно "</div><div class='del'>-"запустите установку Mandrakelinux."</div><div class='add'>+"запустите установку Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6307,19 +6307,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6341,7 +6341,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6349,14 +6349,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6366,7 +6366,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6386,10 +6386,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6400,11 +6400,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6420,21 +6420,21 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Введение\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Операционная система и различные компоненты, доступные в дистрибутиве\n"</div><div class='del'>-"Mandrakelinux далее будут называться \"Программными Продуктами\".\n"</div><div class='add'>+"Mandrivalinux далее будут называться \"Программными Продуктами\".\n"</div><div class='ctx'> "Программные Продукты включают, но не ограничиваются, набор программ, \n"</div><div class='ctx'> "методы, правила и документацию, связанную с операционной системой\n"</div><div class='del'>-"и различными компонентами дистрибутива Mandrakelinux.\n"</div><div class='add'>+"и различными компонентами дистрибутива Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Лицензионное соглашение\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Пожалуйста, внимательно прочтите этот документ. Данный документ является\n"</div><div class='del'>-"лицензионным соглашением, заключаемым между вами и Mandrakesoft S.A.,\n"</div><div class='add'>+"лицензионным соглашением, заключаемым между вами и Mandriva S.A.,\n"</div><div class='ctx'> "применимо к Программным Продуктам. Устанавливая, тиражируя или\n"</div><div class='ctx'> "используя Программные Продукты в любых других целях, вы тем самым всецело\n"</div><div class='ctx'> "принимаете и полностью соглашаетесь с условиями и положениями данной\n"</div><div class='hunk'>@@ -6453,7 +6453,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Программные Продукты и прилагаемая документация предоставляются \"как есть\","</div><div class='ctx'> "безо всякой гарантии в пределах, дозволенных законом.\n"</div><div class='del'>-"Mandrakesoft S.A. ни при каких условиях и в пределах, дозволенных\n"</div><div class='add'>+"Mandriva S.A. ни при каких условиях и в пределах, дозволенных\n"</div><div class='ctx'> "законом, не несет ответственности за любой какой бы то ни было "</div><div class='ctx'> "определенный,\n"</div><div class='ctx'> "случайный, прямой или косвенный ущерб (включая неограниченный ущерб от\n"</div><div class='hunk'>@@ -6462,13 +6462,13 @@ msgstr ""</div><div class='ctx'> "судебных издержек и штрафов, являющихся результатом судебных "</div><div class='ctx'> "разбирательств,\n"</div><div class='ctx'> "или любых других косвенных потерь), являющийся результатом использования\n"</div><div class='del'>-"Программных Продуктов, даже, если Mandrakesoft S.A. было известно\n"</div><div class='add'>+"Программных Продуктов, даже, если Mandriva S.A. было известно\n"</div><div class='ctx'> "о возможности или случаях такого ущерба.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "ОГРАНИЧЕННАЯ ОТВЕТСТВЕННОСТЬ, СВЯЗАННАЯ С ВЛАДЕНИЕМ ИЛИ ИСПОЛЬЗОВАНИЕМ "</div><div class='ctx'> "ЗАПРЕЩЕННОГО ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ В НЕКОТОРЫХ СТРАНАХ\n"</div><div class='ctx'> "\n"</div><div class='del'>-"В пределах, дозволенных законом, Mandrakesoft S.A. или ее распространители\n"</div><div class='add'>+"В пределах, дозволенных законом, Mandriva S.A. или ее распространители\n"</div><div class='ctx'> "ни при каких условиях не несут ответственности за любой, какой бы то ни "</div><div class='ctx'> "было\n"</div><div class='ctx'> "определенный, случайный, прямой или косвенный ущерб (включая неограниченный\n"</div><div class='hunk'>@@ -6478,7 +6478,7 @@ msgstr ""</div><div class='ctx'> "разбирательств, или любых других косвенных потерь), являющихся результатом\n"</div><div class='ctx'> "владения и использования компонентов программного обеспечения,\n"</div><div class='ctx'> "или являющихся результатом скачивания компонентов программного обеспечения\n"</div><div class='del'>-"с одного из сайтов Mandrakelinux, запрещенных или ограниченных в некоторых\n"</div><div class='add'>+"с одного из сайтов Mandrivalinux, запрещенных или ограниченных в некоторых\n"</div><div class='ctx'> "странах местными законами.\n"</div><div class='ctx'> "Ограниченная ответственность применяется, но не ограничивается,\n"</div><div class='ctx'> "к компонентам сильной криптографии, включаемых в Программные Продукты.\n"</div><div class='hunk'>@@ -6494,10 +6494,10 @@ msgstr ""</div><div class='ctx'> "они распространяются. Пожалуйста, внимательно читайте условия и положения\n"</div><div class='ctx'> "лицензионного соглашения для каждого из компонент перед использованием\n"</div><div class='ctx'> "любого компонента. Любые вопросы по лицензии компонента должны быть\n"</div><div class='del'>-"адресованы автору компонента, а не Mandrakesoft.\n"</div><div class='del'>-"Программы, разработанные Mandrakesoft S.A., находятся под действием "</div><div class='add'>+"адресованы автору компонента, а не Mandriva.\n"</div><div class='add'>+"Программы, разработанные Mandriva S.A., находятся под действием "</div><div class='ctx'> "лицензии\n"</div><div class='del'>-"GPL. Документация, написанная Mandrakesoft S.A., находится под действием\n"</div><div class='add'>+"GPL. Документация, написанная Mandriva S.A., находится под действием\n"</div><div class='ctx'> "особой лицензии. Пожалуйста, обратитесь к документации за дополнительной\n"</div><div class='ctx'> "информацией.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6507,11 +6507,11 @@ msgstr ""</div><div class='ctx'> "соответствующим\n"</div><div class='ctx'> "авторам и защищены законами об интеллектуальной собственности и авторском\n"</div><div class='ctx'> "праве, применительно к программному обеспечению.\n"</div><div class='del'>-"Mandrakesoft S.A. сохраняет за собой право изменять или адаптировать\n"</div><div class='add'>+"Mandriva S.A. сохраняет за собой право изменять или адаптировать\n"</div><div class='ctx'> "Программные Продукты, как целиком, так и по частям, любым способом и для\n"</div><div class='ctx'> "любых целей.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" и соответствующие логотипы являются "</div><div class='del'>-"торговыми марками Mandrakesoft S.A.\n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" и соответствующие логотипы являются "</div><div class='add'>+"торговыми марками Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Основные законы\n"</div><div class='hunk'>@@ -6526,7 +6526,7 @@ msgstr ""</div><div class='ctx'> "будут оспариваться в суде. В последнюю очередь оспаривание вопроса будет "</div><div class='ctx'> "передано в соответствующий Законодательный Суд Парижа - Франция. По любым "</div><div class='ctx'> "вопросам, касающимся этого документа, пожалуйста, свяжитесь\n"</div><div class='del'>-"с Mandrakesoft S.A.\n"</div><div class='add'>+"с Mandriva S.A.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6620,7 +6620,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6628,13 +6628,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Поздравляем, установка завершена.\n"</div><div class='ctx'> "Извлеките загрузочный диск и нажмите Enter для перезагрузки.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"За информацией о фиксах, доступных для этой версии Mandrakelinux,\n"</div><div class='add'>+"За информацией о фиксах, доступных для этой версии Mandrivalinux,\n"</div><div class='ctx'> "обращайтесь к Списку ошибок (Errata) , доступном на:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6642,7 +6642,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Информация о настройке вашей системы доступна в главе post install\n"</div><div class='del'>-"Официального Руководства Пользователя Mandrakelinux."</div><div class='add'>+"Официального Руководства Пользователя Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6677,12 +6677,12 @@ msgstr "Осуществляется переход на этап `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "На вашей системе мало ресурсов. У вас могут возникнуть проблемы при\n"</div><div class='del'>-"установке Mandrakelinux. Если это случится, вы можете попробовать\n"</div><div class='add'>+"установке Mandrivalinux. Если это случится, вы можете попробовать\n"</div><div class='ctx'> "установку в текстовом режиме. Для этого нажмите `F1' при загрузке с\n"</div><div class='ctx'> "CDROM'а, и затем наберите `text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7229,9 +7229,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Выполняется подключение к веб-сайту Mandrakelinux для получения списка "</div><div class='add'>+"Выполняется подключение к веб-сайту Mandrivalinux для получения списка "</div><div class='ctx'> "доступных пакетов..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7458,8 +7458,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Установка Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Установка Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10046,13 +10046,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Конфигуратор drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Он настраивает персональный файервол для этой машины Mandrakelinux.\n"</div><div class='add'>+"Он настраивает персональный файервол для этой машины Mandrivalinux.\n"</div><div class='ctx'> "Для создания специализированного мощного файервола, пожалуйста, загляните\n"</div><div class='ctx'> "в специализированный дистрибутив MandrakeSecurity Firewall."</div><div class='ctx'> </div><div class='hunk'>@@ -14125,12 +14125,12 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Запустите Scannerdrake (Оборудование/Сканер в Центре управления "</div><div class='del'>-"Mandrakelinux) чтобы раздать ваш сканер на сеть.\n"</div><div class='add'>+"Mandrivalinux) чтобы раздать ваш сканер на сеть.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='ctx'> #: printer/printerdrake.pm:3933</div><div class='hunk'>@@ -16098,33 +16098,33 @@ msgstr "Остановить"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Что такое Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Что такое Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Добро пожаловать в &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Добро пожаловать в &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux это &lt;b&gt;дистрибутив Linux&lt;/b&gt;, который содержит ядро системы,"</div><div class='add'>+"Mandrivalinux это &lt;b&gt;дистрибутив Linux&lt;/b&gt;, который содержит ядро системы,"</div><div class='ctx'> "именуемой &lt;b&gt;операционная система&lt;/b&gt; (основана на ядре Linux) вместе со "</div><div class='ctx'> "&lt;b&gt;множеством приложений&lt;/b&gt;, отвечающих всем вашим потребностям."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux это самый &lt;b&gt;дружественный к пользователю &lt;/b&gt; дистрибутив "</div><div class='add'>+"Mandrivalinux это самый &lt;b&gt;дружественный к пользователю &lt;/b&gt; дистрибутив "</div><div class='ctx'> "Linux на сегодняшний день. Он также является одним из &lt;b&gt;самых используемых&lt;/"</div><div class='ctx'> "b&gt; дистрибутивов Linux в мире!"</div><div class='ctx'> </div><div class='hunk'>@@ -16141,15 +16141,15 @@ msgstr "Добро пожаловать в мир &lt;b&gt;Открытых Исход</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux придерживается модели open source. Это означает что данный "</div><div class='add'>+"Mandrivalinux придерживается модели open source. Это означает что данный "</div><div class='ctx'> "новый релиз есть результат &lt;b&gt;сотрудничества&lt;/b&gt; команды &lt;b&gt;разработчиков "</div><div class='del'>-"Mandrakesoft&lt;/b&gt; и &lt;b&gt;международного сообщества&lt;/b&gt; контрибьюторов "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"Mandriva&lt;/b&gt; и &lt;b&gt;международного сообщества&lt;/b&gt; контрибьюторов "</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16169,10 +16169,10 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Большинство программного обеспечения, входящего в дистрибутив и все "</div><div class='del'>-"утилитыMandrakelinux поставляются по лицензии &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"утилитыMandrivalinux поставляются по лицензии &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16204,15 +16204,15 @@ msgstr "&lt;b&gt;Присоединяйтесь к Сообществу!&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"У Mandrakelinux &lt;b&gt;самое большое сообщество&lt;/b&gt; пользователей и "</div><div class='add'>+"У Mandrivalinux &lt;b&gt;самое большое сообщество&lt;/b&gt; пользователей и "</div><div class='ctx'> "разработчиков. Роль этого сообщества очень широка, от сообщений об ошибках "</div><div class='ctx'> "до разработки новых приложений. Сообщество играет &lt;b&gt;ключевую роль&lt;/b&gt; в "</div><div class='del'>-"мире Mandrakelinux ."</div><div class='add'>+"мире Mandrivalinux ."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16233,11 +16233,11 @@ msgstr "&lt;b&gt;Download версия&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Вы устанавливаете версию &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Это свободная "</div><div class='del'>-"версия, которую Mandrakesoft делает &lt;b&gt;доступной всем&lt;/b&gt;."</div><div class='add'>+"Вы устанавливаете версию &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Это свободная "</div><div class='add'>+"версия, которую Mandriva делает &lt;b&gt;доступной всем&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16269,10 +16269,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Вы не получите доступ к &lt;b&gt;службам, включенным&lt;/b&gt; в другие продукты "</div><div class='del'>-"Mandrakesoft. "</div><div class='add'>+"Mandriva. "</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16281,8 +16281,8 @@ msgstr "&lt;b&gt;Discovery, Ваш первый Linux Desktop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Вы устанавливаете &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Вы устанавливаете &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16305,17 +16305,17 @@ msgstr "&lt;b&gt;PowerPack, The Ultimate Linux Desktop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Вы устанавливаете &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Вы устанавливаете &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack это &lt;b&gt;главный десктопный продукт&lt;/b&gt; Mandrakesoft. PowerPack "</div><div class='add'>+"PowerPack это &lt;b&gt;главный десктопный продукт&lt;/b&gt; Mandriva. PowerPack "</div><div class='ctx'> "включает &lt;b&gt;тысячи приложений &lt;/b&gt;  все от наиболее популярных до наиболее "</div><div class='ctx'> "расширенных."</div><div class='ctx'> </div><div class='hunk'>@@ -16326,8 +16326,8 @@ msgstr "&lt;b&gt;PowerPack+, Решение Linux для рабочих столов �</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Вы устанавливаете &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Вы устанавливаете &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16343,21 +16343,21 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Продукты Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Продукты Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; разработал широкий круг продуктов &lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; разработал широкий круг продуктов &lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Продукты Mandrakelinux:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Продукты Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16377,74 +16377,74 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, Решение Linux для рабочих сто</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux для x86-64&lt;/b&gt;, Решение Mandrakelinux для успешной "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux для x86-64&lt;/b&gt;, Решение Mandrivalinux для успешной "</div><div class='ctx'> "работы на вашем 64-битном процессоре."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Продукты Mandrakesoft (Nomad продукты)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Продукты Mandriva (Nomad продукты)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft разработал два продукта, которые позволяют вам использовать "</div><div class='del'>-"Mandrakelinux &lt;b&gt;на любом компьютере&lt;/b&gt; не прибегая к установке:"</div><div class='add'>+"Mandriva разработал два продукта, которые позволяют вам использовать "</div><div class='add'>+"Mandrivalinux &lt;b&gt;на любом компьютере&lt;/b&gt; не прибегая к установке:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, это дистрибутив Mandrakelinux, который запускается "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, это дистрибутив Mandrivalinux, который запускается "</div><div class='ctx'> "непосредственно с загрузочного CD-диска."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, это дистрибутив Mandrakelinux, который "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, это дистрибутив Mandrivalinux, который "</div><div class='ctx'> "предустановлен на ультра-компактный “LaCie Mobile Hard Drive”."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Продукты Mandrakesoft (профессиональные решения)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Продукты Mandriva (профессиональные решения)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ниже представлены продукты Mandrakesoft, разработанные для удовлетворения "</div><div class='add'>+"Ниже представлены продукты Mandriva, разработанные для удовлетворения "</div><div class='ctx'> "&lt;b&gt;нужд профессионалов&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Рабочий стол Mandrakelinux для предприятий."</div><div class='add'>+"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Рабочий стол Mandrivalinux для предприятий."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Серверное решение Mandrakelinux."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Серверное решение Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Решение Mandrakelinux для безопасности."</div><div class='add'>+"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Решение Mandrivalinux для безопасности."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16487,10 +16487,10 @@ msgstr "&lt;b&gt;Выберите свою среду рабочего стола&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "В PowerPack вы сможете выбирать в каком &lt;b&gt;рабочем столе&lt;/b&gt; работать. "</div><div class='del'>-"Mandrakesoft установил &lt;b&gt;KDE&lt;/b&gt; по умолчанию."</div><div class='add'>+"Mandriva установил &lt;b&gt;KDE&lt;/b&gt; по умолчанию."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16515,10 +16515,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "В PowerPack+ вам прийдется выбрать свой &lt;b&gt;графический рабочий стол&lt;/b&gt;. По "</div><div class='del'>-"умолчанию Mandrakesoft выбрал &lt;b&gt;KDE&lt;/b&gt;."</div><div class='add'>+"умолчанию Mandriva выбрал &lt;b&gt;KDE&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16645,10 +16645,10 @@ msgstr "&lt;b&gt;Наслаждайтесь множеством приложений&lt;</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"В меню Mandrakelinux вы найдете &lt;b&gt;простые в использовании&lt;/b&gt; приложения "</div><div class='add'>+"В меню Mandrivalinux вы найдете &lt;b&gt;простые в использовании&lt;/b&gt; приложения "</div><div class='ctx'> "для &lt;b&gt;всех ваших задач&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16920,17 +16920,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Центр управления Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Центр управления Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Центр управления Mandrakelinux&lt;/b&gt; это особый набор утилит Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Центр управления Mandrivalinux&lt;/b&gt; это особый набор утилит Mandrivalinux "</div><div class='ctx'> "для упрощения настройки вашего компьютера."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16955,17 +16955,17 @@ msgstr "&lt;b&gt;Модель Open Source&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Как и все компьютерное программирование, программное обеспечение с открытыми "</div><div class='ctx'> "исходниками &lt;b&gt;требует время и людские ресурсы&lt;/b&gt; для разработки. Чтобы "</div><div class='del'>-"сохранить философию открытых исходников, Mandrakesoft продает дополнительные "</div><div class='add'>+"сохранить философию открытых исходников, Mandriva продает дополнительные "</div><div class='ctx'> "продукты и услуги, что дает возможность поддерживать&lt;b&gt;развитие "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. Если вы желаете &lt;b&gt;поддержать философию открытых "</div><div class='del'>-"исходников&lt;/b&gt; и разработку Mandrakelinux, &lt;b&gt;пожалуйста&lt;/b&gt; приобретите что-"</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. Если вы желаете &lt;b&gt;поддержать философию открытых "</div><div class='add'>+"исходников&lt;/b&gt; и разработку Mandrivalinux, &lt;b&gt;пожалуйста&lt;/b&gt; приобретите что-"</div><div class='ctx'> "нибудь из наших продуктов или услуг!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16976,10 +16976,10 @@ msgstr "&lt;b&gt;Интернет-магазин&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Чтобы узнать больше о продуктах и услугах Mandrakesoft, посетите нашу "</div><div class='add'>+"Чтобы узнать больше о продуктах и услугах Mandriva, посетите нашу "</div><div class='ctx'> "&lt;b&gt;платформу электронной коммерции&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -17005,24 +17005,24 @@ msgstr "Зайдите сегодня на &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; это &lt;b&gt;отличный помощник&lt;/b&gt; для ваших продуктов "</div><div class='del'>-"Mandrakelinux.."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; это &lt;b&gt;отличный помощник&lt;/b&gt; для ваших продуктов "</div><div class='add'>+"Mandrivalinux.."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Получите выгоду от &lt;b&gt;множества привилегий&lt;/b&gt;, вступив в Mandrakeclub, "</div><div class='add'>+"Получите выгоду от &lt;b&gt;множества привилегий&lt;/b&gt;, вступив в Mandriva Club, "</div><div class='ctx'> "например:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -17045,40 +17045,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Участие в &lt;b&gt;форумах пользователей&lt;/b&gt; Mandrakelinux."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Участие в &lt;b&gt;форумах пользователей&lt;/b&gt; Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Ранний и привилегированный доступ&lt;/b&gt;, перед общедоступным релизом к  "</div><div class='del'>-"&lt;b&gt;ISO образам&lt;/b&gt;Mandrakelinux."</div><div class='add'>+"&lt;b&gt;ISO образам&lt;/b&gt;Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; - это новый высококачественный сервис, который "</div><div class='del'>-"Mandrakesoft с гордостью предоставляет своим клиентам!"</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; - это новый высококачественный сервис, который "</div><div class='add'>+"Mandriva с гордостью предоставляет своим клиентам!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline предоставляет множество отличных услуг для &lt;b&gt;легкого "</div><div class='del'>-"обновления&lt;/b&gt; ваших систем Mandrakelinux:"</div><div class='add'>+"Mandriva Online предоставляет множество отличных услуг для &lt;b&gt;легкого "</div><div class='add'>+"обновления&lt;/b&gt; ваших систем Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17102,41 +17102,41 @@ msgstr "\t* Гибкие &lt;b&gt;запланированные&lt;/b&gt; обновлен�</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Управление &lt;b&gt;всеми вашими системами Mandrakelinux&lt;/b&gt; с одного аккаунта."</div><div class='add'>+"\t* Управление &lt;b&gt;всеми вашими системами Mandrivalinux&lt;/b&gt; с одного аккаунта."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Требуется &lt;b&gt;консультация?&lt;/b&gt; Пообщайтесь с техническими экспертами "</div><div class='del'>-"Mandrakesoft с помощью &lt;b&gt;нашей платформы тех-поддержки&lt;/b&gt; www."</div><div class='add'>+"Mandriva с помощью &lt;b&gt;нашей платформы тех-поддержки&lt;/b&gt; www."</div><div class='ctx'> "mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Благодаря помощи &lt;b&gt;квалифицированных экспертов Mandrakelinux&lt;/b&gt;, вы "</div><div class='add'>+"Благодаря помощи &lt;b&gt;квалифицированных экспертов Mandrivalinux&lt;/b&gt;, вы "</div><div class='ctx'> "сэкономите уйму времени."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"По любым вопросам в отношении Mandrakelinux вы можете приобрести инциденты "</div><div class='add'>+"По любым вопросам в отношении Mandrivalinux вы можете приобрести инциденты "</div><div class='ctx'> "поддержки в &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17436,8 +17436,8 @@ msgstr "Утилиты мониторинга, учет процессов, tcpd</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Мастера настройки от Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Мастера настройки от Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17586,7 +17586,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17600,7 +17600,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[ОПЦИИ]...\n"</div><div class='del'>-"Конфигуратор Сервера терминалов Mandrakelinux\n"</div><div class='add'>+"Конфигуратор Сервера терминалов Mandrivalinux\n"</div><div class='ctx'> "--enable         : включить MTS\n"</div><div class='ctx'> "--disable        : выключить MTS\n"</div><div class='ctx'> "--start          : запустить MTS\n"</div><div class='hunk'>@@ -17659,7 +17659,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17667,7 +17667,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[ОПЦИЯ]...\n"</div><div class='ctx'> "  --no-confirmation      не просить первого подтверждения в режиме "</div><div class='del'>-"MandrakeUpdate\n"</div><div class='add'>+"Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        не проверять подписи пакетов\n"</div><div class='ctx'> "  --changelog-first      показывать журнал изменений перед списком файлов в "</div><div class='ctx'> "окне описания\n"</div><div class='hunk'>@@ -20460,13 +20460,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Утилита создания отчета об ошибке Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Утилита создания отчета об ошибке Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Центр управления Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Центр управления Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20486,8 +20486,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20531,8 +20531,8 @@ msgstr "Мастера настройки"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Выберите утилиту Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Выберите утилиту Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20956,19 +20956,19 @@ msgstr "Запущен при загрузке"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Этот интерфейс еще не был настроен.\n"</div><div class='del'>-"Запустите помощника \"Добавить интерфейс\" из Центра Управления Mandrakelinux"</div><div class='add'>+"Запустите помощника \"Добавить интерфейс\" из Центра Управления Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "У вас еще нет ни одного настроенного соединения с Интернет.\n"</div><div class='del'>-"Запустите помощника \"%s\" из Центра Управления Mandrakelinux"</div><div class='add'>+"Запустите помощника \"%s\" из Центра Управления Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21018,8 +21018,8 @@ msgstr "KDM (менеджер экрана KDE)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Менеджер экрана Mandrakelinux)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Менеджер экрана Mandrivalinux)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21318,7 +21318,7 @@ msgstr "Импорт"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21327,7 +21327,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (оригинальная версия)\n"</div><div class='hunk'>@@ -21879,14 +21879,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Это свободное программное обеспечение и оно может распространяться в "</div><div class='ctx'> "соответствии с условиями лицензии GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21916,7 +21916,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Центр справки Mandrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -25449,8 +25449,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Журналы утилит Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Журналы утилит Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25963,10 +25963,10 @@ msgstr "Подключение выполнено."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Подключение завершилось неудачей.\n"</div><div class='del'>-"Проверьте свои настройки в Центре управления Mandrakelinux."</div><div class='add'>+"Проверьте свои настройки в Центре управления Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/sc.po b/perl-install/share/po/sc.po<br/>index 2cb53006e..fa4ceac7e 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/sc.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/sc.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/sc.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sc.po</a></div><div class='hunk'>@@ -66,14 +66,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sa crai USB parit ki tenjat amparu de scriidura, ma no da podeus bogai\n"</div><div class='ctx'> "in siguresa imoi.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Crica su butoni po torrai a allui sa màkina, bogadda, boga s'amparu de\n"</div><div class='del'>-"scriidura, torradda a ponni e a lançai Mandrake Move."</div><div class='add'>+"scriidura, torradda a ponni e a lançai Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -91,7 +91,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sa crai USB no tenit pratziduras Windows (FAT) bàlidas.\n"</div><div class='hunk'>@@ -102,14 +102,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Podis sighiri finas sentza de crai USB - as a podi ancora\n"</div><div class='del'>-"imprea Mandrake Move ke unu Sistema Obradori Mandrake\n"</div><div class='add'>+"imprea Mandriva Move ke unu Sistema Obradori Mandrake\n"</div><div class='ctx'> "normali live."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -117,11 +117,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "No eus agatau crai USB in su sistema. Ki ponis\n"</div><div class='del'>-"una crai USB imoi, Mandrake Move at a podi sarvai\n"</div><div class='add'>+"una crai USB imoi, Mandriva Move at a podi sarvai\n"</div><div class='ctx'> "is dadus in siguresa in sa directory home tua e in su\n"</div><div class='ctx'> "assètiu generali de sistema, po atra alluidura in custa\n"</div><div class='ctx'> "computadora o in d-una atra. Mi': ki ponis una crai imoi,\n"</div><div class='hunk'>@@ -129,7 +129,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Podis sighiri finas sentza de crai USB - as a podi ancora\n"</div><div class='del'>-"imprea Mandrake Move ke unu Sistema Obradori Mandrake\n"</div><div class='add'>+"imprea Mandriva Move ke unu Sistema Obradori Mandrake\n"</div><div class='ctx'> "normali live."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -254,7 +254,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1262,11 +1262,11 @@ msgstr "Sçoberu de sa lìngua"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux podit suportai prus lìnguas a sa borta. Sçobera\n"</div><div class='add'>+"Mandrivalinux podit suportai prus lìnguas a sa borta. Sçobera\n"</div><div class='ctx'> "is lìnguas ki bolis aposentai. Ndi as a podi disponni candu as a\n"</div><div class='ctx'> "essi acabau s'aposentadura e torrau a allui su sistema."</div><div class='ctx'> </div><div class='hunk'>@@ -3532,7 +3532,7 @@ msgstr "abiva su suportu arràdiu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3642,7 +3642,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3653,11 +3653,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3764,10 +3764,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3876,7 +3876,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -3974,12 +3974,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4006,7 +4006,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4015,7 +4015,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4144,7 +4144,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4162,7 +4162,7 @@ msgstr "Agoa"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4191,7 +4191,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4207,7 +4207,7 @@ msgstr "Aministradori de Siguresa"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4293,7 +4293,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4338,7 +4338,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4347,13 +4347,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4394,7 +4394,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4551,7 +4551,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4572,7 +4572,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4672,7 +4672,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4689,7 +4689,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4751,7 +4751,7 @@ msgstr "Serbìtzius"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5072,7 +5072,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5177,19 +5177,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5211,7 +5211,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5219,14 +5219,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5236,7 +5236,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5256,10 +5256,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5270,11 +5270,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5290,7 +5290,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5347,7 +5347,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5355,13 +5355,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Cumprimentus, s'aposentadura est acabada.\n"</div><div class='ctx'> "Boga su mèdiu de alluidura e craca return po torrai a allui.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Po sciri de ajorronus disponiditzus po custa versioni de Mandrakelinux,\n"</div><div class='add'>+"Po sciri de ajorronus disponiditzus po custa versioni de Mandrivalinux,\n"</div><div class='ctx'> "ligi is Errata a disposta de:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5369,7 +5369,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Imparus po assetiai su sistema funt a disposta in su cabìtulu\n"</div><div class='del'>-"post install de sa Official Mandrakelinux User's Guide."</div><div class='add'>+"post install de sa Official Mandrivalinux User's Guide."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -5400,7 +5400,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -5910,9 +5910,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Cuntatu su jassu web de Mandrakelinux po tenni sa lista de is sprigus..."</div><div class='add'>+"Cuntatu su jassu web de Mandrivalinux po tenni sa lista de is sprigus..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6116,8 +6116,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Aposentadura de Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Aposentadura de Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -8678,7 +8678,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12233,7 +12233,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13897,18 +13897,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -13917,7 +13917,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -13934,9 +13934,9 @@ msgstr ""</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -13956,7 +13956,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -13982,10 +13982,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14004,8 +14004,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14032,7 +14032,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14042,7 +14042,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14061,13 +14061,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14079,7 +14079,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14093,19 +14093,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14126,61 +14126,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14218,7 +14218,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14239,7 +14239,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14356,7 +14356,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14591,14 +14591,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14620,9 +14620,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14634,7 +14634,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14657,20 +14657,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -14689,33 +14689,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -14738,32 +14738,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15054,7 +15054,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -15150,7 +15150,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15198,7 +15198,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17648,12 +17648,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -17674,7 +17674,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -17719,7 +17719,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18123,14 +18123,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -18181,7 +18181,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18466,7 +18466,7 @@ msgstr ""</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -18924,7 +18924,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -18951,7 +18951,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -21925,7 +21925,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -22429,7 +22429,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='head'>diff --git a/perl-install/share/po/sk.po b/perl-install/share/po/sk.po<br/>index b0d4cae16..d8758600e 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/sk.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/sk.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/sk.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sk.po</a></div><div class='hunk'>@@ -68,14 +68,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Zdá sa, že USB kľúč je chránený proti zápisu, takže nie je možné ho\n"</div><div class='ctx'> "bezpečne odpojiť.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknite na tlačidlo reštart, odpojte ho, zrušte ochranu proti zápisu,\n"</div><div class='del'>-"pripojte opäť kľúč a spustite Mandrake Move znova."</div><div class='add'>+"pripojte opäť kľúč a spustite Mandriva Move znova."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -93,7 +93,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Váš USB disk neobsahuje platný oddiel s FAT.\n"</div><div class='hunk'>@@ -105,14 +105,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Môžete tiež pokračovať bez USB disku - stále potom môžete používať\n"</div><div class='del'>-"vašu distribúciu MandrakeMove ako bežný produkčný operačný\n"</div><div class='add'>+"vašu distribúciu Mandriva Move ako bežný produkčný operačný\n"</div><div class='ctx'> "systém."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -120,11 +120,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Na vašom systéme nebol nájdený žiadny USB disk. Ak ho teraz\n"</div><div class='del'>-"zasuniete, Mandrake Move bude mať možnosť transparentne\n"</div><div class='add'>+"zasuniete, Mandriva Move bude mať možnosť transparentne\n"</div><div class='ctx'> "ukadať dáta vo vašom domovskom adresári a systémové nastavenia,\n"</div><div class='ctx'> "ktoré budú dostupné pri ďalšom štarte tohoto alebo iného\n"</div><div class='ctx'> "počítača. Poznámka: ak disk zasuniete teraz, počkajte pred ďalším hľadaním "</div><div class='hunk'>@@ -132,7 +132,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Tiež môžete pokračovať bez USB disku - stále budete môcť používať vašu "</div><div class='del'>-"distribúciu Mandrake Move ako bežný produkčný operačný\n"</div><div class='add'>+"distribúciu Mandriva Move ako bežný produkčný operačný\n"</div><div class='ctx'> "systém."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -258,7 +258,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -275,7 +275,7 @@ msgstr ""</div><div class='ctx'> "Táto chyba môže pochádzať z narušených systémových\n"</div><div class='ctx'> "súborov s nastavením na USB disku; v tomto prípade by problém\n"</div><div class='ctx'> "vyriešilo odstránenie týchto súborov a opätovné naštartovanie systému\n"</div><div class='del'>-"Mandrake Move. Ak to chcete urobiť, stlačte zodpovedajúce tlačidlo.\n"</div><div class='add'>+"Mandriva Move. Ak to chcete urobiť, stlačte zodpovedajúce tlačidlo.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Tiež môžete systém reštartovať a vybrať USB disk, alebo si\n"</div><div class='hunk'>@@ -1310,7 +1310,7 @@ msgstr "Výber jazyka"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "Môžete zvoliť ďalšie jazyky použiteľné po inštalácii"</div><div class='hunk'>@@ -3725,12 +3725,12 @@ msgstr "povoliť podporu pre rádia"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Pred tým než budete pokračovať, mali by ste si pozorne prečítať\n"</div><div class='del'>-"licenčné podmienky. Pokrývajú celú distribúciu Mandrakelinux\n"</div><div class='add'>+"licenčné podmienky. Pokrývajú celú distribúciu Mandrivalinux\n"</div><div class='ctx'> "Ak súhlasíte so všetkými jej bodmi kliknite na tlačidlo \"%s\".\n"</div><div class='ctx'> "Ak nesúhlasíte kliknite na tlačidlo \"%s\" a váš počítač bude reštartovaný."</div><div class='ctx'> </div><div class='hunk'>@@ -3912,13 +3912,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Inštalácia Mandrakelinuxu je distribuovaná na viacerých CD-ROM diskoch. "</div><div class='add'>+"Inštalácia Mandrivalinuxu je distribuovaná na viacerých CD-ROM diskoch. "</div><div class='ctx'> "DrakX\n"</div><div class='ctx'> "vie zistiť, ak je vybraný balík umiestnený na inom CD-ROM disku, vysunie\n"</div><div class='ctx'> "aktuálne CD a vypýta si od vás to ktoré je práve potrebné. Ak toto CD "</div><div class='hunk'>@@ -3928,11 +3928,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3984,7 +3984,7 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Teraz je možné vybrať, ktoré programy chcete nainštalovať na váš systém.\n"</div><div class='del'>-"Mandrakelinux obsahuje tisíce balčkov s programami. Pre jednoduchšiu "</div><div class='add'>+"Mandrivalinux obsahuje tisíce balčkov s programami. Pre jednoduchšiu "</div><div class='ctx'> "orientáciu\n"</div><div class='ctx'> "boly rozdelené do skupín, ktoré združujú podobné aplikácie.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4095,10 +4095,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4128,12 +4128,12 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Ak boli vybrané balíky, ktoré sú určené pre server, buď zámerne alebo\n"</div><div class='ctx'> "preto že sú súčasťou celej skupiny, budete musieť potvrdiť, či skutočne\n"</div><div class='del'>-"chcete tieto služby nainštalovať. V prípade Mandrakelinuxu, sú štandardne "</div><div class='add'>+"chcete tieto služby nainštalovať. V prípade Mandrivalinuxu, sú štandardne "</div><div class='ctx'> "všetky\n"</div><div class='ctx'> "nainštalované služby spúšťané pri štarte systému. Aj keď sú bezpečné\n"</div><div class='ctx'> "a v čase keď bola distribúcia vydaná neobsahovali žiadne známe problémy\n"</div><div class='ctx'> "je možné, že tieto bezpečnostné problémy budú odhalené až po dokončení\n"</div><div class='del'>-"tejto verzie Mandrakelinuxu. Ak neviete čo jednotlivé servisy znamenajú, "</div><div class='add'>+"tejto verzie Mandrivalinuxu. Ak neviete čo jednotlivé servisy znamenajú, "</div><div class='ctx'> "alebo\n"</div><div class='ctx'> "prečo boli nainštalované tak kliknite na \"%s\". Kliknutím na \"%s\" budú\n"</div><div class='ctx'> "vypísané služby nainštalované a automaticky naštartované pri spustení\n"</div><div class='hunk'>@@ -4294,7 +4294,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4350,7 +4350,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (X Window System) je srdcom grafického rozhrania GNU/Linux systému\n"</div><div class='ctx'> "spolu so všetkými grafickými prostrediami (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaked, atď.) distribuovanými s Mandrakelinux systémom.\n"</div><div class='add'>+"WindowMaked, atď.) distribuovanými s Mandrivalinux systémom.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Zmenou nasledovných parametrov môžete dosiahnuť optimálne nastavenie\n"</div><div class='ctx'> "vášho grafického systému.\n"</div><div class='hunk'>@@ -4474,12 +4474,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4506,7 +4506,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4515,7 +4515,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4535,7 +4535,7 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Teraz si môžete zvoliť, kam si želáte nainštalovať Mandrakelinux\n"</div><div class='add'>+"Teraz si môžete zvoliť, kam si želáte nainštalovať Mandrivalinux\n"</div><div class='ctx'> "na váš disk. Ak je váš disk prázdny alebo ak na ňom\n"</div><div class='ctx'> "už existuje operačný systém, ktorý zaberá všetko dostupné miesto, bude\n"</div><div class='ctx'> "potrebné ho prerozdeliť. Prerozdeľovanie pozostáva z logického\n"</div><div class='hunk'>@@ -4574,7 +4574,7 @@ msgstr ""</div><div class='ctx'> "po predchádzajúcom defragmentovaní Windows oblasti, ak obsahuje FAT "</div><div class='ctx'> "súborový\n"</div><div class='ctx'> "systém. Je veľmi odporúčané si najprv odzálohovať údaje. Toto riešenie je\n"</div><div class='del'>-"odporúčané použiť ak si chcete používať spoločne Mandrakelinux aj Microsoft "</div><div class='add'>+"odporúčané použiť ak si chcete používať spoločne Mandrivalinux aj Microsoft "</div><div class='ctx'> "Windows\n"</div><div class='ctx'> "na jednom počítači.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4586,7 +4586,7 @@ msgstr ""</div><div class='ctx'> "Vaším Microsoft Windows systémom.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": ak si želáte vymazať všetky údaje a všetky oddiely\n"</div><div class='del'>-"prítomné na vašom pevnom disku a nahradiť ich vašim novým Mandrakelinux\n"</div><div class='add'>+"prítomné na vašom pevnom disku a nahradiť ich vašim novým Mandrivalinux\n"</div><div class='ctx'> "systémom, zvoľte si túto voľbu. Buďte opatrní pri tejto možnosti, pretože "</div><div class='ctx'> "nebude\n"</div><div class='ctx'> "žiadna možnosť zvrátiť vaše rozhodnutie keď ho potvrdíte.\n"</div><div class='hunk'>@@ -4755,7 +4755,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4780,7 +4780,7 @@ msgstr ""</div><div class='ctx'> "Kliknite na \"%s\" ak ste pripravený formátovať vybrané oddiely.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknite na \"%s\" ak si chcete zvoliť iné oddiely pre inštaláciu vášho\n"</div><div class='del'>-"nového Mandrakelinux systému.\n"</div><div class='add'>+"nového Mandrivalinux systému.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknite na \"%s\" ak si chcete vybrať oddiely, ktoré budú kontrolované\n"</div><div class='ctx'> "na prítomnosť chybných blokov na disku."</div><div class='hunk'>@@ -4797,7 +4797,7 @@ msgstr "Späť"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4809,7 +4809,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Po nainštalovaní Mandrakelinux systému je pravdepodobné, že niektoré\n"</div><div class='add'>+"Po nainštalovaní Mandrivalinux systému je pravdepodobné, že niektoré\n"</div><div class='ctx'> "balíky ktoré sa nachádzali v distribúcii, nezodpovedajú ich aktuálnym\n"</div><div class='ctx'> "verziám. Môžu v nich byť opravené chyby alebo bezpečnostné nedostatky.\n"</div><div class='ctx'> "Aby ste mohli tieto opravy aplikovať, budete si ich teraz môcť stiahnuť\n"</div><div class='hunk'>@@ -4838,7 +4838,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4853,7 +4853,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Ak si neviete vybrať, ponechajte štandardné nastavenie.Budete ju však\n"</div><div class='ctx'> "mať možnosť zmeniť pomocou programu drakcec, ktorý je súčasťou\n"</div><div class='del'>-"Kontrolného Centra Mandrakelinuxu\n"</div><div class='add'>+"Kontrolného Centra Mandrivalinuxu\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Do políčka \"%s\" zadajte e-mailovú adresu osoby zodpovednej za\n"</div><div class='ctx'> "bezpečnosť vášho PC. Na túto adresu budú zasielané\n"</div><div class='hunk'>@@ -4868,7 +4868,7 @@ msgstr "Bezpečnostný administrátor"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4939,7 +4939,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Na tomto mieste je potrebné aby ste si vybrali oblasti, ktoré budú použité\n"</div><div class='del'>-"na inštaláciu Mandrakelinuxu. Ak už boli oddiely definované,\n"</div><div class='add'>+"na inštaláciu Mandrivalinuxu. Ak už boli oddiely definované,\n"</div><div class='ctx'> "napríklad pri predchádzajúcej inštalácii GNU/Linux-u alebo iným nástrojom\n"</div><div class='ctx'> "pre správu oblastí, môžete použiť už existujúce oblasti. Inak musia byť\n"</div><div class='ctx'> "oblasti teraz definované.\n"</div><div class='hunk'>@@ -5036,7 +5036,7 @@ msgstr "Prepnúť medzi normálnym/expertným režimom"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5066,7 +5066,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bol nájdený viac ako jeden Microsoft oddiel na vašom pevnom disku.\n"</div><div class='ctx'> "Vyberte si prosím jeden, ktorý chcete nastaviť pre inštaláciu vášho\n"</div><div class='del'>-"nového Mandrakelinux operačného systému.\n"</div><div class='add'>+"nového Mandrivalinux operačného systému.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Všetky oddiely sú zobrazené nasledovne: \"Linux meno\", \"Windows meno\",\n"</div><div class='ctx'> "\"Kapacita\".\n"</div><div class='hunk'>@@ -5115,7 +5115,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5124,20 +5124,20 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tento krok sa aktivuje iba vtedy, ak sú na vašom systéme nájdené staršie\n"</div><div class='ctx'> "GNU/Linux oddiely.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX teraz potrebuje vedieť či si želáte vykonať novú inštaláciu alebo "</div><div class='ctx'> "aktualizáciu\n"</div><div class='del'>-"existujúceho Mandrakelinux systému:\n"</div><div class='add'>+"existujúceho Mandrivalinux systému:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Pomocou tejto voľby môžete kompletne zrušiť váš predchádzajúci\n"</div><div class='ctx'> "operačný systém. Ak si želáte zmeniť rozloženie oddielov na vašich diskoch "</div><div class='hunk'>@@ -5148,13 +5148,13 @@ msgstr ""</div><div class='ctx'> "údajov.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": táto trieda inštalácie vám umožňuje aktualizovať balíky, ktoré\n"</div><div class='del'>-"sú momentálne nainštalované vo vašom Mandrakelinux systéme. Aktuálne\n"</div><div class='add'>+"sú momentálne nainštalované vo vašom Mandrivalinux systéme. Aktuálne\n"</div><div class='ctx'> "rozdelenie oddielov a používateľské údaje nebudú prepísané. Mnohé ostatné "</div><div class='ctx'> "kroky\n"</div><div class='ctx'> "inštalácie ostanú dostupné, podobne ako pri štandardnej inštalácii.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Použitie voľby ``Aktualizácia'' by malo fungovať správne pre systémy\n"</div><div class='del'>-"Mandrakelinux \"8.1\" a novšie. Vykonanie Aktualizácie pre staršie verzie "</div><div class='add'>+"Mandrivalinux \"8.1\" a novšie. Vykonanie Aktualizácie pre staršie verzie "</div><div class='ctx'> "ako\n"</div><div class='ctx'> "\"8.1\" nie je odporúčané.\""</div><div class='ctx'> </div><div class='hunk'>@@ -5211,7 +5211,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5507,7 +5507,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5528,11 +5528,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Teraz nastal čas výberu tlačového systému pre váš počítač. Iné operačné\n"</div><div class='del'>-"systémy vám poskytujú zvyčajne iba jediný, Mandrakelinux vám poskytuje dva.\n"</div><div class='add'>+"systémy vám poskytujú zvyčajne iba jediný, Mandrivalinux vám poskytuje dva.\n"</div><div class='ctx'> "Kazdý z nich je vhodný pre iný typ konfigurácie.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" - čo znamená ``tlačiť, neukladať do fronty'', je vhodný výber ak\n"</div><div class='hunk'>@@ -5555,7 +5555,7 @@ msgstr ""</div><div class='ctx'> "nástroje na tlačenie, pre výber tlačiarní alebo ich manažovanie.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ak neskôr budete chciet svoju voľbu zmeniť alebo budete chcieť odstrániť\n"</div><div class='del'>-"tlačový systém môžete tak spraviť za pomoci PrinterDrake z Mandrakelinux\n"</div><div class='add'>+"tlačový systém môžete tak spraviť za pomoci PrinterDrake z Mandrivalinux\n"</div><div class='ctx'> "Kontrolného centra kliknutím na tlačidlo \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='hunk'>@@ -5673,7 +5673,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5690,7 +5690,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5743,7 +5743,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": ak si teraz želáte nastaviť vaše Internetové pripojenie\n"</div><div class='ctx'> "alebo prístup do lokálnej siete. Prezrite si tlačenú dokumentáciu alebo "</div><div class='ctx'> "použite\n"</div><div class='del'>-"Kontrolné centrum Mandrakelinux ak už bude inštalácia ukončená aby ste mali\n"</div><div class='add'>+"Kontrolné centrum Mandrivalinux ak už bude inštalácia ukončená aby ste mali\n"</div><div class='ctx'> "prístup k dokumentácii.\n"</div><div class='ctx'> " * \"%s\": vám umožní nastaviť HTTP alebo FTP proxy ak je počítač\n"</div><div class='ctx'> "umiestnený za proxy serverom.\n"</div><div class='hunk'>@@ -5759,7 +5759,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": ak si želáte zmeniť konfiguráciu zavádzača, kliknite na toto\n"</div><div class='ctx'> "tlačidlo. Táto možnosť je rezervovaná pre skúsených používateľov. Prezrite\n"</div><div class='ctx'> "si tlačenú dokumentáciu alebo internú dokumentáciu vrámci Kontrolného\n"</div><div class='del'>-"centra Mandrakelinux.\n"</div><div class='add'>+"centra Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": máte možnosť definitívne nastaviť služby, ktoré budú\n"</div><div class='ctx'> "spúšťané na vašom počítači. Ak plánujete používať tento počítač ako\n"</div><div class='hunk'>@@ -5820,11 +5820,11 @@ msgstr "Služby"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vyberte si pevný disk, ktorý chcete vymazať aby ste mohli vytvoriť\n"</div><div class='del'>-"nový oddiel pre Mandrakelinux. Buďte opatrní, všetky údaje ktoré sa\n"</div><div class='add'>+"nový oddiel pre Mandrivalinux. Buďte opatrní, všetky údaje ktoré sa\n"</div><div class='ctx'> "na disku nachádzajú budú odstránené a nebude možné ich obnoviť!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6179,7 +6179,7 @@ msgstr "Použiť voľné miesto z Windows oddielu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Váš oddiel s Windows je veľmi fragmentovaný, prosím spustite najprv  "</div><div class='hunk'>@@ -6299,19 +6299,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6333,7 +6333,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6341,14 +6341,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6358,7 +6358,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6378,10 +6378,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6392,11 +6392,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6412,7 +6412,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "VAROVANIE: Toto je voľný neautorizovaný preklad originálnej licencie v "</div><div class='ctx'> "anglickom jazyku.\n"</div><div class='hunk'>@@ -6422,20 +6422,20 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Úvod\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Operačný systém a rôzne iné súčasti dostupné v distribúcii Mandrakelinux, "</div><div class='add'>+"Operačný systém a rôzne iné súčasti dostupné v distribúcii Mandrivalinux, "</div><div class='ctx'> "budú ďalej\n"</div><div class='ctx'> "nazvané \"softvérové produkty\". Softvérové produkty, ktoré obvykle  "</div><div class='ctx'> "obsahujú, ale\n"</div><div class='ctx'> "nie sú obmedzené len na súbor programov, metód, pravidiel a dokumentácie, "</div><div class='ctx'> "vzťahujúcej sa\n"</div><div class='del'>-"k operačnému systému a rôznych súčastí distribúcie Mandrakelinux.\n"</div><div class='add'>+"k operačnému systému a rôznych súčastí distribúcie Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Licenčná zmluva\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Prosíme vás, aby ste si nasledujúci dokument pozorne prečítali. Tento "</div><div class='ctx'> "dokument je licenčnou zmluvou\n"</div><div class='del'>-"medzi vami a Mandrakesoft S.A., ktorý sa vzťahuje k softvérovým produktom.\n"</div><div class='add'>+"medzi vami a Mandriva S.A., ktorý sa vzťahuje k softvérovým produktom.\n"</div><div class='ctx'> "Nainštalovaním, vytváraním kópií alebo používaním softvérového produktu za "</div><div class='ctx'> "akýmkoľvek účelom,\n"</div><div class='ctx'> "automaticky akceptujete a plne súhlasíte so všetkými bodmi tejto licencie.\n"</div><div class='hunk'>@@ -6456,7 +6456,7 @@ msgstr ""</div><div class='ctx'> "Softvérové produkty a priložená dokumentácia sú poskytovaná \"tak ako je\", "</div><div class='ctx'> "bez akejkoľvek\n"</div><div class='ctx'> "záruky v medziach umožnených zákonom.\n"</div><div class='del'>-"Mandrakesoft S.A. nebude za žiadnych okolností a v medziach umožnených "</div><div class='add'>+"Mandriva S.A. nebude za žiadnych okolností a v medziach umožnených "</div><div class='ctx'> "zákonom zodpovedať\n"</div><div class='ctx'> "za žiadne zvláštne, náhodné, priame alebo nepriame škody (vrátane straty "</div><div class='ctx'> "obchodných pohľadávok,\n"</div><div class='hunk'>@@ -6466,11 +6466,11 @@ msgstr ""</div><div class='ctx'> "vzniknuté používaním,\n"</div><div class='ctx'> "alebo z dôvodu používateľovej neschopnosti používať Softvérové produkty a to "</div><div class='ctx'> "i v prípade, že\n"</div><div class='del'>-"Mandrakesoft S.A. bol upozornený na možnosť výskytu takýchto škôd.\n"</div><div class='add'>+"Mandriva S.A. bol upozornený na možnosť výskytu takýchto škôd.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "OBMEDZENÁ ZODPOVEDNOSŤ SPOJENÁ S VLASTNÍCTVOM ALEBO POUŽITÍM ZAKÁZANÉHO "</div><div class='ctx'> "SOFTVÉRU V NIEKTORÝCH KRAJINÁCH\n"</div><div class='del'>-"Mandrakesoft S.A. alebo jeho distribútori, v medziach umožnených zákonom, "</div><div class='add'>+"Mandriva S.A. alebo jeho distribútori, v medziach umožnených zákonom, "</div><div class='ctx'> "nie sú zodpovedný\n"</div><div class='ctx'> "za žiadne zvláštne, náhodné, priame alebo nepriame škody (vrátane straty "</div><div class='ctx'> "obchodných pohľadávok,\n"</div><div class='hunk'>@@ -6480,7 +6480,7 @@ msgstr ""</div><div class='ctx'> "vlastneniu alebo\n"</div><div class='ctx'> "používaniu softvérových komponentov alebo vzniknuté stiahnutím softvérových "</div><div class='ctx'> "komponentov z niektorého\n"</div><div class='del'>-"servera Mandrakelinux, ktoré sú zakázané alebo obmedzené v niektorých "</div><div class='add'>+"servera Mandrivalinux, ktoré sú zakázané alebo obmedzené v niektorých "</div><div class='ctx'> "krajinách miernymi zákonmi.\n"</div><div class='ctx'> "Táto obmedzená zodpovednosť sa vzťahuje ale nie je obmedzená len na "</div><div class='ctx'> "komponenty obsahujúce\n"</div><div class='hunk'>@@ -6499,11 +6499,11 @@ msgstr ""</div><div class='ctx'> "prečítajte si pozorne\n"</div><div class='ctx'> "podmienky licenčnej zmluvy pre každý komponent pred jeho používaním. "</div><div class='ctx'> "Adresátom akýchkoľvek otázok\n"</div><div class='del'>-"ohľadne licencie ku komponentu by mal byť jeho autor a nie Mandrakesoft. "</div><div class='add'>+"ohľadne licencie ku komponentu by mal byť jeho autor a nie Mandriva. "</div><div class='ctx'> "Programy vyvinuté\n"</div><div class='del'>-"Mandrakesoft S.A. sú poskytované pod podmienkami GPL Licencie. Dokumentácia "</div><div class='add'>+"Mandriva S.A. sú poskytované pod podmienkami GPL Licencie. Dokumentácia "</div><div class='ctx'> "napísaná\n"</div><div class='del'>-"Mandrakesoft S.A. je poskytovaná pod špecifickou licenciou. Prosíme, "</div><div class='add'>+"Mandriva S.A. je poskytovaná pod špecifickou licenciou. Prosíme, "</div><div class='ctx'> "preštudujte si dokumentáciu\n"</div><div class='ctx'> "pre ďalšie detaily.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6514,12 +6514,12 @@ msgstr ""</div><div class='ctx'> "sú chránené právami\n"</div><div class='ctx'> "na duševné vlastníctvo a zákonmi vzťahujúcimi sa k vlastníckym právam k "</div><div class='ctx'> "softvérovým programom.\n"</div><div class='del'>-"Mandrakesoft S.A. si vyhradzuje právo upraviť alebo prispôsobiť Softvérové "</div><div class='add'>+"Mandriva S.A. si vyhradzuje právo upraviť alebo prispôsobiť Softvérové "</div><div class='ctx'> "produkty ako celok\n"</div><div class='ctx'> "alebo jednotlivé časti, akýmkoľvek spôsobom a za akýmikoľvek účelmi. "</div><div class='del'>-"\"Mandrake\", \"Mandrake\n"</div><div class='add'>+"\"Mandriva\", \"Mandrake\n"</div><div class='ctx'> "Linux\" a pridružené logá sú chránenými obchodnými značkami spoločnosti "</div><div class='del'>-"Mandrakesoft S.A.\n"</div><div class='add'>+"Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Zákony vzťahujúce sa k tejto zmluve\n"</div><div class='hunk'>@@ -6535,7 +6535,7 @@ msgstr ""</div><div class='ctx'> "bude spor\n"</div><div class='ctx'> "zverený na prejednanie príslušným súdom v Paríži - Francúzsko. Ak máte "</div><div class='ctx'> "akékoľvek otázky k tomuto\n"</div><div class='del'>-"dokumentu, prosíme, kontaktujte Mandrakesoft S.A.\n"</div><div class='add'>+"dokumentu, prosíme, kontaktujte Mandriva S.A.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6629,7 +6629,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6637,13 +6637,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gratulujeme, inštalácia je ukončená.\n"</div><div class='ctx'> "Vyberte spúšťacie médium a stačte Enter pre reštart.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Informácie o aktuálnych opravách pre túto verziu Mandrakelinuxu,\n"</div><div class='add'>+"Informácie o aktuálnych opravách pre túto verziu Mandrivalinuxu,\n"</div><div class='ctx'> "sú dostupné na:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6651,7 +6651,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informácie o konfigurovaní vášho systému sa\n"</div><div class='del'>-"nachádzajú v oficiálnej Mandrakelinux používateľskej príručke.\n"</div><div class='add'>+"nachádzajú v oficiálnej Mandrivalinux používateľskej príručke.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ak ste našli chybu (alebo nájdete neskôr) v preklade, kontaktujte prosím\n"</div><div class='hunk'>@@ -6689,12 +6689,12 @@ msgstr "Spúšťam krok %s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Váš systém má nedostatok prostriedkov. Možno budete mať problémy s\n"</div><div class='del'>-"inštaláciou Mandrakelinux. Ak sa tak stane, skúste textovú inštaláciu. Pre "</div><div class='add'>+"inštaláciou Mandrivalinux. Ak sa tak stane, skúste textovú inštaláciu. Pre "</div><div class='ctx'> "jej\n"</div><div class='ctx'> "spustenie stlačte `F1' po naštartovaní z CDROMky a zadajte `text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7235,9 +7235,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pripájam sa k web stránke Mandrakelinux pre stiahnutie zoznamu zrkadiel..."</div><div class='add'>+"Pripájam sa k web stránke Mandrivalinux pre stiahnutie zoznamu zrkadiel..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7457,8 +7457,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Inštalácia Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Inštalácia Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10044,7 +10044,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14093,7 +14093,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16034,33 +16034,33 @@ msgstr "Zastaviť"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Čo je to Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Čo je to Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Vitajte v &lt;b&gt;Mandrakelinux&lt;/b&gt;-e!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Vitajte v &lt;b&gt;Mandrivalinux&lt;/b&gt;-e!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux je &lt;b&gt;Linux distribúcia&lt;/b&gt; ktorá pozostáva z jadra systému, "</div><div class='add'>+"Mandrivalinux je &lt;b&gt;Linux distribúcia&lt;/b&gt; ktorá pozostáva z jadra systému, "</div><div class='ctx'> "nazývaného &lt;b&gt;operačný systém&lt;/b&gt; (založený na jadre Linux), spolu s "</div><div class='ctx'> "&lt;b&gt;množstvom aplikácií&lt;/b&gt; poskytujúcich všetko čo by ste si mohli želať."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux je jedna z najviac &lt;b&gt;používateľsky prívetivých&lt;/b&gt; Linux "</div><div class='add'>+"Mandrivalinux je jedna z najviac &lt;b&gt;používateľsky prívetivých&lt;/b&gt; Linux "</div><div class='ctx'> "distribúcií v súčastnosti. Je taktiež jedna z celosvetovo &lt;b&gt;najviac "</div><div class='ctx'> "používaných&lt;/b&gt; Linux distribúcií!"</div><div class='ctx'> </div><div class='hunk'>@@ -16077,14 +16077,14 @@ msgstr "Vitajte vo &lt;b&gt;svete open source&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux je príspevok do modelu open source. Znamená to, že táto nová "</div><div class='del'>-"verzia je výsledkom &lt;b&gt;spolupráce&lt;/b&gt; medzi &lt;b&gt;týmom vývojárov Mandrakesoft&lt;/"</div><div class='del'>-"b&gt; a &lt;b&gt;celosvetovou komunitou&lt;/b&gt; prispievateľov do projektu Mandrakelinux."</div><div class='add'>+"Mandrivalinux je príspevok do modelu open source. Znamená to, že táto nová "</div><div class='add'>+"verzia je výsledkom &lt;b&gt;spolupráce&lt;/b&gt; medzi &lt;b&gt;týmom vývojárov Mandriva&lt;/"</div><div class='add'>+"b&gt; a &lt;b&gt;celosvetovou komunitou&lt;/b&gt; prispievateľov do projektu Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16104,9 +16104,9 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Množstvo softvéru zahrnutého v tejto distribúcii a všetky Mandrakelinux "</div><div class='add'>+"Množstvo softvéru zahrnutého v tejto distribúcii a všetky Mandrivalinux "</div><div class='ctx'> "špecifické nástroje sú pokryté licenciou &lt;b&gt;GPL&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16137,14 +16137,14 @@ msgstr "&lt;b&gt;Pridajte sa ku komunite&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux má jednu z &lt;b&gt;najväčších komunít&lt;/b&gt; používateľov a vývojárov. "</div><div class='add'>+"Mandrivalinux má jednu z &lt;b&gt;najväčších komunít&lt;/b&gt; používateľov a vývojárov. "</div><div class='ctx'> "Rola komunity je veľmi široká, od hlásenia problémov a chých až po vývoj "</div><div class='del'>-"nových aplikácií. Komunita hrá &lt;b&gt;kľúčovú rolu&lt;/b&gt; vo svete Mandrakelinux."</div><div class='add'>+"nových aplikácií. Komunita hrá &lt;b&gt;kľúčovú rolu&lt;/b&gt; vo svete Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16165,11 +16165,11 @@ msgstr "&lt;b&gt;Download verzia&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Práve inštalujete &lt;b&gt;Mandrakelinux download verziu&lt;/b&gt;. Toto je voľne "</div><div class='del'>-"dostupná verzia ktorú Mandrakesoft dáva k &lt;b&gt;dispozízii každému&lt;/b&gt;."</div><div class='add'>+"Práve inštalujete &lt;b&gt;Mandrivalinux download verziu&lt;/b&gt;. Toto je voľne "</div><div class='add'>+"dostupná verzia ktorú Mandriva dáva k &lt;b&gt;dispozízii každému&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16201,9 +16201,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Nemáte prístup k &lt;b&gt;službám obsiahnutých&lt;/b&gt; v iných Mandrakesoft produktoch."</div><div class='add'>+"Nemáte prístup k &lt;b&gt;službám obsiahnutých&lt;/b&gt; v iných Mandriva produktoch."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16212,7 +16212,7 @@ msgstr "&lt;b&gt;Discovery, vaša prvá Linux pracovná stanica&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr "Práve inštalujete &lt;b&gt;Mandralinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -16235,13 +16235,13 @@ msgstr "&lt;b&gt;PowerPack, skvelý Linux pre pracovnú stanicu&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr "Práve inštalujete &lt;b&gt;Mandralinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16256,8 +16256,8 @@ msgstr "&lt;b&gt;PowerPack+, Linuxové riešenie pre pracovné stanice a servery&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Práve inštalujete &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Práve inštalujete &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16273,21 +16273,21 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft produkty&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva produkty&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; vyvíja široké spektrum &lt;b&gt;Mandrakelinux&lt;/b&gt; produktov."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; vyvíja široké spektrum &lt;b&gt;Mandrivalinux&lt;/b&gt; produktov."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Produkty rady Mandrakelinux sú:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Produkty rady Mandrivalinux sú:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16308,73 +16308,73 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux pre x86-64&lt;/b&gt;, Mandrakelinux riešenie pre váš 64bitový "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux pre x86-64&lt;/b&gt;, Mandrivalinux riešenie pre váš 64bitový "</div><div class='ctx'> "procesor."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft produkty (bežné produkty)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva produkty (bežné produkty)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft vyvíja dva produkty ktoré umožňujú použiť Mandrakelinux &lt;b&gt;na "</div><div class='add'>+"Mandriva vyvíja dva produkty ktoré umožňujú použiť Mandrivalinux &lt;b&gt;na "</div><div class='ctx'> "akomkoľvek počítači&lt;/b&gt; bez potreby inštalácie."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, Mandrakelinux distribúcia kompletne bežiaca z bootovacieho "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, Mandrivalinux distribúcia kompletne bežiaca z bootovacieho "</div><div class='ctx'> "CD-ROM média."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, Mandrakelinux distribúcia predinštalovaná na "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, Mandrivalinux distribúcia predinštalovaná na "</div><div class='ctx'> "kompaktnom prenosnom pevnom disku."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft produkty (profesionálne služby)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva produkty (profesionálne služby)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Nasleduje zoznam produktov Mandrakesoft určených pre &lt;b&gt;profesionálne "</div><div class='add'>+"Nasleduje zoznam produktov Mandriva určených pre &lt;b&gt;profesionálne "</div><div class='ctx'> "potreby&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrakelinux Desktop pre firemné nasadenie."</div><div class='add'>+"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrivalinux Desktop pre firemné nasadenie."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, serverové riešenie Mandrakelinux."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, serverové riešenie Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, bezpečnostné riešenie Mandrakelinux"</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, bezpečnostné riešenie Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16417,10 +16417,10 @@ msgstr "&lt;b&gt;Zvoľte si vaše obľúbené grafické prostredie&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Pomocou PowerPack-u máte možnosť výberu spomedzi &lt;b&gt;správcov grafického "</div><div class='del'>-"prostredia&lt;/b&gt;. Mandrakesoft si vybral &lt;b&gt;KDE&lt;/b&gt; ako predvolené."</div><div class='add'>+"prostredia&lt;/b&gt;. Mandriva si vybral &lt;b&gt;KDE&lt;/b&gt; ako predvolené."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16445,10 +16445,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Pomocou PowerPack+ získate možnosť výberu rôznych &lt;b&gt;grafických rozhraní&lt;/"</div><div class='del'>-"b&gt;. Mandrakesoft preferuje &lt;b&gt;KDE&lt;/b&gt; ako predvolené."</div><div class='add'>+"b&gt;. Mandriva preferuje &lt;b&gt;KDE&lt;/b&gt; ako predvolené."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16575,10 +16575,10 @@ msgstr "&lt;b&gt;Tešiť sa z širokého množstva aplikácií&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pomocou Mandrakelinux menu dokážete &lt;b&gt;ľahko používať&lt;/b&gt; aplikáce pre "</div><div class='add'>+"Pomocou Mandrivalinux menu dokážete &lt;b&gt;ľahko používať&lt;/b&gt; aplikáce pre "</div><div class='ctx'> "&lt;b&gt;správu vašich úloh&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16846,18 +16846,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Kontrolné centrum Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Kontrolné centrum Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Kontrolné centrum Mandrakelinux&lt;/b&gt; je zbierka základných nástrojov "</div><div class='del'>-"vytvorených pre Mandrakelinux k uľahčeniu nastavovania vášho počítača."</div><div class='add'>+"&lt;b&gt;Kontrolné centrum Mandrivalinux&lt;/b&gt; je zbierka základných nástrojov "</div><div class='add'>+"vytvorených pre Mandrivalinux k uľahčeniu nastavovania vášho počítača."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16881,16 +16881,16 @@ msgstr "&lt;b&gt;Model Open Source&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Podobne ako písanie programov, otvorený softvér &lt;b&gt;vyžaduje čas a ľudí&lt;/b&gt; "</div><div class='del'>-"pre vývoj. Aby zostala zachovaná koncepcia otvoreného softvéru, Mandrakesoft "</div><div class='add'>+"pre vývoj. Aby zostala zachovaná koncepcia otvoreného softvéru, Mandriva "</div><div class='ctx'> "predáva pridanú hodnotu produktov a služby pre &lt;b&gt;trvalé vylepšovanie "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. Ak chcete &lt;b&gt;podporiť koncepciu otvoreného softvéru&lt;/b&gt; a "</div><div class='del'>-"podporiť vývoj Mandrakelinux, &lt;b&gt;prosíme&lt;/b&gt; zvážte nákup niektorého z "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. Ak chcete &lt;b&gt;podporiť koncepciu otvoreného softvéru&lt;/b&gt; a "</div><div class='add'>+"podporiť vývoj Mandrivalinux, &lt;b&gt;prosíme&lt;/b&gt; zvážte nákup niektorého z "</div><div class='ctx'> "našich produktov alebo služieb!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16901,10 +16901,10 @@ msgstr "&lt;b&gt;Online obchod&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pre informácie o produktoch a službách Mandrakesoft navštívte náš "</div><div class='add'>+"Pre informácie o produktoch a službách Mandriva navštívte náš "</div><div class='ctx'> "&lt;b&gt;elektronický obchod&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16928,24 +16928,24 @@ msgstr "Zastavte sa ešte dnes na &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; je &lt;b&gt;skvelá možnosť&lt;/b&gt; prezentovať vaše produkty pre "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; je &lt;b&gt;skvelá možnosť&lt;/b&gt; prezentovať vaše produkty pre "</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Získate &lt;b&gt;zaujímavé výhody&lt;/b&gt; vstupom do Mandrakeclub, ako napríklad:"</div><div class='add'>+"Získate &lt;b&gt;zaujímavé výhody&lt;/b&gt; vstupom do Mandriva Club, ako napríklad:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16967,40 +16967,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Zúčastňovať sa &lt;b&gt;používateľských fór&lt;/b&gt; Mandrakelinux."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Zúčastňovať sa &lt;b&gt;používateľských fór&lt;/b&gt; Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Skorý a privilegovaný prístup&lt;/b&gt; k ISO obrazom, ešte pred ich "</div><div class='ctx'> "verejnou dostupnosťou."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; je nová služba, ktorú Mandrakesoft ponúka svojim "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; je nová služba, ktorú Mandriva ponúka svojim "</div><div class='ctx'> "zákazníkom!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline ponúka široké možnosti pre &lt;b&gt;jednoduchú aktualizáciu&lt;/b&gt; "</div><div class='del'>-"vášho Mandrakelinux systému:"</div><div class='add'>+"Mandriva Online ponúka široké možnosti pre &lt;b&gt;jednoduchú aktualizáciu&lt;/b&gt; "</div><div class='add'>+"vášho Mandrivalinux systému:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17026,41 +17026,41 @@ msgstr "\t* Flexibilné &lt;b&gt;naplánované&lt;/b&gt; aktualizácie."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Menežment &lt;b&gt;všetkých vašich Mandrakelinux systémov&lt;/b&gt; pomocou jedného "</div><div class='add'>+"\t* Menežment &lt;b&gt;všetkých vašich Mandrivalinux systémov&lt;/b&gt; pomocou jedného "</div><div class='ctx'> "účtu."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Požadujete &lt;b&gt;asistenciu?&lt;/b&gt;. Stretnite technických expertov Mandrakesoft "</div><div class='add'>+"Požadujete &lt;b&gt;asistenciu?&lt;/b&gt;. Stretnite technických expertov Mandriva "</div><div class='ctx'> "na &lt;b&gt;našej platforme pre technickú pomoc&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Vďaka pomoci &lt;b&gt;kvalifikovaných expertov na Mandrakelinux&lt;/b&gt; si môžete "</div><div class='add'>+"Vďaka pomoci &lt;b&gt;kvalifikovaných expertov na Mandrivalinux&lt;/b&gt; si môžete "</div><div class='ctx'> "ušetriť množstvo času."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ak chcete vedieť odpoveď na akúkoľvek otázku o Mandrakelinuxe, môžete si "</div><div class='add'>+"Ak chcete vedieť odpoveď na akúkoľvek otázku o Mandrivalinuxe, môžete si "</div><div class='ctx'> "zakúpiť podporu na &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17357,8 +17357,8 @@ msgstr "Monitorovacie nástroje, účtovanie procesov, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Sprievodcovia Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Sprievodcovia Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17514,7 +17514,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17528,7 +17528,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[VOĽBY]...\n"</div><div class='del'>-"Konfigurácia Mandrakelinux Terminal Servera\n"</div><div class='add'>+"Konfigurácia Mandrivalinux Terminal Servera\n"</div><div class='ctx'> "--enable         : povoliť MTS\n"</div><div class='ctx'> "--disable        : zakázať MTS\n"</div><div class='ctx'> "--start          : spustiť MTS\n"</div><div class='hunk'>@@ -17585,7 +17585,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17593,7 +17593,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[VOĽBY]...\n"</div><div class='ctx'> "  --no-confirmation      nepýtať sa na prvú potvrdzujúcu optázku v "</div><div class='del'>-"MandrakeUpdate režime\n"</div><div class='add'>+"Mandriva Update režime\n"</div><div class='ctx'> "  --no-verify-rpm        nekontrolovať podpisy balíkov\n"</div><div class='ctx'> "  --changelog-first      zobraziť changelog pred zobrazením súborov v okne s "</div><div class='ctx'> "popisom\n"</div><div class='hunk'>@@ -20364,13 +20364,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Nástroj pre oznámenie chýb Mandrakelinuxu"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Nástroj pre oznámenie chýb Mandrivalinuxu"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Kontrolné centrum Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Kontrolné centrum Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20390,8 +20390,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20435,8 +20435,8 @@ msgstr "Sprievodca konfiguráciou"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Vyberte si nástroj od Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Vyberte si nástroj od Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20861,7 +20861,7 @@ msgstr "Spustené pri štarte"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Toto rozhranie ešte nebolo nastavené.\n"</div><div class='ctx'> "Spustite sprievodcu \"Pridanie rozhrania\" z Mandrake kontrolného centra"</div><div class='hunk'>@@ -20870,10 +20870,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nemáte nakonfigurované žiadne pripojenie k Internetu.\n"</div><div class='del'>-"Spustite sprievodcu \"%s\" z Mandrakelinux kontrolného centra"</div><div class='add'>+"Spustite sprievodcu \"%s\" z Mandrivalinux kontrolného centra"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20923,8 +20923,8 @@ msgstr "KDM (KDE správca prihlásenia)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux správca prihlásenia)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux správca prihlásenia)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21223,7 +21223,7 @@ msgstr "Import"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21232,7 +21232,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21778,14 +21778,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Toto je slobodný softvér a musí byť redistribuovaný pod licenciou GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Použitie: \n"</div><div class='hunk'>@@ -21813,8 +21813,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Centrum pomoci Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Centrum pomoci Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25347,8 +25347,8 @@ msgstr "Táto zmena je v poriadku, ale pre jej uplatnenie sa musíte odhlásiť"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Logy Mandrakelinux nástrojov"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Logy Mandrivalinux nástrojov"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25868,10 +25868,10 @@ msgstr "Pripojenie je ukončené."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Chyba pri spojení.\n"</div><div class='del'>-"Skontrolujte konfiguráciu v Mandrakelinux Kontrolnom Centre."</div><div class='add'>+"Skontrolujte konfiguráciu v Mandrivalinux Kontrolnom Centre."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/sl.po b/perl-install/share/po/sl.po<br/>index 0c29e9aee..a039e4090 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/sl.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/sl.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/sl.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sl.po</a></div><div class='hunk'>@@ -72,14 +72,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Izgleda, da ima ključ omogočeno zaščito pred pisanjem, vendar ga trenutno\n"</div><div class='ctx'> "ni mogoče odklopiti.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknite gumb za ponoven zagon računalnika, odklopite ključ, odstranite\n"</div><div class='del'>-"zaščito, priklopite USB ključ in ponovno zaženite Mandrake Move."</div><div class='add'>+"zaščito, priklopite USB ključ in ponovno zaženite Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -97,7 +97,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Na vašem USB ključu ni veljavnega razdelka FAT za Okna,\n"</div><div class='hunk'>@@ -107,14 +107,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Nadaljujete lahko tudi brez USB ključa. Še vedno boste lahko\n"</div><div class='del'>-"Mandrake Move uporabljali kot normalno živo distribucijo\n"</div><div class='del'>-"operacijskega sistema Mandrakelinux."</div><div class='add'>+"Mandriva Move uporabljali kot normalno živo distribucijo\n"</div><div class='add'>+"operacijskega sistema Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -122,11 +122,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sistem na vašem računalniku ni zaznal USB ključa. Če ga priključite\n"</div><div class='del'>-" sedaj, bo lahko Mandrake Move shranil podatke v vašem domačem\n"</div><div class='add'>+" sedaj, bo lahko Mandriva Move shranil podatke v vašem domačem\n"</div><div class='ctx'> "imeniku in vaše sistemske nastavitve, ki jih bo uporabil ob naslednjem\n"</div><div class='ctx'> "zagonu na tem ali kakšnem drugem računalniku.\n"</div><div class='ctx'> "Opozorilo: Če ključ priključite zdaj, počakajte nekaj sekund preden\n"</div><div class='hunk'>@@ -134,8 +134,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Nadaljujete lahko tudi brez USB ključa. Še vedno boste lahko\n"</div><div class='del'>-"Mandrake Move uporabljali kot normalno živo distribucijo\n"</div><div class='del'>-"operacijskega sistema Mandrakelinux."</div><div class='add'>+"Mandriva Move uporabljali kot normalno živo distribucijo\n"</div><div class='add'>+"operacijskega sistema Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -263,7 +263,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -279,7 +279,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Do tega lahko pride zaradi poškodovanih nastavitvenih\n"</div><div class='ctx'> "datotek na USB ključu. V tem primeru bo pomagalo, če jih\n"</div><div class='del'>-"odstranite in ponovno zaženete Mandrake Move. To storite\n"</div><div class='add'>+"odstranite in ponovno zaženete Mandriva Move. To storite\n"</div><div class='ctx'> "tako, da kliknete ustrezen gumb.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1309,11 +1309,11 @@ msgstr "Izbira jezika"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux omogoča večjezično podporo. Izberite\n"</div><div class='add'>+"Mandrivalinux omogoča večjezično podporo. Izberite\n"</div><div class='ctx'> "jezike, ki jih želite namestiti. Nameščeni jeziki bodo dosegljivi,\n"</div><div class='ctx'> "ko boste dokončali namestitev in znova zagnali računalnik."</div><div class='ctx'> </div><div class='hunk'>@@ -3731,12 +3731,12 @@ msgstr "omogoči radio podporo"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Preden nadaljujete, pozorno preberite pogoje licenčne pogodbe,\n"</div><div class='del'>-"ki se nanaša na celotno distribucijo Mandrakelinux. Če se strinjate z vsemi\n"</div><div class='add'>+"ki se nanaša na celotno distribucijo Mandrivalinux. Če se strinjate z vsemi\n"</div><div class='ctx'> "pogoji licenčne pogodbe, označite okence \"%s\". Če se s pogoji pogodbe\n"</div><div class='ctx'> "ne strinjate, pa označite okence \"%s\" in vaš računalnik se bo ponovno "</div><div class='ctx'> "zagnal."</div><div class='hunk'>@@ -3918,13 +3918,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Namestitev za Mandrakelinux je shranjena na več zgoščenkah.\n"</div><div class='add'>+"Namestitev za Mandrivalinux je shranjena na več zgoščenkah.\n"</div><div class='ctx'> "Če je izbrani paket shranjen na drugi zgoščeniki, bo DrakX izvrgel\n"</div><div class='ctx'> "trenutno in vas pozval, da v pogon vstavite pravo zgoščenko.\n"</div><div class='ctx'> "če prave zgoščenke nimate, kliknite \"%s\" in željeni paketi ne\n"</div><div class='hunk'>@@ -3934,11 +3934,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3989,7 +3989,7 @@ msgid ""</div><div class='ctx'> "command-line interface. The total size of this installation is about 65\n"</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Za Mandrakelinux je dostopnih na tisoče različnih programskih paketov.\n"</div><div class='add'>+"Za Mandrivalinux je dostopnih na tisoče različnih programskih paketov.\n"</div><div class='ctx'> "Da bi bilo upravljanje s paketi bolj preprosto, so razvrščeni v skupine\n"</div><div class='ctx'> "vsebinsko povezanih paketov.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4104,10 +4104,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4138,9 +4138,9 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Če izberete paket ali skupino paketov, ki vsebuje strežnik,\n"</div><div class='ctx'> "boste morali namestitev takšnega paketa na izrecno vprašanje\n"</div><div class='del'>-"potrditi. Mandrakelinux namreč kot privzeto vključi vse\n"</div><div class='add'>+"potrditi. Mandrivalinux namreč kot privzeto vključi vse\n"</div><div class='ctx'> " nameščene storitve ob zagonu sistema. Čeprav ob izdaji\n"</div><div class='del'>-"te različice Mandrakelinuxa ni bilo znanih težav v zvezi z varnostjo,\n"</div><div class='add'>+"te različice Mandrivalinuxa ni bilo znanih težav v zvezi z varnostjo,\n"</div><div class='ctx'> "je mogoče, da so bile odkrite varnostne luknje kasneje. Če za \n"</div><div class='ctx'> "določeno storitev ne veste, kaj je njena naloga, kliknite \"%s\" S klikom\n"</div><div class='ctx'> "na \"%s\"bodo nameščene naštete storitve, sistem pa jih bo samodejno\n"</div><div class='hunk'>@@ -4299,7 +4299,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4466,12 +4466,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4498,7 +4498,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4507,7 +4507,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4528,11 +4528,11 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Določite, na katerem delu trdega diska naj bo nameščen operacijski\n"</div><div class='del'>-"sistem Mandrakelinux. Če je trdi disk prazen ali če na njem nameščeni\n"</div><div class='add'>+"sistem Mandrivalinux. Če je trdi disk prazen ali če na njem nameščeni\n"</div><div class='ctx'> "operacijski sistem zaseda celoten prostor, boste morali disk razdeliti na\n"</div><div class='ctx'> "posamezne razdelke. Razdeljevanje trdega diska izvede logično\n"</div><div class='ctx'> "razdelitev, ki zagotovi potrebni prostor za namestitev operacijskega\n"</div><div class='del'>-"sistema Mandrakelinux.\n"</div><div class='add'>+"sistema Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Trdega diska po izvršenem razdeljevanju običajno ni mogoče povrniti v "</div><div class='ctx'> "prejšnje stanje.\n"</div><div class='hunk'>@@ -4565,7 +4565,7 @@ msgstr ""</div><div class='ctx'> "razdelku ne boste izgubili, če najprej v Oknih defragmentirate disk.\n"</div><div class='ctx'> "Vsekakor pa priporočamo, da pred nadaljevanjem napravite varnostno\n"</div><div class='ctx'> "kopijo podatkov. Če želite uporabljati oba operacijska sistema, "</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "in Okna (Windows™), vam priporočamo, da izberete to možnost.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Če se odločite za to možnost, morate vedeti, da bo po končanem postopku\n"</div><div class='hunk'>@@ -4575,7 +4575,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Če želite izbrisati vse obstoječe razdelke z vsemi podatki in "</div><div class='ctx'> "jih \n"</div><div class='del'>-"nadomestiti s sistemom Mandrakelinux, izberite to možnost.\n"</div><div class='add'>+"nadomestiti s sistemom Mandrivalinux, izberite to možnost.\n"</div><div class='ctx'> "Bodite previdni, ko boste potrdili to izbiro, prejšnjega stanja ne bo več "</div><div class='ctx'> "mogoče vzpostaviti.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4679,7 +4679,7 @@ msgstr ""</div><div class='ctx'> "    * \"%s\": Povsem samodejna namestitev. Z diska bodo izbrisani vsi\n"</div><div class='ctx'> "podatki.\n"</div><div class='ctx'> "   To je zelo uporabno za namestitev sistema na več podobnih\n"</div><div class='del'>-"računalnikov. Več o tem najdete na spletni strani Mandrakesoft.\n"</div><div class='add'>+"računalnikov. Več o tem najdete na spletni strani Mandriva.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\"(*):S tem shranite seznam paketov, ki so bili izbrani med to\n"</div><div class='ctx'> "namestitvijo. Če želite izvesti namestitev z enakim naborom paketov,\n"</div><div class='hunk'>@@ -4730,7 +4730,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4749,7 +4749,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknite na \"%s\",ko boste pripravljeni na razdeljevanje.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Kliknite na \"%s\", če želite za namestitev sistema Mandrakelinux\n"</div><div class='add'>+"Kliknite na \"%s\", če želite za namestitev sistema Mandrivalinux\n"</div><div class='ctx'> "izbrati drug razdelek.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknite na \"%s\", če želite določiti razdelke, na katerih naj sistem\n"</div><div class='hunk'>@@ -4767,7 +4767,7 @@ msgstr "Nazaj"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4780,7 +4780,7 @@ msgid ""</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Verjetno so bili od njegove izdaje pa do časa, ko nameščate\n"</div><div class='del'>-"Mandrakelinux na svoj računalnik, nekateri paketi popravljeni\n"</div><div class='add'>+"Mandrivalinux na svoj računalnik, nekateri paketi popravljeni\n"</div><div class='ctx'> "ali nadgrajeni z varnostnimi popravki ali z odstranitvijo hroščev.\n"</div><div class='ctx'> "Te popravke lahko prenesete z interneta. Če imate vzpostavljeno\n"</div><div class='ctx'> "internetno povezavo, označite \"%s\", če pa želite namestiti\n"</div><div class='hunk'>@@ -4807,7 +4807,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4835,7 +4835,7 @@ msgstr "Upravitelj varnostnih nastavitev"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4906,7 +4906,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Izbrati morate razdelke, na katere boste namestitli sistem\n"</div><div class='del'>-"Mandrakelinux. Če ste razdelke že izbrali ob kakšni predhodni\n"</div><div class='add'>+"Mandrivalinux. Če ste razdelke že izbrali ob kakšni predhodni\n"</div><div class='ctx'> "namestitvi GNU/Linux sistema s kakim drugim orodjem za\n"</div><div class='ctx'> "razdeljevanje, lahko uporabite obstoječe razdelke, sicer pa morate\n"</div><div class='ctx'> "razdelke trdega diska za namestitev določiti sedaj.\n"</div><div class='hunk'>@@ -4969,7 +4969,7 @@ msgstr ""</div><div class='ctx'> "Vse nadaljnje informacije o datotečnih sistemih boste našli v\n"</div><div class='ctx'> "dokumentaciji.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Če Mandrakelinux nameščate na PPC računalnik, morate ustvariti\n"</div><div class='add'>+"Če Mandrivalinux nameščate na PPC računalnik, morate ustvariti\n"</div><div class='ctx'> "zagonski \"bootstrap'\" razdelek z velikostjo najmanj 1MB, ki ga\n"</div><div class='ctx'> "uporablja zagonski nalagalnik yaboot. Če ta razdelek nekoliko\n"</div><div class='ctx'> "povečate in mu namenite vsaj 50MB, boste nanj lahko shranjevali\n"</div><div class='hunk'>@@ -4990,7 +4990,7 @@ msgstr "Preklapljanje med normalnim in izvedenskim načinom"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5020,7 +5020,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Na vašem trdem disku je več kot en razdelek za Okna (Windows™).\n"</div><div class='ctx'> "Izberite razdelek, ki ga želite zmanjšati, da bi pridobili prostor za\n"</div><div class='del'>-"namestitev sistema Mandrakelinux.\n"</div><div class='add'>+"namestitev sistema Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Na seznamu so razdelki s podatki: \"Ime v Linuxu\", \"Ime v Oknih\"\n"</div><div class='ctx'> "\"Velikost\" \n"</div><div class='hunk'>@@ -5067,7 +5067,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5076,19 +5076,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ta korak se zažene samo v primeru, da na vašem računalniku že obstaja\n"</div><div class='ctx'> "razdelek  zaGNU/Linux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Lahko izbirate med novo namestitvijo in med posodobitvijo obstoječega\n"</div><div class='del'>-"sistema Mandrakelinux.\n"</div><div class='add'>+"sistema Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": S tem boste obstoječi sistem povsem odstranili. Če želite\n"</div><div class='ctx'> "spremeniti razdelitev trdega diska ali datotečni sistem, izberite to\n"</div><div class='hunk'>@@ -5101,7 +5101,7 @@ msgstr ""</div><div class='ctx'> "podobno kot pri običajni novi namestitvi.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Možnost \"Posodobitev\" deluje, če imate nameščeno različico\n"</div><div class='del'>-"sistema Mandrakelinux  \"8.1\" ali novejšo. Posodobitve starejših\n"</div><div class='add'>+"sistema Mandrivalinux  \"8.1\" ali novejšo. Posodobitve starejših\n"</div><div class='ctx'> "različic od \"8.1\" ne priporočamo."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -5157,7 +5157,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5436,7 +5436,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5457,11 +5457,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Izberite sistem za tiskanje. Drugi operacijski sistemi navadno nudijo\n"</div><div class='del'>-"en sistem, Mandrakelinux pa vam daje na izbiro dva.\n"</div><div class='add'>+"en sistem, Mandrivalinux pa vam daje na izbiro dva.\n"</div><div class='ctx'> "Od obeh sistemov je vsak primeren za svojo vrsto namestitve.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\"--je kratica za ``print, do not queue\" (tiskaj, ne vnesi v čakalno "</div><div class='hunk'>@@ -5604,7 +5604,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5621,7 +5621,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5744,12 +5744,12 @@ msgstr "Storitve"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Izberite trdi disk, ki ga želite izbrisati, da bi dobili prostor za "</div><div class='ctx'> "razdelek\n"</div><div class='del'>-"za Mandrakelinux.\n"</div><div class='add'>+"za Mandrivalinux.\n"</div><div class='ctx'> "Vsi podatki na izbranem disku bodo izbrisani in jih ne bo mogoče\n"</div><div class='ctx'> "obnoviti!"</div><div class='ctx'> </div><div class='hunk'>@@ -6102,7 +6102,7 @@ msgstr "Preračunavam velikost razdelka za Okna (Windows)."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vaš razdelek za Okna (Windows) je preveč razdrobljen. Poženite ``defrag'' v "</div><div class='hunk'>@@ -6220,19 +6220,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6254,7 +6254,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6262,14 +6262,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6279,7 +6279,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6299,10 +6299,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6313,11 +6313,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6333,21 +6333,21 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "PREDSTAVITEV\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Operacijski sistem in druge sestavine distribucije Mandrakelinux \n"</div><div class='add'>+"Operacijski sistem in druge sestavine distribucije Mandrivalinux \n"</div><div class='ctx'> "bomo v nadaljnjem besedilu imenovali \"Programje\".  Programje vsebuje "</div><div class='ctx'> "programe, metode, pravila in dokumentacijo, \n"</div><div class='ctx'> "ki se nanašajo na operacijski sistem in na različne sestavine distribucije "</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. LICENČNA POGODBA\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Prosimo, pazljivo preberite ta dokument. To je licenčna pogodba med vami in "</div><div class='del'>-"Mandrakesoft d.d.,ki se nanaša na programje.\n"</div><div class='add'>+"Mandriva d.d.,ki se nanaša na programje.\n"</div><div class='ctx'> "Vsaka namestitev, razmnoževanje ali uporaba programja pomeni, da izrecno "</div><div class='ctx'> "sprejemate pogoje te pogodbe in da se z njimi v celoti strinjate.\n"</div><div class='ctx'> "Če zavračate katerokoli pogodbeno določilo, programja ne smete namestiti,\n"</div><div class='hunk'>@@ -6365,7 +6365,7 @@ msgstr ""</div><div class='ctx'> "Programje in priložena dokumentacija sta na voljo v obliki, v kakršni sta, "</div><div class='ctx'> "brez jamstva,\n"</div><div class='ctx'> "ki presega z zakonom določeno odgovornost.\n"</div><div class='del'>-"Mandrakesoft d.d. v nobenem primeru, razen kadar to izrecno določa pravni "</div><div class='add'>+"Mandriva d.d. v nobenem primeru, razen kadar to izrecno določa pravni "</div><div class='ctx'> "red,\n"</div><div class='ctx'> "ne prevzema odgovornosti za kakršnokoli naključno, posredno ali neposredno "</div><div class='ctx'> "škodo,\n"</div><div class='hunk'>@@ -6373,14 +6373,14 @@ msgstr ""</div><div class='ctx'> "izgub, sodnih taks\n"</div><div class='ctx'> "in izrečenih kazni ali drugih oblik posredne škode, ki bi nastala zaradi "</div><div class='ctx'> "uporabe ali\n"</div><div class='del'>-"nezmožnosti uporabe programja, tudi če je bila Mandrakesoft d.d. opozorjena "</div><div class='add'>+"nezmožnosti uporabe programja, tudi če je bila Mandriva d.d. opozorjena "</div><div class='ctx'> "na možnost nastanka takšne škode.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "OMEJENA ODGOVORNOST ZA POSEDOVANJE ALI UPORABO PROGRAMJA, KI JE V NEKATERIH "</div><div class='ctx'> "DRŽAVAH PREPOVEDANO\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakesoft d.d. v nobenem primeru, razen kadar to izrecno določa pravni "</div><div class='add'>+"Mandriva d.d. v nobenem primeru, razen kadar to izrecno določa pravni "</div><div class='ctx'> "red,\n"</div><div class='ctx'> "ne prevzema odgovornosti za kakršnokoli naključno, posredno ali neposredno "</div><div class='ctx'> "škodo,\n"</div><div class='hunk'>@@ -6388,7 +6388,7 @@ msgstr ""</div><div class='ctx'> "izgub, sodnih taks\n"</div><div class='ctx'> "in izrečenih kazni ali drugih oblik posredne škode, ki bi nastala zaradi "</div><div class='ctx'> "posedovanja\n"</div><div class='del'>-"ali uporabe programja oziroma zardi pridobivanja programja z Mandrakelinux "</div><div class='add'>+"ali uporabe programja oziroma zardi pridobivanja programja z Mandrivalinux "</div><div class='ctx'> "spletnih strani,\n"</div><div class='ctx'> "če je to v nasprotju z veljavnim pravnim redom države, v kateri bivate.\n"</div><div class='ctx'> "Navedena omejitev odgovornosti se nanaša tudi, vendar ne izključno, na "</div><div class='hunk'>@@ -6412,10 +6412,10 @@ msgstr ""</div><div class='ctx'> " sestavino programja, preden jo uporabite.\n"</div><div class='ctx'> "Obenem vas prosimo, da vsa vprašanja, ki se nanašajo na licenčne pogodbe za "</div><div class='ctx'> "posamezne\n"</div><div class='del'>-"sestavine programja,naslovite na njenega avtorja in ne na Mandrakesoft d.d.\n"</div><div class='del'>-"Vsako programje, ki ga razvije Mandrakesoft d.d., je zaščiteno s splošnim "</div><div class='add'>+"sestavine programja,naslovite na njenega avtorja in ne na Mandriva d.d.\n"</div><div class='add'>+"Vsako programje, ki ga razvije Mandriva d.d., je zaščiteno s splošnim "</div><div class='ctx'> "dovoljenjem GPL.\n"</div><div class='del'>-"Dokumentacija, napisana pri Mandrakesoft d.d., je zaščitena s posebnim "</div><div class='add'>+"Dokumentacija, napisana pri Mandriva d.d., je zaščitena s posebnim "</div><div class='ctx'> "dovoljenjem.\n"</div><div class='ctx'> "Prosimo, da podrobnosti preberete v dokumentaciji.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6425,11 +6425,11 @@ msgstr ""</div><div class='ctx'> "Avtorske in druge pravice intelektualne lastnine, ki se nanašajo na "</div><div class='ctx'> "programje, pripadaj avtorjem\n"</div><div class='ctx'> " programja in so zaščitene z zakonom.\n"</div><div class='del'>-"Mandrakesoft d.d. si pridržuje pravico do spreminjanja programja v celoti "</div><div class='add'>+"Mandriva d.d. si pridržuje pravico do spreminjanja programja v celoti "</div><div class='ctx'> "ali deloma\n"</div><div class='ctx'> "v kakršnem koli smislu in za kakršen koli namen.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" in pripadajoči logotipi so blagovne znamke "</div><div class='del'>-"Mandrakesoft d.d.\n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" in pripadajoči logotipi so blagovne znamke "</div><div class='add'>+"Mandriva d.d.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Končne določbe\n"</div><div class='hunk'>@@ -6537,7 +6537,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6545,7 +6545,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Čestitamo!\n"</div><div class='ctx'> "Uspešno ste dokončali namestitev.\n"</div><div class='hunk'>@@ -6557,7 +6557,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Navodila za nastavljanje sistema po namestitvi boste našli v poglavju\n"</div><div class='del'>-"\"post install\" uradnih navodil za uporabnike. (Official Mandrakelinux "</div><div class='add'>+"\"post install\" uradnih navodil za uporabnike. (Official Mandrivalinux "</div><div class='ctx'> "User's Guide)"</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -6593,12 +6593,12 @@ msgstr "Pričenjam s korakom `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vaš sistem ni dovolj zmogljiv. Lahko, da boste imeli pri namestitvi\n"</div><div class='del'>-"Mandrakelinux težave. V tem primeru lahko poskusite z namestitvijo v "</div><div class='add'>+"Mandrivalinux težave. V tem primeru lahko poskusite z namestitvijo v "</div><div class='ctx'> "besedilnem načinu. \n"</div><div class='ctx'> "Po zagonu z zgoščenke pritisnite `F1' in vpišite `text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7139,9 +7139,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Vzpostavljam povezavo s spletno stranjo Mandrakelinux, in pridobivanje "</div><div class='add'>+"Vzpostavljam povezavo s spletno stranjo Mandrivalinux, in pridobivanje "</div><div class='ctx'> "seznama dosegljivih strežnikov...."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7369,8 +7369,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Namestitev Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Namestitev Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9959,7 +9959,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -11303,7 +11303,7 @@ msgid ""</div><div class='ctx'> "work, you might want to relaunch the configuration."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Med nastavljanjem se je pojavila napaka.\n"</div><div class='del'>-"Preizkusite povezavo v Mandrakelinux nadzornem središču. Če povezava ne "</div><div class='add'>+"Preizkusite povezavo v Mandrivalinux nadzornem središču. Če povezava ne "</div><div class='ctx'> "deluje, ponovno zaženite nastavitve."</div><div class='ctx'> </div><div class='ctx'> #: network/netconnect.pm:1537</div><div class='hunk'>@@ -14002,7 +14002,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15928,33 +15928,33 @@ msgstr "Ustavi"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Kaj je Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Kaj je Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Dobrodošli v &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Dobrodošli v &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux je &lt;b&gt;distribucija Linuxa&lt;/b&gt;, ki združuje jedro, imenovano "</div><div class='add'>+"Mandrivalinux je &lt;b&gt;distribucija Linuxa&lt;/b&gt;, ki združuje jedro, imenovano "</div><div class='ctx'> "&lt;b&gt;operacijski sistem&lt;/b&gt;, skupaj z &lt;b&gt;mnogimi programi&lt;/b&gt;, ki vam služijo "</div><div class='ctx'> "pri vsakodnevnih opravilih."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux je trenutno &lt;b&gt;uporabniku najprijaznejša&lt;/b&gt;distribucija "</div><div class='add'>+"Mandrivalinux je trenutno &lt;b&gt;uporabniku najprijaznejša&lt;/b&gt;distribucija "</div><div class='ctx'> "Linuxa.  Obenem je ena od &lt;b&gt;najbolj razširjenih&lt;/b&gt; distribucij."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -15970,13 +15970,13 @@ msgstr "Pozdravljeni v &lt;b&gt;svetu odprte kode&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux temelji na odprtokodnem modelu, kar pomeni, da je nova "</div><div class='del'>-"različica plod &lt;b&gt;sodelovanja&lt;/b&gt; med &lt;b&gt;razvojnim oddelkom Mandrakesofta&lt;/"</div><div class='add'>+"Mandrivalinux temelji na odprtokodnem modelu, kar pomeni, da je nova "</div><div class='add'>+"različica plod &lt;b&gt;sodelovanja&lt;/b&gt; med &lt;b&gt;razvojnim oddelkom Mandrivaa&lt;/"</div><div class='ctx'> "b&gt; in &lt;b&gt;skupnostjo razvijalcev&lt;/b&gt; z vsega sveta."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='hunk'>@@ -15997,9 +15997,9 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Večina programov, ki so del distribucije, in vsa orodja Mandrakelinuxa so "</div><div class='add'>+"Večina programov, ki so del distribucije, in vsa orodja Mandrivalinuxa so "</div><div class='ctx'> "zajeta v &lt;b&gt;licenci GPL&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16029,15 +16029,15 @@ msgstr "&lt;b&gt;Pridruži se skupnosti&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux ima eno &lt;b&gt;največjih skupnosti&lt;/b&gt; uporabnikov in razvijalcev. "</div><div class='add'>+"Mandrivalinux ima eno &lt;b&gt;največjih skupnosti&lt;/b&gt; uporabnikov in razvijalcev. "</div><div class='ctx'> "Vloga te skupnosti je izjemno velika, saj sega od prijavljanja napak do "</div><div class='ctx'> "razvoja novih programov. Skupnost igra &lt;b&gt;ključno vlogo&lt;/b&gt; v svetu "</div><div class='del'>-"Mandrakelinuxa. "</div><div class='add'>+"Mandrivalinuxa. "</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16058,11 +16058,11 @@ msgstr "&lt;b&gt;Različica Download&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Trenutno se namešča &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. To je brezplačna "</div><div class='del'>-"različica, ki jo želi Mandrakesoft obdržati &lt;b&gt;prosto dostopno&lt;/b&gt; vsakomur."</div><div class='add'>+"Trenutno se namešča &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. To je brezplačna "</div><div class='add'>+"različica, ki jo želi Mandriva obdržati &lt;b&gt;prosto dostopno&lt;/b&gt; vsakomur."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16093,9 +16093,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ne boste imeli dostopa do &lt;b&gt;storitev, vključenih&lt;/b&gt; v druge Mandrakesoft "</div><div class='add'>+"Ne boste imeli dostopa do &lt;b&gt;storitev, vključenih&lt;/b&gt; v druge Mandriva "</div><div class='ctx'> "izdelke."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -16105,8 +16105,8 @@ msgstr "&lt;b&gt;Discovery, vaše prvo Linux namizje&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Trenutno se namešča &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Trenutno se namešča &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16128,17 +16128,17 @@ msgstr "&lt;b&gt;PowerPack, najpopolnejše Linux namizje&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Trenutno se namešča &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Trenutno se namešča &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack je Mandrakesoftov &lt;b&gt;'paradni konj' med namizji&lt;/b&gt;. PowerPack "</div><div class='add'>+"PowerPack je Mandrivaov &lt;b&gt;'paradni konj' med namizji&lt;/b&gt;. PowerPack "</div><div class='ctx'> "vključuje &lt;b&gt;tisoče programov&lt;/b&gt; - od najbolj priljubljenih do "</div><div class='ctx'> "najnaprednejših."</div><div class='ctx'> </div><div class='hunk'>@@ -16149,8 +16149,8 @@ msgstr "&lt;b&gt;PowerPack+, Linux rešitve za namizja in strežnike&lt;/b&gt; "</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Trenutno se namešča &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Trenutno se namešča &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16166,21 +16166,21 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoftovi izdelki&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivaovi izdelki&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; je razvil široko paleto &lt;b&gt;Mandrakelinux&lt;/b&gt; izdelkov."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; je razvil široko paleto &lt;b&gt;Mandrivalinux&lt;/b&gt; izdelkov."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Izdelki Mandrakelinux:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Izdelki Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16200,70 +16200,70 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, Linux rešitev za namizja in strežnike."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux za x86-64&lt;/b&gt;, Mandrakelinuxova rešitev za 64-bitne "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux za x86-64&lt;/b&gt;, Mandrivalinuxova rešitev za 64-bitne "</div><div class='ctx'> "procesorje."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoftovi izdelki&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivaovi izdelki&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft je razvil dva izdelka, ki omogočata uporabo Mandrakelinuxa "</div><div class='add'>+"Mandriva je razvil dva izdelka, ki omogočata uporabo Mandrivalinuxa "</div><div class='ctx'> "&lt;b&gt;na kateremkoli računalniku&lt;/b&gt; brez potrebe po namestitvi:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, distribucija Mandrakelinuxa, ki jo poženete s CD-ROM-a."</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, distribucija Mandrivalinuxa, ki jo poženete s CD-ROM-a."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, distribucija Mandrakelinuxa, prednameščena na "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, distribucija Mandrivalinuxa, prednameščena na "</div><div class='ctx'> "zunanjem disku “LaCie Mobile Hard Drive”."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoftovi izdelki (Profesionalne rešitve)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivaovi izdelki (Profesionalne rešitve)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='del'>-msgstr "Mandrakesoftovi izdelki, ki zadoščajo &lt;b&gt;profesionalnim potrebam&lt;/b&gt;:"</div><div class='add'>+msgstr "Mandrivaovi izdelki, ki zadoščajo &lt;b&gt;profesionalnim potrebam&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrakelinux namizje, namenjeno podjetjem."</div><div class='add'>+"\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrivalinux namizje, namenjeno podjetjem."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrakelinux strežniške rešitve."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrivalinux strežniške rešitve."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrakelinux varnostne rešitve."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrivalinux varnostne rešitve."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16306,9 +16306,9 @@ msgstr "&lt;b&gt;Izberite svoje najljubše grafično okolje&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack omogoča izbiro &lt;b&gt;namizja&lt;/b&gt;. Mandrakesoft je kot privzeto izbral "</div><div class='add'>+"PowerPack omogoča izbiro &lt;b&gt;namizja&lt;/b&gt;. Mandriva je kot privzeto izbral "</div><div class='ctx'> "&lt;b&gt;KDE&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -16333,9 +16333,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack+ omogoča izbiro &lt;b&gt;namizja&lt;/b&gt;. Mandrakesoft je kot privzeto "</div><div class='add'>+"PowerPack+ omogoča izbiro &lt;b&gt;namizja&lt;/b&gt;. Mandriva je kot privzeto "</div><div class='ctx'> "izbral &lt;b&gt;KDE&lt;/b&gt;. "</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16461,10 +16461,10 @@ msgstr "&lt;b&gt;Uživajte v široki paleti programov&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"V meniju Mandrakelinuxa boste našli programe &lt;b&gt;za vsa vaše potrebe&lt;/b&gt;:"</div><div class='add'>+"V meniju Mandrivalinuxa boste našli programe &lt;b&gt;za vsa vaše potrebe&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16716,17 +16716,17 @@ msgstr "\t* &lt;b&gt;Postfix&lt;/b&gt; in &lt;b&gt;Sendmail&lt;/b&gt;: zmogljiva mail strežnika."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinuxov nadzorni center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinuxov nadzorni center&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakelinuxov nadzorni center&lt;/b&gt; je zbirko nepogrešljivih programov, "</div><div class='add'>+"&lt;b&gt;Mandrivalinuxov nadzorni center&lt;/b&gt; je zbirko nepogrešljivih programov, "</div><div class='ctx'> "ki omogočajo upravljanje s sistemom."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16750,15 +16750,15 @@ msgstr "&lt;b&gt;Model odprte kode&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Kot vsako programiranje tudi odprta koda &lt;b&gt;zahteva čas in ljudi&lt;/b&gt; za "</div><div class='del'>-"razvoj. S spoštovanjem do te filozofije Mandrakesoft trži dodatno "</div><div class='del'>-"izpopolnjene izdelke in nenehno &lt;b&gt;izboljšuje Mandrakelinux.&lt;/b&gt; Če "</div><div class='del'>-"&lt;b&gt;podpirate&lt;/b&gt; filozofijo odprte kode in razvoj Mandrakelinuxa, premislite "</div><div class='add'>+"razvoj. S spoštovanjem do te filozofije Mandriva trži dodatno "</div><div class='add'>+"izpopolnjene izdelke in nenehno &lt;b&gt;izboljšuje Mandrivalinux.&lt;/b&gt; Če "</div><div class='add'>+"&lt;b&gt;podpirate&lt;/b&gt; filozofijo odprte kode in razvoj Mandrivalinuxa, premislite "</div><div class='ctx'> "o nakupu naših izdelkov in storitev."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16769,10 +16769,10 @@ msgstr "&lt;b&gt;Spletna prodajalna&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Če želite izvedeti več o Mandrakesoftovih izdelkih obiščite našo &lt;b&gt;spletno "</div><div class='add'>+"Če želite izvedeti več o Mandrivaovih izdelkih obiščite našo &lt;b&gt;spletno "</div><div class='ctx'> "prodajalno&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16796,21 +16796,21 @@ msgstr "Še danes obiščite &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt; je &lt;b&gt;dopolnitev&lt;/b&gt; vašega Mandrakelinuxa."</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt; je &lt;b&gt;dopolnitev&lt;/b&gt; vašega Mandrivalinuxa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='del'>-msgstr "Izkoristite &lt;b&gt;prednosti&lt;/b&gt;, ki vam jih nudi Mandrakeclub:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='add'>+msgstr "Izkoristite &lt;b&gt;prednosti&lt;/b&gt;, ki vam jih nudi Mandriva Club:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16831,38 +16831,38 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Sodelovanje v Mandrakelinuxovih &lt;b&gt;uporabniških forumih&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Sodelovanje v Mandrivalinuxovih &lt;b&gt;uporabniških forumih&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Predčasen dostop&lt;/b&gt; do Mandrakelinuxovih ISO datotek, še pred "</div><div class='add'>+"\t* &lt;b&gt;Predčasen dostop&lt;/b&gt; do Mandrivalinuxovih ISO datotek, še pred "</div><div class='ctx'> "uradnim izidom."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt; je nova storitev, ki jo ponujamo našim strankam."</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt; je nova storitev, ki jo ponujamo našim strankam."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline nudi vrsto storitev za &lt;b&gt;preprosto nadgradnjo&lt;/b&gt; vašega "</div><div class='del'>-"Mandrakelinux sistema"</div><div class='add'>+"Mandriva Online nudi vrsto storitev za &lt;b&gt;preprosto nadgradnjo&lt;/b&gt; vašega "</div><div class='add'>+"Mandrivalinux sistema"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16886,20 +16886,20 @@ msgstr "\t* &lt;b&gt;Hitri&lt;/b&gt; popravki."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Upravljanje &lt;b&gt;vseh vaših Mandrakelinux sistemov&lt;/b&gt; z enim uporabniškim "</div><div class='add'>+"\t* Upravljanje &lt;b&gt;vseh vaših Mandrivalinux sistemov&lt;/b&gt; z enim uporabniškim "</div><div class='ctx'> "imenom."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Potrebujete &lt;b&gt;pomoč&lt;/b&gt;? Obrnite se na naše strokovnjake na www."</div><div class='hunk'>@@ -16908,19 +16908,19 @@ msgstr ""</div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"S pomočjo strokovnjakov v &lt;b&gt;Mandrakelinux experts&lt;/b&gt; boste prihranili "</div><div class='add'>+"S pomočjo strokovnjakov v &lt;b&gt;Mandrivalinux experts&lt;/b&gt; boste prihranili "</div><div class='ctx'> "veliko časa."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Za vsa vprašanja o Mandrakelinuxu vam je na voljo plačljiva podpore na "</div><div class='add'>+"Za vsa vprašanja o Mandrivalinuxu vam je na voljo plačljiva podpore na "</div><div class='ctx'> "&lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17217,8 +17217,8 @@ msgstr "Nadzorna orodja, knjigovodstvo procesov, tcpdump, nmap ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr " Mandrakesoftovi čarovniki"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr " Mandrivaovi čarovniki"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17368,7 +17368,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17382,7 +17382,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[MOŽNOSTI]...\n"</div><div class='del'>-"Nastavitev terminalskega strežnika Mandrakelinux\n"</div><div class='add'>+"Nastavitev terminalskega strežnika Mandrivalinux\n"</div><div class='ctx'> "--enable         : omogoči MTS\n"</div><div class='ctx'> "--disable        : onemogoči MTS\n"</div><div class='ctx'> "--start          : poženi MTS\n"</div><div class='hunk'>@@ -17443,14 +17443,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[MOŽNOST]...\n"</div><div class='del'>-"  --no-confirmation      v MandrakeUpdate načinu ne zahtevaj prve potrditve\n"</div><div class='add'>+"  --no-confirmation      v Mandriva Update načinu ne zahtevaj prve potrditve\n"</div><div class='ctx'> "  --no-verify-rpm        brez preverjanja podpisov paketov\n"</div><div class='ctx'> "  --changelog-first      v oknu z opisom najprej prikaži dnevnik sprememb\n"</div><div class='ctx'> "  --merge-all-rpmnew     predlog za združitev vseh najdenih datotek ."</div><div class='hunk'>@@ -20221,13 +20221,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinuxovo orodje za poročanje o hroščih"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinuxovo orodje za poročanje o hroščih"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Nadzorno središče Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Nadzorno središče Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20247,8 +20247,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20292,8 +20292,8 @@ msgstr "Nastavitveni Čarovniki"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Izberite Mandrakesoftovo orodje"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Izberite Mandrivaovo orodje"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20718,19 +20718,19 @@ msgstr "Vključeno ob zagonu"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ta omrežna naprava še ni nastavljena.\n"</div><div class='del'>-"Zaženite \"Dodaj omrežno napravo\" v Mandrakelinux nadzornem središču"</div><div class='add'>+"Zaženite \"Dodaj omrežno napravo\" v Mandrivalinux nadzornem središču"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nobena internetna povezava ni nastavljena.\n"</div><div class='del'>-"Zaženite \"%s\" v Mandrakelinux nadzornem središču"</div><div class='add'>+"Zaženite \"%s\" v Mandrivalinux nadzornem središču"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20780,8 +20780,8 @@ msgstr "KDM (Upravitelj prikazovalnika KDE)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Upravitelj prikazovalnika Mandrakelinux)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Upravitelj prikazovalnika Mandrivalinux)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21080,7 +21080,7 @@ msgstr "Uvozi"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21089,7 +21089,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Avtorske pravice (C) 2001-2002 Mandrakesoft. \n"</div><div class='add'>+"Avtorske pravice (C) 2001-2002 Mandriva. \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (originalna različica)\n"</div><div class='hunk'>@@ -21637,14 +21637,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "To je prosto programje in se lahko razširja pod pogoji splošnega dovoljenja "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "Uporaba: \n"</div><div class='hunk'>@@ -21671,8 +21671,8 @@ msgstr " --doc &lt;link&gt;          - povezava na drugo spletno stran\n"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinuxovo središče za pomoč"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinuxovo središče za pomoč"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25195,7 +25195,7 @@ msgstr "Da bi uveljavili spremembe, se morate odjaviti."</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Logi mandrakelinuxovih orodij"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -25710,10 +25710,10 @@ msgstr "Povezovanje je opravljeno."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Povezavanje je spodletelo.\n"</div><div class='del'>-"Preverite nastavitve v Nadzornem središču Mandrakelinux "</div><div class='add'>+"Preverite nastavitve v Nadzornem središču Mandrivalinux "</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/sq.po b/perl-install/share/po/sq.po<br/>index a98234680..71bdc2add 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/sq.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/sq.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/sq.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sq.po</a></div><div class='hunk'>@@ -59,7 +59,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -78,7 +78,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -86,7 +86,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -94,7 +94,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -220,7 +220,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1254,11 +1254,11 @@ msgstr "manuelë"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux mund ti përmbahen një numër të madhë të gjuhëve.\n"</div><div class='add'>+"Mandrivalinux mund ti përmbahen një numër të madhë të gjuhëve.\n"</div><div class='ctx'> "Zgjedheni gjuhën në të cilën dëshironi ta instaloni. E cila do të\n"</div><div class='ctx'> "jetë në përdorim e sipër kur ta instaloni kompletisht\n"</div><div class='ctx'> "dhe ta rinisni sistemin tuaj nga fillimi."</div><div class='hunk'>@@ -3676,12 +3676,12 @@ msgstr "aktivizoje përkrahjen radio"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Para se të vazhdoni më tutje, ju duhet ti lexoni termet dhe kushtet për\n"</div><div class='del'>-"përdorimin e licencës. Kjo mbulon tërë shpërndarjen e Mandrakelinux,\n"</div><div class='add'>+"përdorimin e licencës. Kjo mbulon tërë shpërndarjen e Mandrivalinux,\n"</div><div class='ctx'> "nëse ju pajtoheni me këto kushte, klikoni mbi mbi kopsën \"%s\".\n"</div><div class='ctx'> "Nëse ju nuk pajtoheni atëher thjeshtë ndaleni komjuterin tuaj."</div><div class='ctx'> </div><div class='hunk'>@@ -3866,7 +3866,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3884,11 +3884,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3940,12 +3940,12 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tani është momenti që ti zgjedhni pakot që duhet të instalohen në sistemin\n"</div><div class='del'>-"tuaj. Duhet ta dini se Mandrakelinux përmban me mijëra pako instaluese,\n"</div><div class='add'>+"tuaj. Duhet ta dini se Mandrivalinux përmban me mijëra pako instaluese,\n"</div><div class='ctx'> "dhe nuk është me rendësi që ti njifti të gjitha për mendësh.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Pakot janë të radhitura në grupe përkatëse për përdorim të veçant në "</div><div class='ctx'> "makinën\n"</div><div class='del'>-"tuaj. Mandrakelinux posedon katër instalime të përcaktuara. Ju mund të\n"</div><div class='add'>+"tuaj. Mandrivalinux posedon katër instalime të përcaktuara. Ju mund të\n"</div><div class='ctx'> "mendoni mbi këto klasa instaluese si kontainer të pakove të ndryshme.\n"</div><div class='ctx'> "Ju keni mundësi ti përzini (mix) dhe ti barazoni aplikacionet nga "</div><div class='ctx'> "kontainerët\n"</div><div class='hunk'>@@ -4045,10 +4045,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4239,7 +4239,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4295,7 +4295,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (për Sistemin Windows X) është zemra e interfacit grafik për GNU/Linux\n"</div><div class='ctx'> "në të cilin të gjitha mjediset grafike (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etj.) janë të denguara mbi Mandrakelinux.\n"</div><div class='add'>+"WindowMaker, etj.) janë të denguara mbi Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Juve do të ju prezentohet lista e parametrave të ndryshëm për të ndryshuar,\n"</div><div class='ctx'> "dhe për të pranuar çfaqjet grafike optimale: Kartelë Grafike\n"</div><div class='hunk'>@@ -4420,12 +4420,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4452,7 +4452,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4461,7 +4461,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4482,7 +4482,7 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Kjo etapë do të ju mundësoj që të përcaktoni me precizitet vendosjen dhe\n"</div><div class='del'>-"instalimin e Mandrakelinux. Nëse disku i juaj i fortë është zbrazët apo i\n"</div><div class='add'>+"instalimin e Mandrivalinux. Nëse disku i juaj i fortë është zbrazët apo i\n"</div><div class='ctx'> "përdorur nga një sistem tjetër eksploatimi, ju duhet ta shpërndani\n"</div><div class='ctx'> "diskun tuaj në pjesë. Ndarje e diskut d.m.th. ta shpërndani me precizitet\n"</div><div class='ctx'> "që më fund të krijoni një hapësire për instalimin e sistemit Mandrake "</div><div class='hunk'>@@ -4527,7 +4527,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": nëse ju dëshironi ti zhdukni të gjitha\n"</div><div class='ctx'> "të dhënat dhe aplikacionet e instaluara në sistemin tuaj, dhe ti\n"</div><div class='del'>-"zëvendësoni me një sistem të ri Mandrakelinux, zgjedheni këtë mundësi.\n"</div><div class='add'>+"zëvendësoni me një sistem të ri Mandrivalinux, zgjedheni këtë mundësi.\n"</div><div class='ctx'> "Keni kujDES, sepse kjo mundësi është e pa kthyeshme mbrapa. Është e pa\n"</div><div class='ctx'> "mundur të gjindet të dhënat e zhdukura.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4687,7 +4687,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4708,7 +4708,7 @@ msgstr ""</div><div class='ctx'> "Klikoni mbi \"%s\" kur ju jeni i gatshëm që ti formatoni ndarjet.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klikoni mbi \"%s\" nëse ju dëshironi të zgjedhni një ndarje tjetër apo\n"</div><div class='del'>-"të instaloni një sistemi të ri eksploatues Mandrakelinux.\n"</div><div class='add'>+"të instaloni një sistemi të ri eksploatues Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klikoni mbi \"%s\" nëse ju dëshironi ti zgjedhni ndarjet, për një\n"</div><div class='ctx'> "verifikim të sektorëve të dëmtuar në disk."</div><div class='hunk'>@@ -4725,7 +4725,7 @@ msgstr "Mbrapa"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4737,7 +4737,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Nga momenti kur ju jeni duke instaluar Mandrakelinux, është e mundur që\n"</div><div class='add'>+"Nga momenti kur ju jeni duke instaluar Mandrivalinux, është e mundur që\n"</div><div class='ctx'> "disa pako janë azhurnuar prej daljes së atij prodhimi. Disa buge mund\n"</div><div class='ctx'> "të korigjohen, njashtu dhe probleme tjera të sigurisë. Për të ju\n"</div><div class='ctx'> "mundësuar të përfitoni një azhurnim, do të jenë të propozuara që të\n"</div><div class='hunk'>@@ -4767,7 +4767,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4794,7 +4794,7 @@ msgstr "Siguria e Administratorit:"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4865,7 +4865,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Në këtë etapë ju duhet të zgjedhni se cila(t) ndarje(t) do të përdoret(n)\n"</div><div class='del'>-"për sistemin tuaj Mandrakelinux. Nëse ndarja e diskut është bërë më heret,\n"</div><div class='add'>+"për sistemin tuaj Mandrivalinux. Nëse ndarja e diskut është bërë më heret,\n"</div><div class='ctx'> "nga një instalim tjetër GNU/Linux apo nga nji vegël tjetër ndarëse, ju\n"</div><div class='ctx'> "mund të përdorni ndarjet e bëra. Mes tjerash ndarjet duhen të jenë të\n"</div><div class='ctx'> "përcaktuara\n"</div><div class='hunk'>@@ -4954,7 +4954,7 @@ msgstr "Kalo mes modit normal/ekspert"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4984,7 +4984,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Janë gjetur më shumë se një ndarje Windows në diskun tuaj të fort, ju\n"</div><div class='ctx'> "lutemi zgjedheni njërin për ta ridimenziunuar, dhe për të instaluar\n"</div><div class='del'>-"sistemin të ri eksploatues Mandrakelinux.\n"</div><div class='add'>+"sistemin të ri eksploatues Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Çdo ndarje është listuar simbas: \"Emri Linux\",  \"Emri Windows\"\n"</div><div class='ctx'> "\"Kapaciteti\".\n"</div><div class='hunk'>@@ -5033,7 +5033,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5042,19 +5042,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Kjo etapë aktivizohet automatikisht nëse ju posedoni një ndarje të vjetër\n"</div><div class='ctx'> "GNU/Linux, në makinën tuaj.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX tani ka nevojë të dijë nëse ju dëshironi të çfaqni një instalim,\n"</div><div class='del'>-"apo azhurnim të ri, në sistemin ekzistues Mandrakelinux:\n"</div><div class='add'>+"apo azhurnim të ri, në sistemin ekzistues Mandrivalinux:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Për shumicën e rasteve, ky kompletisht shlyhet nga sistemet\n"</div><div class='ctx'> "e vjetra. Nëse ju dëshironi ta ndërroni shpërndarjen e diskut tuaj të "</div><div class='hunk'>@@ -5073,8 +5073,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Duke përdorur mundësinë ``Azhurno'' duhet të funksionoj shumë mirë në "</div><div class='ctx'> "sistemin\n"</div><div class='del'>-"Mandrakelinux ndër versionin \"8.1\" apo më të ri. Tentimi i Azhurnimit të\n"</div><div class='del'>-"një versioni më të vjetër se versioni Mandrakelinux \"8.1\" nuk rekomandohet."</div><div class='add'>+"Mandrivalinux ndër versionin \"8.1\" apo më të ri. Tentimi i Azhurnimit të\n"</div><div class='add'>+"një versioni më të vjetër se versioni Mandrivalinux \"8.1\" nuk rekomandohet."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -5129,7 +5129,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5391,7 +5391,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5412,7 +5412,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Këtu, ne e zgjedhim një sistem stampues për kompjuterin tuaj. Sistemet "</div><div class='hunk'>@@ -5561,7 +5561,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5578,7 +5578,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5705,11 +5705,11 @@ msgstr "Serviset"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Zgjedheni diskun e fort (hard drive) që dëshironi ta zhdukni, për të\n"</div><div class='del'>-"instaluar një ndarje të re Mandrakelinux. Keni kujDES, të gjitha të dhënat\n"</div><div class='add'>+"instaluar një ndarje të re Mandrivalinux. Keni kujDES, të gjitha të dhënat\n"</div><div class='ctx'> "do të zhduken, dhe nuk mund të rekuperohen!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6058,12 +6058,12 @@ msgstr "Përdorni hapësirën e ndarjes Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ndarja e juaj Windows është e pa defragmentuar. Ju lutemi riniseni "</div><div class='ctx'> "kompjuterin tuaj në Windows, the niseni programin për defragmentim "</div><div class='del'>-"``defrag'', mandej riniseni instalimin e Mandrakelinux "</div><div class='add'>+"``defrag'', mandej riniseni instalimin e Mandrivalinux "</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6180,19 +6180,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6214,7 +6214,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6222,14 +6222,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6239,7 +6239,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6259,10 +6259,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6273,11 +6273,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6293,23 +6293,23 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Parathënie\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Sistemi eksploatues dhe i komponimeve të tjera në disponibilitet në \n"</div><div class='del'>-"shpërndarjen Mandrakelinux janë të emruar \"Produkte Software\".\n"</div><div class='add'>+"shpërndarjen Mandrivalinux janë të emruar \"Produkte Software\".\n"</div><div class='ctx'> "Produketet Softver përmbajnë, mirëpo nuk i nënshtrohen bashkësisë \n"</div><div class='ctx'> "së programeve, të më parme, rregullave dhe dukumentacionit \n"</div><div class='ctx'> "mbi eksploatimin e sistemeve dhe komponimeve të ndryshme të \n"</div><div class='del'>-"shpërndarjes Mandrakelinux.\n"</div><div class='add'>+"shpërndarjes Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Licenca\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ju lutemi lexoni me vëmendje dokumentin vijues. Ky dokument përmban \n"</div><div class='ctx'> "kontratën e licencës mes jush dhe \n"</div><div class='del'>-"Mandrakesoft S.A. i përmbajtur në programe.\n"</div><div class='add'>+"Mandriva S.A. i përmbajtur në programe.\n"</div><div class='ctx'> "Duke instaluar, riprodhuar apo përdoruar programet në çfarëdo \n"</div><div class='ctx'> "mënyre \n"</div><div class='ctx'> "që janë shënuar, dhe ju e njifni, i pranoni kontratat, termet \n"</div><div class='hunk'>@@ -6331,19 +6331,19 @@ msgstr ""</div><div class='ctx'> "Produktet Software dhe dokumnetacionet e bashkangjitura janë të furnizuara "</div><div class='ctx'> "\"siq janë\" pa garancë, dhe \n"</div><div class='ctx'> "përgjegjësitë vijuese me ligj.\n"</div><div class='del'>-"Mandrakesoft S.A. nuk merrë kurrëfarë përgjegjësie në prodhimin e ndonji "</div><div class='add'>+"Mandriva S.A. nuk merrë kurrëfarë përgjegjësie në prodhimin e ndonji "</div><div class='ctx'> "porblemi, dëmi direkt, (duke mos marrë parasysh kufizimet e dëmeve \n"</div><div class='ctx'> "në humbje të biznisit, ndaljen e biznisit, humbjes finaciare dhe dënimet nga "</div><div class='ctx'> "gjykata, \n"</div><div class='ctx'> "apo çfarëdo hymbje tjetër) me shlyerjen e jashtë përdorimit apo mos lejimin "</div><div class='ctx'> "e përdorimit të Softverëve, dëmshpërblimet duhet \n"</div><div class='del'>-"të kthehen nga vendosmëria Produkteve, edhe nëse Mandrakesoft S.A. është i "</div><div class='add'>+"të kthehen nga vendosmëria Produkteve, edhe nëse Mandriva S.A. është i "</div><div class='ctx'> "informuar \n"</div><div class='ctx'> "për arritjen e një dëmi.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "KËSHILLË NË MBAJTJEN APO PËRDORIMIN E PROGRAMEVE TË NDALUARA NË DISA SHTETE\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Në asnjë mënyrë, as Mandrakesoft S.A. apo furnizuesit e tij nuk mund të "</div><div class='add'>+"Në asnjë mënyrë, as Mandriva S.A. apo furnizuesit e tij nuk mund të "</div><div class='ctx'> "jenë \n"</div><div class='ctx'> "përgjegjës, për arësye të një dëmi special, direkt apo indirekt (duke mos "</div><div class='ctx'> "përfshirë \n"</div><div class='hunk'>@@ -6351,7 +6351,7 @@ msgstr ""</div><div class='ctx'> "informacioneve komercializuese apo humbje tjera njashtu dënimet dhe "</div><div class='ctx'> "damshpërblimet duhet të derdhen simbas\n"</div><div class='ctx'> "një vendimi gjygjësor) i cili do të bëjë një përdorim \n"</div><div class='del'>-"apo transferim të Mandrakelinux të programeve të ndaluara me legjitimitet, "</div><div class='add'>+"apo transferim të Mandrivalinux të programeve të ndaluara me legjitimitet, "</div><div class='ctx'> "nga i cili ju bëni pjesë.\n"</div><div class='ctx'> "Ky njoftim i përketë njashtu edhe disa programeve të \n"</div><div class='ctx'> "kriptografisë të furnizuar me programe.\n"</div><div class='hunk'>@@ -6368,10 +6368,10 @@ msgstr ""</div><div class='ctx'> "dhe kushtet e licencës, pajtimet për secilin komponent para se ta përdorni "</div><div class='ctx'> "njërin nga ta. Secila pyetje \n"</div><div class='ctx'> "për licencat e komponeneteve duhet ti adresohet autorit dhe jo tek "</div><div class='del'>-"Mandrakesoft.\n"</div><div class='del'>-"Program Zhvilluesi nga Mandrakesoft S.A. është i qeverisur nga Licencat GPL. "</div><div class='add'>+"Mandriva.\n"</div><div class='add'>+"Program Zhvilluesi nga Mandriva S.A. është i qeverisur nga Licencat GPL. "</div><div class='ctx'> "Shkrimet në Dokumentacionet \n"</div><div class='del'>-"nga Mandrakesoft S.A. janë të qeverisura nga licenca e specifikuar. Ju "</div><div class='add'>+"nga Mandriva S.A. janë të qeverisura nga licenca e specifikuar. Ju "</div><div class='ctx'> "lutemi referohuni në dokumentacion për \n"</div><div class='ctx'> "më shumë detaje.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6382,11 +6382,11 @@ msgstr ""</div><div class='ctx'> "autorëve dhe janë \n"</div><div class='ctx'> "të mbrojtura nga përparësitë intelektuale, të drejtat e botimit, dhe "</div><div class='ctx'> "aplikimi i ligjeve në programet softver.\n"</div><div class='del'>-"Mandrakesoft S.A. rezervon të drejtat për ndryshimin dhe adaptimin e "</div><div class='add'>+"Mandriva S.A. rezervon të drejtat për ndryshimin dhe adaptimin e "</div><div class='ctx'> "Produkteve Softver, në tërësi apo në një \n"</div><div class='ctx'> "pjesë, d.m.th. të gjitha propozimet e mundshme.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" dhe logot e shoqëruara janë markë "</div><div class='del'>-"shpërndarëse e Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" dhe logot e shoqëruara janë markë "</div><div class='add'>+"shpërndarëse e Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Ligjet Qeveritare\n"</div><div class='hunk'>@@ -6401,7 +6401,7 @@ msgstr ""</div><div class='ctx'> "në mënyrë miqësore. Nëse nuk jeni dakord \n"</div><div class='ctx'> "rasti duhet ti parqitet gjykatës tribunale në Paris - France.\n"</div><div class='ctx'> "Për më shumë pyetje në lidhje me këtë dokument, ju lutemi kontaktone "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6496,7 +6496,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6504,7 +6504,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Urime, instalimi mori fund.\n"</div><div class='ctx'> "Nxerreni disketën apo CD-ROM(in) dhe shtypni mbi Enter.\n"</div><div class='hunk'>@@ -6519,7 +6519,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informacionet mbi konfigurimin e sistemit tuaj janë të lira\n"</div><div class='del'>-"në kapitullin e doracakut për përdorimin e Mandrakelinux"</div><div class='add'>+"në kapitullin e doracakut për përdorimin e Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6554,12 +6554,12 @@ msgstr "Nisja e etapës `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Kompjuteri i juaj posedon sasi të vogël të memorisë. Ju mund të ndesheni me\n"</div><div class='del'>-"disa probleme gjatë instalimit të Mandrakelinux. Nëse kjo ndodhë, ju\n"</div><div class='add'>+"disa probleme gjatë instalimit të Mandrivalinux. Nëse kjo ndodhë, ju\n"</div><div class='ctx'> "mund të vazhdoni në një instalim në modë teksti. Për këtë shtypni mbi\n"</div><div class='ctx'> "`F1' kut të niseni me një nisje të udhëzuar në CDROM, dhe fytni urdhërin "</div><div class='ctx'> "`text'."</div><div class='hunk'>@@ -7101,9 +7101,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Lidhje në sitin Mandrakelinux për të pranuar listën e lirë të pasqyreve..."</div><div class='add'>+"Lidhje në sitin Mandrivalinux për të pranuar listën e lirë të pasqyreve..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7325,8 +7325,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Instalimi i Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Instalimi i Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9913,7 +9913,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13918,7 +13918,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15848,18 +15848,18 @@ msgstr "Ndale"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Mirësevini në &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Mirësevini në &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15868,7 +15868,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15885,9 +15885,9 @@ msgstr "Mirësevini në botën Open Source"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15907,7 +15907,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15933,10 +15933,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15955,8 +15955,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15983,7 +15983,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15993,7 +15993,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -16012,13 +16012,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16030,7 +16030,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -16044,19 +16044,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "Qendra Kontrolluese Mandrakelinux"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "Qendra Kontrolluese Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -16077,61 +16077,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -16169,7 +16169,7 @@ msgstr "Zgjedheni çelësin kriptues të sistemit të skedareve"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -16190,7 +16190,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16220,7 +16220,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/15.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Kontact&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/15.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16307,7 +16307,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16542,14 +16542,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Qendra Kontrolluese Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Qendra Kontrolluese Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16571,21 +16571,21 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Online Store&lt;/b&gt;"</div><div class='del'>-msgstr "Qendra Kontrolluese Mandrakelinux"</div><div class='add'>+msgstr "Qendra Kontrolluese Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16608,20 +16608,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16640,33 +16640,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16689,32 +16689,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -17014,8 +17014,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Qendra Kontrolluese Mandrakelinux"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Qendra Kontrolluese Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -17152,7 +17152,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17223,7 +17223,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -19997,13 +19997,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Vegël Sinjalizuese bug në Mandrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Qendra Kontrolluese Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Qendra Kontrolluese Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20023,8 +20023,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20068,7 +20068,7 @@ msgstr "Asistentët Konfigurues"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -20490,7 +20490,7 @@ msgstr "Nise në Nisje të Udhëzuar"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ky interfac nuk është i konfiguruar ende.\n"</div><div class='ctx'> "Nise asistentin konfigurues në dritaren kryesore"</div><div class='hunk'>@@ -20499,7 +20499,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ky interfac nuk është i konfiguruar ende.\n"</div><div class='ctx'> "Nise asistentin konfigurues në dritaren kryesore"</div><div class='hunk'>@@ -20552,7 +20552,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -20852,7 +20852,7 @@ msgstr "Importo"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21390,14 +21390,14 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"E drejtë e autorit (C) 2003 Mandrakesoft.\n"</div><div class='add'>+"E drejtë e autorit (C) 2003 Mandriva.\n"</div><div class='ctx'> "Ky është një software gratis dhe mund të shpërndahet ndër termet e GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Përdorimi: \n"</div><div class='hunk'>@@ -21426,7 +21426,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Qendra Kontrolluese Mandrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -24570,7 +24570,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Shpjegimet e Veglave Mandrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -25083,10 +25083,10 @@ msgstr "Lidhja përfundoi."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Lidhja dështoi.\n"</div><div class='del'>-"Verifikoje konfigurimin në Qendrën Kontrolluese Mandrakelinux."</div><div class='add'>+"Verifikoje konfigurimin në Qendrën Kontrolluese Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25323,7 +25323,7 @@ msgstr "Ri-prodhimi i listës së skanerve konfigurues ..."</div><div class='ctx'> #: standalone/scannerdrake:101</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported by this version of %s."</div><div class='del'>-msgstr "%s nuk përkrahet nga ky version i Mandrakelinux."</div><div class='add'>+msgstr "%s nuk përkrahet nga ky version i Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:104</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25363,7 +25363,7 @@ msgstr ""</div><div class='ctx'> #: standalone/scannerdrake:144</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported under Linux."</div><div class='del'>-msgstr "%s nuk përkrahet nga ky version i Mandrakelinux."</div><div class='add'>+msgstr "%s nuk përkrahet nga ky version i Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:171 standalone/scannerdrake:185</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25941,8 +25941,8 @@ msgstr "Instalimi dështio"</div><div class='ctx'> #~ msgstr "Ju nuk keni zgjedhur ndonji polisë"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Qendra Kontrolluese Mandrakelinux"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Qendra Kontrolluese Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Asnjë shfletues i lirë! Ju lutemi instalone njërin"</div><div class='hunk'>@@ -26080,13 +26080,13 @@ msgstr "Instalimi dështio"</div><div class='ctx'> #~ msgstr "Gabim gjatë hapjes së %s për shkruarjen: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Ky është HardDrake, një vegël konfigurimi për material Mandrakelinux.\n"</div><div class='add'>+#~ "Ky është HardDrake, një vegël konfigurimi për material Mandrivalinux.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Versioni:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Authori:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -26802,8 +26802,8 @@ msgstr "Instalimi dështio"</div><div class='ctx'> #~ "  --report          - ky program duhet të jetë një nga veglat mandrake\n"</div><div class='ctx'> #~ "  --incident        - ky program duhet të jetë një nga veglat mandrake"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Connection failed.\n"</div><div class='head'>diff --git a/perl-install/share/po/sr.po b/perl-install/share/po/sr.po<br/>index 5ac31d45d..d8353620a 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/sr.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/sr.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/sr.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sr.po</a></div><div class='hunk'>@@ -60,7 +60,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -79,7 +79,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -87,7 +87,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +221,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1245,7 +1245,7 @@ msgstr "упуство"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "Можете изабрати други језик који ће бити доступан после инсталације "</div><div class='hunk'>@@ -3633,12 +3633,12 @@ msgstr "омогући подршку за радио"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Пре него што наставите пажљиво прочитајте услове лиценце. Она\n"</div><div class='del'>-"покрива целу Mandrakelinux дистрибуцију, и уколико се  слажете\n"</div><div class='add'>+"покрива целу Mandrivalinux дистрибуцију, и уколико се  слажете\n"</div><div class='ctx'> "са свим условима који се налазе у њој, кликните на \"Прихватам\" тастер\n"</div><div class='ctx'> "Уколико не прихватате, једноставно искључите \n"</div><div class='ctx'> "рачунар."</div><div class='hunk'>@@ -3830,13 +3830,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux инсталација се налази на неколико дискова илити CDROM-ова. "</div><div class='add'>+"Mandrivalinux инсталација се налази на неколико дискова илити CDROM-ова. "</div><div class='ctx'> "DrakX\n"</div><div class='ctx'> "зна уколико да уколико је селктовани пакет лоциран на другом CDROM-у и "</div><div class='ctx'> "избациће\n"</div><div class='hunk'>@@ -3846,11 +3846,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3902,7 +3902,7 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Сада је време да одредимо које програме желите да инсталирате на ваш\n"</div><div class='del'>-"систем. Постоје хиљаде пакета доступних за инсталацију на Mandrakelinux, и \n"</div><div class='add'>+"систем. Постоје хиљаде пакета доступних за инсталацију на Mandrivalinux, и \n"</div><div class='ctx'> "да би их учинили доступнијим, смеђтени су у групе сличних апликација.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Пакети су сортирани у групе у односу на одговарајућу употребу на вашој\n"</div><div class='hunk'>@@ -4009,10 +4009,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4042,7 +4042,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Уколико је сервер пакет изабран случајно или као део\n"</div><div class='ctx'> "целе групе, бићете упитани да ли заиста желите да инсталирате\n"</div><div class='del'>-"понуђене сервере. Под Mandrakelinux-ом, сви инсталирани\n"</div><div class='add'>+"понуђене сервере. Под Mandrivalinux-ом, сви инсталирани\n"</div><div class='ctx'> "сервери се стартују по default-у за време подизања система. Чак и ако су "</div><div class='ctx'> "сигурни и немају\n"</div><div class='ctx'> "познатих безбедносних пропуста до времена изласка дистрибуције, може се "</div><div class='hunk'>@@ -4207,7 +4207,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4263,7 +4263,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (или  X Window Систем) је срце GNU/Linux графичког интерфејса\n"</div><div class='ctx'> "на који се ослањају сва графичка окружења (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, итд.) која се налазе у Mandrakelinux-у.\n"</div><div class='add'>+"WindowMaker, итд.) која се налазе у Mandrivalinux-у.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Биће вам приказана листа са различитим параметрима чијом изменом\n"</div><div class='ctx'> "можете добити оптималан графички приказ: Графичка картица\n"</div><div class='hunk'>@@ -4380,12 +4380,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4412,7 +4412,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4421,7 +4421,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4442,11 +4442,11 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "У овом тренутку, морате да изаберете где ћете инсталирати\n"</div><div class='del'>-"Mandrakelinux оперативни систем на ваш хард диск. Уколико је празан или\n"</div><div class='add'>+"Mandrivalinux оперативни систем на ваш хард диск. Уколико је празан или\n"</div><div class='ctx'> "постојећи оперативни систем користи сав постојећи простор на диску, треба да "</div><div class='ctx'> "га\n"</div><div class='ctx'> "партиционирате. У основи, партиционирање хард диска се састоји логичког\n"</div><div class='del'>-"дељења да би обезбедили простор за инсталацију ваш нови Mandrakelinux "</div><div class='add'>+"дељења да би обезбедили простор за инсталацију ваш нови Mandrivalinux "</div><div class='ctx'> "систем.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Пошто су ефекти процеса партиционирања обично неповратни,\n"</div><div class='hunk'>@@ -4455,7 +4455,7 @@ msgstr ""</div><div class='ctx'> "журите.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Уколико сте покренули инсталацију у Експерт моду, покренућете\n"</div><div class='del'>-"DiskDrake, Mandrakelinux-ов алат за партиције, који вам дозвољавав да\n"</div><div class='add'>+"DiskDrake, Mandrivalinux-ов алат за партиције, који вам дозвољавав да\n"</div><div class='ctx'> "фино подесите ваше партиције. Погледајте DiskDrake секцију у ``User "</div><div class='ctx'> "Guide''.\n"</div><div class='ctx'> "Из инсталационог интерфејса, можете користити чаробњаке као што је описано "</div><div class='hunk'>@@ -4493,7 +4493,7 @@ msgstr ""</div><div class='ctx'> "дефрагментирате\n"</div><div class='ctx'> "Windows партицију из самог Windows-а. Backup података такође није лоша "</div><div class='ctx'> "идеја..\n"</div><div class='del'>-"Ово решење се препоручује уколико желите да користите Mandrakelinux и\n"</div><div class='add'>+"Ово решење се препоручује уколико желите да користите Mandrivalinux и\n"</div><div class='ctx'> "Microsoft Windows на истом компјутеру.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Пре него што изаберете ову опцију, морате да разумете да након ове "</div><div class='hunk'>@@ -4504,7 +4504,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"Брисање цвелог диска\": уколико желите да избришете све податке и све\n"</div><div class='ctx'> "партиције који постоје на вашем хард диску и замените их вашим\n"</div><div class='del'>-"новим Mandrakelinux системом, можете да изаберете ову оцију. Будите\n"</div><div class='add'>+"новим Mandrivalinux системом, можете да изаберете ову оцију. Будите\n"</div><div class='ctx'> "пажљивиса овом опцијом, јер нећете бити у могућности\n"</div><div class='ctx'> "да повратите старо стање након потврде.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4675,7 +4675,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4702,7 +4702,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Кликните на \"&lt;- Претходно\" ако желите да изаберете другу партицију за свој "</div><div class='ctx'> "нови\n"</div><div class='del'>-"Mandrakelinux систем.\n"</div><div class='add'>+"Mandrivalinux систем.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Кликните на \"Напредно\" уколико желите да изаберете партиције које ће бити "</div><div class='ctx'> "проверене\n"</div><div class='hunk'>@@ -4720,7 +4720,7 @@ msgstr "Претходни"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4732,7 +4732,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"У време када будете инсталирали Mandrakelinux, врло је могуће да ће неки\n"</div><div class='add'>+"У време када будете инсталирали Mandrivalinux, врло је могуће да ће неки\n"</div><div class='ctx'> "пакети бити ажурирани у односу на иницијално издање. Неки багови могу \n"</div><div class='ctx'> "бити исправљени, а сигурносни пропусти затворене. Да би могли да користите "</div><div class='ctx'> "ове новије верзије\n"</div><div class='hunk'>@@ -4764,7 +4764,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4789,7 +4789,7 @@ msgstr "Администратор за сигурност:"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4860,7 +4860,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "На овој тачки, морате избрати коју партицију(e) желите да користите за\n"</div><div class='del'>-"инсталацију новог Mandrakelinux система. Уколико су партиције\n"</div><div class='add'>+"инсталацију новог Mandrivalinux система. Уколико су партиције\n"</div><div class='ctx'> "већ дефинисане (од предходне инсталације или од стране\n"</div><div class='ctx'> "другог алата за партиције), можете да користите постојеће партиције.\n"</div><div class='ctx'> "У другим случајевима,\n"</div><div class='hunk'>@@ -4947,7 +4947,7 @@ msgstr "Пређи на нормални мод"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4977,7 +4977,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Једна или више Microsoft Windows партиција је детектовано \n"</div><div class='ctx'> "на хард диску. Изаберите коју од њих желите да смањите да би инсталирали\n"</div><div class='del'>-"нови Mandrakelinux оперативни систем.\n"</div><div class='add'>+"нови Mandrivalinux оперативни систем.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Свака партиција је исписана на следећи начин: \"Име Linux-а\",\"Име Windows-а"</div><div class='ctx'> "\"\n"</div><div class='hunk'>@@ -5025,7 +5025,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5034,13 +5034,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Овај корак се активира само у случају да постоји стара GNU/Linux партиција "</div><div class='ctx'> "на\n"</div><div class='hunk'>@@ -5048,7 +5048,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX сада треба да зна да ли желите да изведете чисту инсталацију или "</div><div class='ctx'> "ажурирање\n"</div><div class='del'>-"постојећег Mandrakelinux система:\n"</div><div class='add'>+"постојећег Mandrivalinux система:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"Инсталација\": У већини случајева, ова опција комплетно брише стари\n"</div><div class='ctx'> "систем. Уколико желите да измените број партиција, или\n"</div><div class='hunk'>@@ -5059,7 +5059,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"Ажурирање\": ова инсталациона класа вам дозвољава да урадите ажурирање "</div><div class='ctx'> "пакета\n"</div><div class='del'>-"на тренутно инсталираном Mandrakelinux систему. Ваша тренутна\n"</div><div class='add'>+"на тренутно инсталираном Mandrivalinux систему. Ваша тренутна\n"</div><div class='ctx'> "шема партиција и кориснички подаци се не мењају. Већина других\n"</div><div class='ctx'> "конфигурационих корака и даље остаје доступна, слично стандардној "</div><div class='ctx'> "инсталацији.\n"</div><div class='hunk'>@@ -5067,7 +5067,7 @@ msgstr ""</div><div class='ctx'> "Употреба опције ``Ажурирање'' би требало да буде без проблема на Mandrake "</div><div class='ctx'> "Linux системима\n"</div><div class='ctx'> "од верзије \"8.1\" или новије. Извођење ажурирања на верзијама \n"</div><div class='del'>-"Mandrakelinux пре \"8.1\" није препоручљиво."</div><div class='add'>+"Mandrivalinux пре \"8.1\" није препоручљиво."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -5122,7 +5122,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5368,7 +5368,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5389,11 +5389,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Сада треба да изаберемо систем за штампање за ваш рачунар. Други OS-ови вам\n"</div><div class='del'>-"нуде један, али вам Mandrakelinux нуди чак три.\n"</div><div class='add'>+"нуде један, али вам Mandrivalinux нуди чак три.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"pdq\" што значи ``print, do not queue'', је избор за оне који имају\n"</div><div class='ctx'> "директни конекцију са својим штампачем и желите да избегнете\n"</div><div class='hunk'>@@ -5551,7 +5551,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5568,7 +5568,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5630,7 +5630,7 @@ msgstr "Сервиси"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Изаберите хард диск који желите да избришете да би инсталирали нову Mandrake "</div><div class='hunk'>@@ -5989,7 +5989,7 @@ msgstr "Прорачунавам величину Windows партиције"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ваша Windows партиција је превише фрагментирана, прво покрените ``defrag''"</div><div class='hunk'>@@ -6107,19 +6107,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6141,7 +6141,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6149,14 +6149,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6166,7 +6166,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6186,10 +6186,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6200,11 +6200,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6220,23 +6220,23 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Упознавање\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Оперативни систем и друге компоненте доступне у Mandrakelinux дистрибуцији \n"</div><div class='add'>+"Оперативни систем и друге компоненте доступне у Mandrivalinux дистрибуцији \n"</div><div class='ctx'> "на даље ће бити зване \"Софтверски Производи\" . Софтверски производи "</div><div class='ctx'> "укључују, али нису и \n"</div><div class='ctx'> "ограничени на, скуп програма, метода, правила и документацију која је "</div><div class='ctx'> "везаназа оперативни \n"</div><div class='del'>-"систем и друге компоненте Mandrakelinux дистрибуције.\n"</div><div class='add'>+"систем и друге компоненте Mandrivalinux дистрибуције.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Лиценцни уговор\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Пажљиво прочитајте овај документ. Овај документ је лиценцни уговор "</div><div class='ctx'> "измеђуизмеђу вас и   \n"</div><div class='del'>-"Mandrakesoft S.A. који полаже право на Софтверске Производе.\n"</div><div class='add'>+"Mandriva S.A. који полаже право на Софтверске Производе.\n"</div><div class='ctx'> "Инсталирањем, копирањем или употребом Софтверских Производа у било ком виду, "</div><div class='ctx'> "ви експлицитно \n"</div><div class='ctx'> "прихватате и потпуно се слажете са прихватањем поставки и услова и стања у "</div><div class='hunk'>@@ -6256,7 +6256,7 @@ msgstr ""</div><div class='ctx'> "Софтверски Производи и пратећа документрација су омогућене \"као такве\", и "</div><div class='ctx'> "без гаранције, до граница \n"</div><div class='ctx'> "које су дозвољене законом.\n"</div><div class='del'>-"Mandrakesoft S.A. неће, у свим условима и у границама закона, бити оговоран "</div><div class='add'>+"Mandriva S.A. неће, у свим условима и у границама закона, бити оговоран "</div><div class='ctx'> "за било које специјалне,\n"</div><div class='ctx'> "случајне, директне или индиректне штете (укључујући неограниченештете или "</div><div class='ctx'> "губитке \n"</div><div class='hunk'>@@ -6264,14 +6264,14 @@ msgstr ""</div><div class='ctx'> "казне које су резултат судске \n"</div><div class='ctx'> "одлуке, или за било који други губитак) које произилазе из употребе или "</div><div class='ctx'> "немогућности коришћења Софтверских \n"</div><div class='del'>-"Производа, чак иако је Mandrakesoft S.A. саветовао и указивао на могућност "</div><div class='add'>+"Производа, чак иако је Mandriva S.A. саветовао и указивао на могућност "</div><div class='ctx'> "појаве такве \n"</div><div class='ctx'> "штете.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ограничена одговорности везане за поседовање или употребу забрањеног "</div><div class='ctx'> "софтвера у неким земљама\n"</div><div class='ctx'> "\n"</div><div class='del'>-"До граница које су условљене законом, Mandrakesoft S.A. или његови "</div><div class='add'>+"До граница које су условљене законом, Mandriva S.A. или његови "</div><div class='ctx'> "дистрибутери неће, ни под којим условима, бити \n"</div><div class='ctx'> "одговорни за специјалне, намерне директне или индиректне штете(укључујући "</div><div class='ctx'> "неограничене \n"</div><div class='hunk'>@@ -6281,7 +6281,7 @@ msgstr ""</div><div class='ctx'> "произилазе \n"</div><div class='ctx'> "из употребе или немогућности коришћења Софтверских Компоненти или које "</div><div class='ctx'> "произилазе download-ованих софтверских компоненти \n"</div><div class='del'>-"било ког Mandrakelinux сајта који су забрањени или ограничени у неким "</div><div class='add'>+"било ког Mandrivalinux сајта који су забрањени или ограничени у неким "</div><div class='ctx'> "земљама по локалним законима.\n"</div><div class='ctx'> "Ова ограничена права се примењују, али нису и ограничена на,криптографске "</div><div class='ctx'> "компоненте \n"</div><div class='hunk'>@@ -6300,10 +6300,10 @@ msgstr ""</div><div class='ctx'> "и услове лиценцног уговора за сваку компоненту пре употребе било које "</div><div class='ctx'> "компоненете. Било које питање \n"</div><div class='ctx'> "везано за лиценцу компоненти треба да буде адресирано на аутора компоненте а "</div><div class='del'>-"нена Mandrakesoft.\n"</div><div class='del'>-"Програми које је развио Mandrakesoft S.A. подлежу под GPL Лиценцу. "</div><div class='add'>+"нена Mandriva.\n"</div><div class='add'>+"Програми које је развио Mandriva S.A. подлежу под GPL Лиценцу. "</div><div class='ctx'> "Документација писана од \n"</div><div class='del'>-"стране Mandrakesoft S.A. подлеже под посебну лиценцу. Молим да погледате "</div><div class='add'>+"стране Mandriva S.A. подлеже под посебну лиценцу. Молим да погледате "</div><div class='ctx'> "документацију  \n"</div><div class='ctx'> "за детаље.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6314,10 +6314,10 @@ msgstr ""</div><div class='ctx'> "она \n"</div><div class='ctx'> "су заштићена законима о интелектуалној својини и правима који се примењују "</div><div class='ctx'> "на софтверске програме.\n"</div><div class='del'>-"Mandrakesoft S.A. је резервисао своја права на модификовање или адаптацију "</div><div class='add'>+"Mandriva S.A. је резервисао своја права на модификовање или адаптацију "</div><div class='ctx'> "СофтверскихПроизвода, како за целину тако и за \n"</div><div class='ctx'> "делове, за све све сврхе и све употребе.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" и придружени логотипи и ознаке Mandrakesoft "</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" и придружени логотипи и ознаке Mandriva "</div><div class='ctx'> "S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6333,7 +6333,7 @@ msgstr ""</div><div class='ctx'> "средство, неспоразуми ће бити упућени на одговарајуће Судске установе у "</div><div class='ctx'> "Паризу - Француска.\n"</div><div class='ctx'> "За било које питање које је везано за овај документ, контактирајте  "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6422,7 +6422,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6430,21 +6430,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Честитамо, инсталација је завршена.\n"</div><div class='ctx'> "Извадите дискету из драјва и притисните &lt;Enter&gt; да се рачунар ресетује.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "За информације о поправкама које су на располагању за ово издање\n"</div><div class='del'>-"Mandrakelinux Линукса, прочитајте део 'Errata' који можете наћи на\n"</div><div class='add'>+"Mandrivalinux Линукса, прочитајте део 'Errata' који можете наћи на\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Информације о конфигурисању вашег система можете наћи у пост-инсталационом\n"</div><div class='del'>-"поглављу званичног Mandrakelinux 'Водича за кориснике'."</div><div class='add'>+"поглављу званичног Mandrivalinux 'Водича за кориснике'."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6479,13 +6479,13 @@ msgstr "Покрећем корак `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ваш систем има мањак снаге. Услед тога можете имати проблема при "</div><div class='ctx'> "инсталацији\n"</div><div class='del'>-"Mandrakelinux. Уколико се они појаве, можете пробати текстуалну инсталацију. "</div><div class='add'>+"Mandrivalinux. Уколико се они појаве, можете пробати текстуалну инсталацију. "</div><div class='ctx'> "Да би то постигли,\n"</div><div class='ctx'> "притисните `F1' при стартању са CDROM-а, а онда укуцајте  `text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7017,9 +7017,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"КОнтактирајте Mandrakelinux web сајт да би добили листу доступних mirror-а"</div><div class='add'>+"КОнтактирајте Mandrivalinux web сајт да би добили листу доступних mirror-а"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7239,8 +7239,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux Инсталација %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux Инсталација %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9822,13 +9822,13 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall конфигуратор\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Он конфигурише лични firewall за ову Mandrakelinux машину.\n"</div><div class='add'>+"Он конфигурише лични firewall за ову Mandrivalinux машину.\n"</div><div class='ctx'> "За моћно firewall решење, погледајте\n"</div><div class='ctx'> "специјализовану MandrakeSecurity Firewall дистрибуцију."</div><div class='ctx'> </div><div class='hunk'>@@ -13765,7 +13765,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15763,18 +15763,18 @@ msgstr "Стоп"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Добродошли у &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Добродошли у &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15783,7 +15783,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15800,9 +15800,9 @@ msgstr "Добродошли у Свет Open Source-а"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15822,7 +15822,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15848,10 +15848,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15870,8 +15870,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15898,7 +15898,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15908,7 +15908,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15927,13 +15927,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15945,7 +15945,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15959,19 +15959,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux Контролни Центар"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "Mandrivalinux Контролни Центар"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -15992,61 +15992,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -16084,7 +16084,7 @@ msgstr "Изаберите кључ за енкрипцију фајл сист�</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -16105,7 +16105,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16135,7 +16135,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/15.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Kontact&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/15.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16222,7 +16222,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16457,14 +16457,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Контролни Центар&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Контролни Центар&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16486,21 +16486,21 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Online Store&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux Контролни Центар"</div><div class='add'>+msgstr "Mandrivalinux Контролни Центар"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16523,20 +16523,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16555,33 +16555,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16604,32 +16604,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16929,8 +16929,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakelinux Контролни Центар"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandrivalinux Контролни Центар"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -17069,7 +17069,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17142,14 +17142,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='del'>-"  --no-confirmation      не поставља питање о потврди у MandrakeUpdate моду\n"</div><div class='add'>+"  --no-confirmation      не поставља питање о потврди у Mandriva Update моду\n"</div><div class='ctx'> "  --no-verify-rpm        не проверава сигнатуре пакета\n"</div><div class='ctx'> "  --changelog-first      прикаѕује запис о изменама пре листе фајлова у "</div><div class='ctx'> "прозору ѕа опис\n"</div><div class='hunk'>@@ -19757,13 +19757,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Mandrake Програм за Пријављивање Грешака"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Контролни Центар"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Контролни Центар"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19783,8 +19783,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19828,7 +19828,7 @@ msgstr "Чаробњаци за конфигурацију"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -20245,7 +20245,7 @@ msgstr "Покренуто при стартању"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Овај интерфејс још увек није подешен.\n"</div><div class='ctx'> "Покрените конфигурационог чаробњака у главном прозору"</div><div class='hunk'>@@ -20254,7 +20254,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Овај интерфејс још увек није подешен.\n"</div><div class='ctx'> "Покрените конфигурационог чаробњака у главном прозору"</div><div class='hunk'>@@ -20307,7 +20307,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -20605,7 +20605,7 @@ msgstr "Увези"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21133,7 +21133,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21160,7 +21160,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Mandrake Контролни Центар"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -24123,7 +24123,7 @@ msgid ""</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ово је HardDrake, Mandrakelinux-ов алат за подешавање хардвера.\n"</div><div class='add'>+"Ово је HardDrake, Mandrivalinux-ов алат за подешавање хардвера.\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Верзија:&lt;/span&gt; %s\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Аутор:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -24234,7 +24234,7 @@ msgstr "Измене су завршене, али да би их примени</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Mandrake Алати за објашњења"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -24741,7 +24741,7 @@ msgstr "Повезивање завршено."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "повезивање неуспело.\n"</div><div class='ctx'> "Проверите вашу конфигурацију у Mandrake Контролном Центру."</div><div class='hunk'>@@ -24979,7 +24979,7 @@ msgstr "Освежавање листе подешених скенера ..."</div><div class='ctx'> #: standalone/scannerdrake:101</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported by this version of %s."</div><div class='del'>-msgstr "%s није подржан у овој верзији Mandrakelinux-а."</div><div class='add'>+msgstr "%s није подржан у овој верзији Mandrivalinux-а."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:104</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25021,7 +25021,7 @@ msgstr ""</div><div class='ctx'> #: standalone/scannerdrake:144</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported under Linux."</div><div class='del'>-msgstr "%s није подржан у овој верзији Mandrakelinux-а."</div><div class='add'>+msgstr "%s није подржан у овој верзији Mandrivalinux-а."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:171 standalone/scannerdrake:185</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25600,8 +25600,8 @@ msgstr "Инсталација није успела"</div><div class='ctx'> #~ msgstr "не могу да пронађен ниједан фонт.\n"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Mandrakelinux Контролни Центар"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Mandrivalinux Контролни Центар"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Нема доступног претраживача! Молим Вас да инсталирате барем једног"</div><div class='hunk'>@@ -26125,8 +26125,8 @@ msgstr "Инсталација није успела"</div><div class='ctx'> #~ "  --report          - програм треба да буде један од mandrake алата\n"</div><div class='ctx'> #~ "  --incident        - програм треба да буде један од mandrake алата"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Connection failed.\n"</div><div class='head'>diff --git a/perl-install/share/po/sr@Latn.po b/perl-install/share/po/sr@Latn.po<br/>index 3375990a5..90c9084ca 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/sr@Latn.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/sr@Latn.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/sr@Latn.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sr@Latn.po</a></div><div class='hunk'>@@ -60,7 +60,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -79,7 +79,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -87,7 +87,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +221,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1245,7 +1245,7 @@ msgstr "upustvo"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "Možete izabrati drugi jezik koji će biti dostupan posle instalacije "</div><div class='hunk'>@@ -3634,12 +3634,12 @@ msgstr "omogući podršku za radio"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Pre nego što nastavite pažljivo pročitajte uslove licence. Ona\n"</div><div class='del'>-"pokriva celu Mandrakelinux distribuciju, i ukoliko se  slažete\n"</div><div class='add'>+"pokriva celu Mandrivalinux distribuciju, i ukoliko se  slažete\n"</div><div class='ctx'> "sa svim uslovima koji se nalaze u njoj, kliknite na \"Prihvatam\" taster\n"</div><div class='ctx'> "Ukoliko ne prihvatate, jednostavno isključite \n"</div><div class='ctx'> "računar."</div><div class='hunk'>@@ -3833,13 +3833,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux instalacija se nalazi na nekoliko diskova iliti CDROM-ova. "</div><div class='add'>+"Mandrivalinux instalacija se nalazi na nekoliko diskova iliti CDROM-ova. "</div><div class='ctx'> "DrakX\n"</div><div class='ctx'> "zna ukoliko da ukoliko je selktovani paket lociran na drugom CDROM-u i "</div><div class='ctx'> "izbaciće\n"</div><div class='hunk'>@@ -3849,11 +3849,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3905,7 +3905,7 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sada je vreme da odredimo koje programe želite da instalirate na vaš\n"</div><div class='del'>-"sistem. Postoje hiljade paketa dostupnih za instalaciju na Mandrakelinux, "</div><div class='add'>+"sistem. Postoje hiljade paketa dostupnih za instalaciju na Mandrivalinux, "</div><div class='ctx'> "i \n"</div><div class='ctx'> "da bi ih učinili dostupnijim, smeđteni su u grupe sličnih aplikacija.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4013,10 +4013,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4046,7 +4046,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Ukoliko je server paket izabran slučajno ili kao deo\n"</div><div class='ctx'> "cele grupe, bićete upitani da li zaista želite da instalirate\n"</div><div class='del'>-"ponuđene servere. Pod Mandrakelinux-om, svi instalirani\n"</div><div class='add'>+"ponuđene servere. Pod Mandrivalinux-om, svi instalirani\n"</div><div class='ctx'> "serveri se startuju po default-u za vreme podizanja sistema. Čak i ako su "</div><div class='ctx'> "sigurni i nemaju\n"</div><div class='ctx'> "poznatih bezbednosnih propusta do vremena izlaska distribucije, može se "</div><div class='hunk'>@@ -4211,7 +4211,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4267,7 +4267,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (ili  X Window Sistem) je srce GNU/Linux grafičkog interfejsa\n"</div><div class='ctx'> "na koji se oslanjaju sva grafička okruženja (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, itd.) koja se nalaze u Mandrakelinux-u.\n"</div><div class='add'>+"WindowMaker, itd.) koja se nalaze u Mandrivalinux-u.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Biće vam prikazana lista sa različitim parametrima čijom izmenom\n"</div><div class='ctx'> "možete dobiti optimalan grafički prikaz: Grafička kartica\n"</div><div class='hunk'>@@ -4384,12 +4384,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4416,7 +4416,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4425,7 +4425,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4446,11 +4446,11 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "U ovom trenutku, morate da izaberete gde ćete instalirati\n"</div><div class='del'>-"Mandrakelinux operativni sistem na vaš hard disk. Ukoliko je prazan ili\n"</div><div class='add'>+"Mandrivalinux operativni sistem na vaš hard disk. Ukoliko je prazan ili\n"</div><div class='ctx'> "postojeći operativni sistem koristi sav postojeći prostor na disku, treba da "</div><div class='ctx'> "ga\n"</div><div class='ctx'> "particionirate. U osnovi, particioniranje hard diska se sastoji logičkog\n"</div><div class='del'>-"deljenja da bi obezbedili prostor za instalaciju vaš novi Mandrakelinux "</div><div class='add'>+"deljenja da bi obezbedili prostor za instalaciju vaš novi Mandrivalinux "</div><div class='ctx'> "sistem.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Pošto su efekti procesa particioniranja obično nepovratni,\n"</div><div class='hunk'>@@ -4459,7 +4459,7 @@ msgstr ""</div><div class='ctx'> "žurite.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ukoliko ste pokrenuli instalaciju u Ekspert modu, pokrenućete\n"</div><div class='del'>-"DiskDrake, Mandrakelinux-ov alat za particije, koji vam dozvoljavaw da\n"</div><div class='add'>+"DiskDrake, Mandrivalinux-ov alat za particije, koji vam dozvoljavaw da\n"</div><div class='ctx'> "fino podesite vaše particije. Pogledajte DiskDrake sekciju u ``User "</div><div class='ctx'> "Guide''.\n"</div><div class='ctx'> "Iz instalacionog interfejsa, možete koristiti čarobnjake kao što je opisano "</div><div class='hunk'>@@ -4497,7 +4497,7 @@ msgstr ""</div><div class='ctx'> "defragmentirate\n"</div><div class='ctx'> "Windows particiju iz samog Windows-a. Backup podataka takođe nije loša "</div><div class='ctx'> "ideja..\n"</div><div class='del'>-"Ovo rešenje se preporučuje ukoliko želite da koristite Mandrakelinux i\n"</div><div class='add'>+"Ovo rešenje se preporučuje ukoliko želite da koristite Mandrivalinux i\n"</div><div class='ctx'> "Microsoft Windows na istom kompjuteru.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Pre nego što izaberete ovu opciju, morate da razumete da nakon ove "</div><div class='hunk'>@@ -4508,7 +4508,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"Brisanje cvelog diska\": ukoliko želite da izbrišete sve podatke i sve\n"</div><div class='ctx'> "particije koji postoje na vašem hard disku i zamenite ih vašim\n"</div><div class='del'>-"novim Mandrakelinux sistemom, možete da izaberete ovu ociju. Budite\n"</div><div class='add'>+"novim Mandrivalinux sistemom, možete da izaberete ovu ociju. Budite\n"</div><div class='ctx'> "pažljivisa ovom opcijom, jer nećete biti u mogućnosti\n"</div><div class='ctx'> "da povratite staro stanje nakon potvrde.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4680,7 +4680,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4707,7 +4707,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknite na \"&lt;- Prethodno\" ako želite da izaberete drugu particiju za svoj "</div><div class='ctx'> "novi\n"</div><div class='del'>-"Mandrakelinux sistem.\n"</div><div class='add'>+"Mandrivalinux sistem.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kliknite na \"Napredno\" ukoliko želite da izaberete particije koje će biti "</div><div class='ctx'> "proverene\n"</div><div class='hunk'>@@ -4725,7 +4725,7 @@ msgstr "Prethodni"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4737,7 +4737,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"U vreme kada budete instalirali Mandrakelinux, vrlo je moguće da će neki\n"</div><div class='add'>+"U vreme kada budete instalirali Mandrivalinux, vrlo je moguće da će neki\n"</div><div class='ctx'> "paketi biti ažurirani u odnosu na inicijalno izdanje. Neki bagovi mogu \n"</div><div class='ctx'> "biti ispravljeni, a sigurnosni propusti zatvorene. Da bi mogli da koristite "</div><div class='ctx'> "ove novije verzije\n"</div><div class='hunk'>@@ -4769,7 +4769,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4794,7 +4794,7 @@ msgstr "Administrator za sigurnost:"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4865,7 +4865,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Na ovoj tački, morate izbrati koju particiju(e) želite da koristite za\n"</div><div class='del'>-"instalaciju novog Mandrakelinux sistema. Ukoliko su particije\n"</div><div class='add'>+"instalaciju novog Mandrivalinux sistema. Ukoliko su particije\n"</div><div class='ctx'> "već definisane (od predhodne instalacije ili od strane\n"</div><div class='ctx'> "drugog alata za particije), možete da koristite postojeće particije.\n"</div><div class='ctx'> "U drugim slučajevima,\n"</div><div class='hunk'>@@ -4954,7 +4954,7 @@ msgstr "Pređi na normalni mod"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4984,7 +4984,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Jedna ili više Microsoft Windows particija je detektovano \n"</div><div class='ctx'> "na hard disku. Izaberite koju od njih želite da smanjite da bi instalirali\n"</div><div class='del'>-"novi Mandrakelinux operativni sistem.\n"</div><div class='add'>+"novi Mandrivalinux operativni sistem.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Svaka particija je ispisana na sledeći način: \"Ime Linux-a\",\"Ime Windows-a"</div><div class='ctx'> "\"\n"</div><div class='hunk'>@@ -5032,7 +5032,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5041,13 +5041,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ovaj korak se aktivira samo u slučaju da postoji stara GNU/Linux particija "</div><div class='ctx'> "na\n"</div><div class='hunk'>@@ -5055,7 +5055,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX sada treba da zna da li želite da izvedete čistu instalaciju ili "</div><div class='ctx'> "ažuriranje\n"</div><div class='del'>-"postojećeg Mandrakelinux sistema:\n"</div><div class='add'>+"postojećeg Mandrivalinux sistema:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"Instalacija\": U većini slučajeva, ova opcija kompletno briše stari\n"</div><div class='ctx'> "sistem. Ukoliko želite da izmenite broj particija, ili\n"</div><div class='hunk'>@@ -5066,7 +5066,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"Ažuriranje\": ova instalaciona klasa vam dozvoljava da uradite "</div><div class='ctx'> "ažuriranje paketa\n"</div><div class='del'>-"na trenutno instaliranom Mandrakelinux sistemu. Vaša trenutna\n"</div><div class='add'>+"na trenutno instaliranom Mandrivalinux sistemu. Vaša trenutna\n"</div><div class='ctx'> "šema particija i korisnički podaci se ne menjaju. Većina drugih\n"</div><div class='ctx'> "konfiguracionih koraka i dalje ostaje dostupna, slično standardnoj "</div><div class='ctx'> "instalaciji.\n"</div><div class='hunk'>@@ -5074,7 +5074,7 @@ msgstr ""</div><div class='ctx'> "Upotreba opcije ``Ažuriranje'' bi trebalo da bude bez problema na Mandrake "</div><div class='ctx'> "Linux sistemima\n"</div><div class='ctx'> "od verzije \"8.1\" ili novije. Izvođenje ažuriranja na verzijama \n"</div><div class='del'>-"Mandrakelinux pre \"8.1\" nije preporučljivo."</div><div class='add'>+"Mandrivalinux pre \"8.1\" nije preporučljivo."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -5129,7 +5129,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5375,7 +5375,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5396,12 +5396,12 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sada treba da izaberemo sistem za štampanje za vaš računar. Drugi OS-ovi "</div><div class='ctx'> "vam\n"</div><div class='del'>-"nude jedan, ali vam Mandrakelinux nudi čak tri.\n"</div><div class='add'>+"nude jedan, ali vam Mandrivalinux nudi čak tri.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"pdq\" što znači ``print, do not queue'', je izbor za one koji imaju\n"</div><div class='ctx'> "direktni konekciju sa svojim štampačem i želite da izbegnete\n"</div><div class='hunk'>@@ -5560,7 +5560,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5577,7 +5577,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5639,7 +5639,7 @@ msgstr "Servisi"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Izaberite hard disk koji želite da izbrišete da bi instalirali novu Mandrake "</div><div class='hunk'>@@ -5998,7 +5998,7 @@ msgstr "Proračunavam veličinu Windows particije"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vaša Windows particija je previše fragmentirana, prvo pokrenite ``defrag''"</div><div class='hunk'>@@ -6116,19 +6116,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6150,7 +6150,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6158,14 +6158,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6175,7 +6175,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6195,10 +6195,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6209,11 +6209,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6229,23 +6229,23 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Upoznavanje\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Operativni sistem i druge komponente dostupne u Mandrakelinux distribuciji \n"</div><div class='add'>+"Operativni sistem i druge komponente dostupne u Mandrivalinux distribuciji \n"</div><div class='ctx'> "na dalje će biti zvane \"Softverski Proizvodi\" . Softverski proizvodi "</div><div class='ctx'> "uključuju, ali nisu i \n"</div><div class='ctx'> "ograničeni na, skup programa, metoda, pravila i dokumentaciju koja je "</div><div class='ctx'> "vezanaza operativni \n"</div><div class='del'>-"sistem i druge komponente Mandrakelinux distribucije.\n"</div><div class='add'>+"sistem i druge komponente Mandrivalinux distribucije.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Licencni ugovor\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Pažljivo pročitajte ovaj dokument. Ovaj dokument je licencni ugovor "</div><div class='ctx'> "izmeđuizmeđu vas i   \n"</div><div class='del'>-"Mandrakesoft S.A. koji polaže pravo na Softverske Proizvode.\n"</div><div class='add'>+"Mandriva S.A. koji polaže pravo na Softverske Proizvode.\n"</div><div class='ctx'> "Instaliranjem, kopiranjem ili upotrebom Softverskih Proizvoda u bilo kom "</div><div class='ctx'> "vidu, vi eksplicitno \n"</div><div class='ctx'> "prihvatate i potpuno se slažete sa prihvatanjem postavki i uslova i stanja u "</div><div class='hunk'>@@ -6265,7 +6265,7 @@ msgstr ""</div><div class='ctx'> "Softverski Proizvodi i prateća dokumentracija su omogućene \"kao takve\", i "</div><div class='ctx'> "bez garancije, do granica \n"</div><div class='ctx'> "koje su dozvoljene zakonom.\n"</div><div class='del'>-"Mandrakesoft S.A. neće, u svim uslovima i u granicama zakona, biti ogovoran "</div><div class='add'>+"Mandriva S.A. neće, u svim uslovima i u granicama zakona, biti ogovoran "</div><div class='ctx'> "za bilo koje specijalne,\n"</div><div class='ctx'> "slučajne, direktne ili indirektne štete (uključujući neograničeneštete ili "</div><div class='ctx'> "gubitke \n"</div><div class='hunk'>@@ -6273,14 +6273,14 @@ msgstr ""</div><div class='ctx'> "kazne koje su rezultat sudske \n"</div><div class='ctx'> "odluke, ili za bilo koji drugi gubitak) koje proizilaze iz upotrebe ili "</div><div class='ctx'> "nemogućnosti korišćenja Softverskih \n"</div><div class='del'>-"Proizvoda, čak iako je Mandrakesoft S.A. savetovao i ukazivao na mogućnost "</div><div class='add'>+"Proizvoda, čak iako je Mandriva S.A. savetovao i ukazivao na mogućnost "</div><div class='ctx'> "pojave takve \n"</div><div class='ctx'> "štete.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ograničena odgovornosti vezane za posedovanje ili upotrebu zabranjenog "</div><div class='ctx'> "softvera u nekim zemljama\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Do granica koje su uslovljene zakonom, Mandrakesoft S.A. ili njegovi "</div><div class='add'>+"Do granica koje su uslovljene zakonom, Mandriva S.A. ili njegovi "</div><div class='ctx'> "distributeri neće, ni pod kojim uslovima, biti \n"</div><div class='ctx'> "odgovorni za specijalne, namerne direktne ili indirektne štete(uključujući "</div><div class='ctx'> "neograničene \n"</div><div class='hunk'>@@ -6290,7 +6290,7 @@ msgstr ""</div><div class='ctx'> "proizilaze \n"</div><div class='ctx'> "iz upotrebe ili nemogućnosti korišćenja Softverskih Komponenti ili koje "</div><div class='ctx'> "proizilaze download-ovanih softverskih komponenti \n"</div><div class='del'>-"bilo kog Mandrakelinux sajta koji su zabranjeni ili ograničeni u nekim "</div><div class='add'>+"bilo kog Mandrivalinux sajta koji su zabranjeni ili ograničeni u nekim "</div><div class='ctx'> "zemljama po lokalnim zakonima.\n"</div><div class='ctx'> "Ova ograničena prava se primenjuju, ali nisu i ograničena na,kriptografske "</div><div class='ctx'> "komponente \n"</div><div class='hunk'>@@ -6309,10 +6309,10 @@ msgstr ""</div><div class='ctx'> "i uslove licencnog ugovora za svaku komponentu pre upotrebe bilo koje "</div><div class='ctx'> "komponenete. Bilo koje pitanje \n"</div><div class='ctx'> "vezano za licencu komponenti treba da bude adresirano na autora komponente a "</div><div class='del'>-"nena Mandrakesoft.\n"</div><div class='del'>-"Programi koje je razvio Mandrakesoft S.A. podležu pod GPL Licencu. "</div><div class='add'>+"nena Mandriva.\n"</div><div class='add'>+"Programi koje je razvio Mandriva S.A. podležu pod GPL Licencu. "</div><div class='ctx'> "Dokumentacija pisana od \n"</div><div class='del'>-"strane Mandrakesoft S.A. podleže pod posebnu licencu. Molim da pogledate "</div><div class='add'>+"strane Mandriva S.A. podleže pod posebnu licencu. Molim da pogledate "</div><div class='ctx'> "dokumentaciju  \n"</div><div class='ctx'> "za detalje.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6323,10 +6323,10 @@ msgstr ""</div><div class='ctx'> "ona \n"</div><div class='ctx'> "su zaštićena zakonima o intelektualnoj svojini i pravima koji se primenjuju "</div><div class='ctx'> "na softverske programe.\n"</div><div class='del'>-"Mandrakesoft S.A. je rezervisao svoja prava na modifikovanje ili adaptaciju "</div><div class='add'>+"Mandriva S.A. je rezervisao svoja prava na modifikovanje ili adaptaciju "</div><div class='ctx'> "SoftverskihProizvoda, kako za celinu tako i za \n"</div><div class='ctx'> "delove, za sve sve svrhe i sve upotrebe.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" i pridruženi logotipi i oznake Mandrakesoft "</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" i pridruženi logotipi i oznake Mandriva "</div><div class='ctx'> "S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6342,7 +6342,7 @@ msgstr ""</div><div class='ctx'> "sredstvo, nesporazumi će biti upućeni na odgovarajuće Sudske ustanove u "</div><div class='ctx'> "Parizu - Francuska.\n"</div><div class='ctx'> "Za bilo koje pitanje koje je vezano za ovaj dokument, kontaktirajte  "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6431,7 +6431,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6439,21 +6439,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Čestitamo, instalacija je završena.\n"</div><div class='ctx'> "Izvadite disketu iz drajva i pritisnite &lt;Enter&gt; da se računar resetuje.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Za informacije o popravkama koje su na raspolaganju za ovo izdanje\n"</div><div class='del'>-"Mandrakelinux Linux-a, pročitajte deo 'Errata' koji možete naći na\n"</div><div class='add'>+"Mandrivalinux Linux-a, pročitajte deo 'Errata' koji možete naći na\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Informacije o konfigurisanju vašeg sistema možete naći u post-instalacionom\n"</div><div class='del'>-"poglavlju zvaničnog Mandrakelinux 'Vodiča za korisnike'."</div><div class='add'>+"poglavlju zvaničnog Mandrivalinux 'Vodiča za korisnike'."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6488,13 +6488,13 @@ msgstr "Pokrećem korak `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vaš sistem ima manjak snage. Usled toga možete imati problema pri "</div><div class='ctx'> "instalaciji\n"</div><div class='del'>-"Mandrakelinux. Ukoliko se oni pojave, možete probati tekstualnu instalaciju. "</div><div class='add'>+"Mandrivalinux. Ukoliko se oni pojave, možete probati tekstualnu instalaciju. "</div><div class='ctx'> "Da bi to postigli,\n"</div><div class='ctx'> "pritisnite `F1' pri startanju sa CDROM-a, a onda ukucajte  `text'."</div><div class='ctx'> </div><div class='hunk'>@@ -7026,9 +7026,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"KOntaktirajte Mandrakelinux web sajt da bi dobili listu dostupnih mirror-a"</div><div class='add'>+"KOntaktirajte Mandrivalinux web sajt da bi dobili listu dostupnih mirror-a"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7248,8 +7248,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux Instalacija %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux Instalacija %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9831,13 +9831,13 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall konfigurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"On konfiguriše lični firewall za ovu Mandrakelinux mašinu.\n"</div><div class='add'>+"On konfiguriše lični firewall za ovu Mandrivalinux mašinu.\n"</div><div class='ctx'> "Za moćno firewall rešenje, pogledajte\n"</div><div class='ctx'> "specijalizovanu MandrakeSecurity Firewall distribuciju."</div><div class='ctx'> </div><div class='hunk'>@@ -13776,7 +13776,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15781,18 +15781,18 @@ msgstr "Stop"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Dobrodošli u &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Dobrodošli u &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15801,7 +15801,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15818,9 +15818,9 @@ msgstr "Dobrodošli u Svet Open Source-a"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15840,7 +15840,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15866,10 +15866,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15888,8 +15888,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15916,7 +15916,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15926,7 +15926,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15945,13 +15945,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15963,7 +15963,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15977,19 +15977,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -16010,61 +16010,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -16102,7 +16102,7 @@ msgstr "Izaberite ključ za enkripciju fajl sistema"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -16123,7 +16123,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16240,7 +16240,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16475,14 +16475,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Kontrolni Centar&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Kontrolni Centar&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16504,21 +16504,21 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Online Store&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16541,20 +16541,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16573,33 +16573,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16622,32 +16622,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16947,8 +16947,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -17087,7 +17087,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17161,14 +17161,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='del'>-"  --no-confirmation      ne postavlja pitanje o potvrdi u MandrakeUpdate "</div><div class='add'>+"  --no-confirmation      ne postavlja pitanje o potvrdi u Mandriva Update "</div><div class='ctx'> "modu\n"</div><div class='ctx'> "  --no-verify-rpm        ne proverava signature paketa\n"</div><div class='ctx'> "  --changelog-first      prikadzuje zapis o izmenama pre liste fajlova u "</div><div class='hunk'>@@ -19777,13 +19777,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Mandrake Program za Prijavljivanje Grešaka"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19803,8 +19803,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19848,7 +19848,7 @@ msgstr "Čarobnjaci za konfiguraciju"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -20265,7 +20265,7 @@ msgstr "Pokrenuto pri startanju"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ovaj interfejs još uvek nije podešen.\n"</div><div class='ctx'> "Pokrenite konfiguracionog čarobnjaka u glavnom prozoru"</div><div class='hunk'>@@ -20274,7 +20274,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ovaj interfejs još uvek nije podešen.\n"</div><div class='ctx'> "Pokrenite konfiguracionog čarobnjaka u glavnom prozoru"</div><div class='hunk'>@@ -20327,7 +20327,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -20626,7 +20626,7 @@ msgstr "Uvezi"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21154,7 +21154,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21181,7 +21181,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Mandrake Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -24144,7 +24144,7 @@ msgid ""</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ovo je HardDrake, Mandrakelinux-ov alat za podešavanje hardvera.\n"</div><div class='add'>+"Ovo je HardDrake, Mandrivalinux-ov alat za podešavanje hardvera.\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Verzija:&lt;/span&gt; %s\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Autor:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -24255,7 +24255,7 @@ msgstr "Izmene su završene, ali da bi ih primenili morate se izlogovati"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Mandrake Alati za objašnjenja"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -24762,7 +24762,7 @@ msgstr "Povezivanje završeno."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "povezivanje neuspelo.\n"</div><div class='ctx'> "Proverite vašu konfiguraciju u Mandrake Kontrolnom Centru."</div><div class='hunk'>@@ -25000,7 +25000,7 @@ msgstr "Osvežavanje liste podešenih skenera ..."</div><div class='ctx'> #: standalone/scannerdrake:101</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported by this version of %s."</div><div class='del'>-msgstr "%s nije podržan u ovoj verziji Mandrakelinux-a."</div><div class='add'>+msgstr "%s nije podržan u ovoj verziji Mandrivalinux-a."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:104</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25042,7 +25042,7 @@ msgstr ""</div><div class='ctx'> #: standalone/scannerdrake:144</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "The %s is not supported under Linux."</div><div class='del'>-msgstr "%s nije podržan u ovoj verziji Mandrakelinux-a."</div><div class='add'>+msgstr "%s nije podržan u ovoj verziji Mandrivalinux-a."</div><div class='ctx'> </div><div class='ctx'> #: standalone/scannerdrake:171 standalone/scannerdrake:185</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25621,8 +25621,8 @@ msgstr "Instalacija nije uspela"</div><div class='ctx'> #~ msgstr "ne mogu da pronađen nijedan font.\n"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Mandrakelinux Kontrolni Centar"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Mandrivalinux Kontrolni Centar"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Nema dostupnog pretraživača! Molim Vas da instalirate barem jednog"</div><div class='hunk'>@@ -26158,8 +26158,8 @@ msgstr "Instalacija nije uspela"</div><div class='ctx'> #~ "  --report          - program treba da bude jedan od mandrake alata\n"</div><div class='ctx'> #~ "  --incident        - program treba da bude jedan od mandrake alata"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Connection failed.\n"</div><div class='head'>diff --git a/perl-install/share/po/sv.po b/perl-install/share/po/sv.po<br/>index 90e0b0f00..d23cee079 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/sv.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/sv.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/sv.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/sv.po</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> # Översättning av DrakX-sv.po till Svenska</div><div class='ctx'> #</div><div class='ctx'> # Copyright (C) 2000,2002,2003, 2004, 2005 Free Software Foundation, Inc.</div><div class='del'>-# Copyright (c) 2000 Mandrakesoft</div><div class='add'>+# Copyright (c) 2000 Mandriva</div><div class='ctx'> # Fuad Sabanovic &lt;manijak@telia.com&gt;, 2000.</div><div class='ctx'> # Mattias Dahlberg &lt;voz@home.se&gt;, 2001, 2002.</div><div class='ctx'> # Mattias Newzella &lt;newzella@linux.nu&gt;, 2001, 2002,2003.</div><div class='hunk'>@@ -77,14 +77,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB nyckeln verkar vara skrivskyddad, men det är ej säkert att ta\n"</div><div class='ctx'> "ut den nu.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klicka på knappen för att starta om datorn, ta ut nyckeln och ta\n"</div><div class='del'>-"bort skrivskyddet. Sätt sedan in den och starta om Mandrake Move."</div><div class='add'>+"bort skrivskyddet. Sätt sedan in den och starta om Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -102,7 +102,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Din USB nyckel har inga giltiga Windows (FAT) partitioner.\n"</div><div class='hunk'>@@ -113,14 +113,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Du kan även fortsätta utan någon USB nyckel. Du kommer då\n"</div><div class='del'>-"kunna använda Mandrake Move som en vanlig \"live\" (bootbar) \n"</div><div class='add'>+"kunna använda Mandriva Move som en vanlig \"live\" (bootbar) \n"</div><div class='ctx'> "operativsystem CD."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -128,11 +128,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ingen USB nyckel kunde hittas på din dator. Om du kopplar\n"</div><div class='del'>-"in en USB nyckel nu kommer Mandrake Move kunna spara\n"</div><div class='add'>+"in en USB nyckel nu kommer Mandriva Move kunna spara\n"</div><div class='ctx'> "alla dina dokument och inställningar för denna och andra \n"</div><div class='ctx'> "datorer på nyckeln. Om du väljer att koppla in en nyckel nu,\n"</div><div class='ctx'> " vänta flera sekunder innan du försöker hitta den, då det tar \n"</div><div class='hunk'>@@ -140,7 +140,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Du kan även fortsätta utan någon USB nyckel. Du kommer då\n"</div><div class='del'>-"kunna använda Mandrake Move som en vanlig \"live\" (bootbar) \n"</div><div class='add'>+"kunna använda Mandriva Move som en vanlig \"live\" (bootbar) \n"</div><div class='ctx'> "operativsystem CD."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -267,7 +267,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -283,7 +283,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Detta kan ha uppstått på grund av korrupta \n"</div><div class='ctx'> "systemkonfigurationsfiler på USB nyckeln. Radera dom \n"</div><div class='del'>-"i så fall och starta om Mandrake Move för att åtgärda \n"</div><div class='add'>+"i så fall och starta om Mandriva Move för att åtgärda \n"</div><div class='ctx'> "problemet. Du kommer då förstås förlora informationen\n"</div><div class='ctx'> "i filerna. För att göra detta, klicka på motsvarande knapp.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1318,7 +1318,7 @@ msgstr "Språkval"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3749,12 +3749,12 @@ msgstr "aktivera radiostöd"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Innan du fortsätter bör du noga läsa licensen. Den täcker hela\n"</div><div class='del'>-"Mandrakelinux-distributionen. Om du samtycker med den,\n"</div><div class='add'>+"Mandrivalinux-distributionen. Om du samtycker med den,\n"</div><div class='ctx'> "kryssa i rutan \"%s\". Om du ej samtycker så klicka på \"%s\"\n"</div><div class='ctx'> "knappen så kommer installationen avbrytas och din dator att\n"</div><div class='ctx'> "startas om."</div><div class='hunk'>@@ -3932,13 +3932,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Installationen av Mandrakelinux är utspridd på flera cd-skivor. DrakX\n"</div><div class='add'>+"Installationen av Mandrivalinux är utspridd på flera cd-skivor. DrakX\n"</div><div class='ctx'> "vet om ett valt paket finns på en annan cd-skiva och kommer att mata ut\n"</div><div class='ctx'> "den aktuella cd:n och be dig sätta in en annan om det blir nödvändigt.\n"</div><div class='ctx'> "Om du inte har efterfrågad CD tillgänglig, klicka på \"%s\" så hoppas\n"</div><div class='hunk'>@@ -3948,11 +3948,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4004,12 +4004,12 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Det är nu dags att ange vilka program du vill installera på\n"</div><div class='del'>-"systemet. Det finns flera tusen paket tillgängliga för Mandrakelinux och\n"</div><div class='add'>+"systemet. Det finns flera tusen paket tillgängliga för Mandrivalinux och\n"</div><div class='ctx'> "för att det ska bli enklare att hantera paketen har de placerats i grupper\n"</div><div class='ctx'> "om liknande program.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Paketen är sorterade i grupper som motsvarar olika användningsområden\n"</div><div class='del'>-"för din dator. Mandrakelinux har fyra fördefinierade kategorier\n"</div><div class='add'>+"för din dator. Mandrivalinux har fyra fördefinierade kategorier\n"</div><div class='ctx'> " tillgängliga. Du kan blanda program från olika kategorier så att \n"</div><div class='ctx'> "t ex en arbetsstationsinstallation fortfarande kan ha program från \n"</div><div class='ctx'> "kategorin Utveckling installerade.\n"</div><div class='hunk'>@@ -4026,7 +4026,7 @@ msgstr ""</div><div class='ctx'> "att program utvecklade på en distribution även\n"</div><div class='ctx'> "kommer att fungera på andra distributioner.)\n"</div><div class='ctx'> "   Om du väljer \"LSB\" gruppen kommer 2.4 kernel serien installeras\n"</div><div class='del'>-"istället för 2.6 som annars är standard för Mandrakelinux. Detta är\n"</div><div class='add'>+"istället för 2.6 som annars är standard för Mandrivalinux. Detta är\n"</div><div class='ctx'> "för att uppfylla LSB stöd maximalt. Om du inte väljer \"LSB\" \n"</div><div class='ctx'> "kommer du ändå att ha ett system som är LSB kompatibelt nästan\n"</div><div class='ctx'> "till 100%%.\n"</div><div class='hunk'>@@ -4121,10 +4121,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4304,7 +4304,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4359,7 +4359,7 @@ msgid ""</div><div class='ctx'> "not successful in getting the display configured."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (som står för X Window System) är hjärtat i det grafiska gränssnittet\n"</div><div class='del'>-"i GNU/Linux. Alla grafiska miljöer som följer med Mandrakelinux\n"</div><div class='add'>+"i GNU/Linux. Alla grafiska miljöer som följer med Mandrivalinux\n"</div><div class='ctx'> "(KDE, GNOME, AfterStep, WindowMaker osv) är beroende av det\n"</div><div class='ctx'> "för att fungera.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4483,12 +4483,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4515,7 +4515,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4524,7 +4524,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4548,7 +4548,7 @@ msgstr ""</div><div class='ctx'> "Linux. Om den är tom eller om ett befintligt operativsystem använder\n"</div><div class='ctx'> "allt tillgängligt utrymme behöver du partitionera den. Att partitionera en\n"</div><div class='ctx'> "hårddisk går ut på att man delar upp den i logiska enheter för att skapa \n"</div><div class='del'>-"utrymmen åt det nya Mandrakelinux-systemet.\n"</div><div class='add'>+"utrymmen åt det nya Mandrivalinux-systemet.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Eftersom resultatet av en partitionering vanligtvis inte går att ångra\n"</div><div class='ctx'> "kan partitionering kännas skrämmande om du är en ovan användare.\n"</div><div class='hunk'>@@ -4576,7 +4576,7 @@ msgstr ""</div><div class='ctx'> "att du nyligen defragmenterat Windows-partitionen och att den använder.\n"</div><div class='ctx'> "formatet FAT. Du rekommenderas dock starkt att först säkerhetskopiera \n"</div><div class='ctx'> "data från Windows-partitionen. Denna lösning rekommenderas om du vill\n"</div><div class='del'>-" använda både Mandrakelinux och Microsoft Windows på samma dator.\n"</div><div class='add'>+" använda både Mandrivalinux och Microsoft Windows på samma dator.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Innan du väljer denna lösning måste du vara införstådd med att\n"</div><div class='ctx'> " storleken på Microsoft Windows-partitionen kommer att bli mindre\n"</div><div class='hunk'>@@ -4586,7 +4586,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Om du vill ta bort alla data och alla\n"</div><div class='ctx'> "partitioner som finns på hårddisken och ersätta dem med ditt nya\n"</div><div class='del'>-"Mandrakelinux-system, väljer du detta alternativ. Var försiktig med\n"</div><div class='add'>+"Mandrivalinux-system, väljer du detta alternativ. Var försiktig med\n"</div><div class='ctx'> "detta alternativ eftersom du kan inte ångra dig efteråt.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! Om du väljer detta alternativ kommer alla data på disken att tas "</div><div class='hunk'>@@ -4745,7 +4745,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4767,7 +4767,7 @@ msgstr ""</div><div class='ctx'> "Klicka på \"%s\" när du är redo att formatera partitionerna.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klicka på \"%s\" om du vill välja andra partitioner att installera ditt\n"</div><div class='del'>-"nya Mandrakelinux-system på.\n"</div><div class='add'>+"nya Mandrivalinux-system på.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Klicka på \"%s\" för att välja på vilka partitioner du vill leta\n"</div><div class='ctx'> "efter felaktiga block."</div><div class='hunk'>@@ -4784,7 +4784,7 @@ msgstr "Föregående"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4796,7 +4796,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Sedan denna version av Mandrakelinux gavs ut är det troligt att\n"</div><div class='add'>+"Sedan denna version av Mandrivalinux gavs ut är det troligt att\n"</div><div class='ctx'> "några paket har uppdaterats. Fel kan ha rättats till och\n"</div><div class='ctx'> "säkerhetsrelaterade problem kan ha lösts. För att du ska kunna ta\n"</div><div class='ctx'> "del av dessa uppdateringar ges du nu möjligheten att ladda ner dem\n"</div><div class='hunk'>@@ -4826,7 +4826,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4839,7 +4839,7 @@ msgstr ""</div><div class='ctx'> "påverkar hur lättanvänd datorn blir.\n"</div><div class='ctx'> "Om du inte är säker på vad du ska välja, behåll det förvalda alternativet.\n"</div><div class='ctx'> "Du kan ändra det senare med draksec verktyget, vilket är en del av av\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Skriv in email adressen till personen som är ansvarig för säkerheten\n"</div><div class='ctx'> "i \"%s\" fältet. Säkerhetsmeddelanden kommer att mailas till den\n"</div><div class='hunk'>@@ -4854,7 +4854,7 @@ msgstr "Säkerhetsadministratör"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4925,7 +4925,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nu måste du välja vilka partitioner som ska användas för installationen av\n"</div><div class='del'>-"Mandrakelinux-systemet. Om partitioner redan har definierats, antingen\n"</div><div class='add'>+"Mandrivalinux-systemet. Om partitioner redan har definierats, antingen\n"</div><div class='ctx'> "från en tidigare installation av GNU/Linux eller av ett annat\n"</div><div class='ctx'> "partitionsverktyg, kan du använda dessa. Annars måste hårddiskpartitioner\n"</div><div class='ctx'> "definieras.\n"</div><div class='hunk'>@@ -5012,7 +5012,7 @@ msgstr "Byt mellan normal/expert läge"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5042,7 +5042,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Fler än en Microsoft Windows-partition har hittats på hårddisken.\n"</div><div class='ctx'> "Välj vilken av dem du vill ändra storlek på för att kunna installera\n"</div><div class='del'>-"operativsystemet Mandrakelinux.\n"</div><div class='add'>+"operativsystemet Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Varje partition listas som följer: \"Linux-namn\", \"Windows-namn\"\n"</div><div class='ctx'> "\"Kapacitet\".\n"</div><div class='hunk'>@@ -5091,7 +5091,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5100,19 +5100,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Detta steg startas endast om en gammal GNU/Linux-partition har hittats\n"</div><div class='ctx'> "på datorn.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX behöver veta om du önskar starta en ny installation eller uppdatera\n"</div><div class='del'>-"ett redan existerande Mandrakelinux-system:\n"</div><div class='add'>+"ett redan existerande Mandrivalinux-system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" Detta raderar oftast helt det gamla systemet. Om du vill ändra\n"</div><div class='ctx'> "hur hårddiskarna är partitionerade eller ändra filsystemet ska du använda\n"</div><div class='hunk'>@@ -5123,11 +5123,11 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" detta installationsalternativ uppdaterar de paket som är "</div><div class='ctx'> "installerade\n"</div><div class='del'>-"på ditt Mandrakelinux-system. Dina nuvarande partitioner och dina\n"</div><div class='add'>+"på ditt Mandrivalinux-system. Dina nuvarande partitioner och dina\n"</div><div class='ctx'> "användares data kommer inte att förändras. De flesta installationssteg\n"</div><div class='ctx'> "kommer att vara tillgängliga precis som på en vanlig installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Uppdateringsalternativet bör fungera utmärkt på Mandrakelinux-system\n"</div><div class='add'>+"Uppdateringsalternativet bör fungera utmärkt på Mandrivalinux-system\n"</div><div class='ctx'> "som är version \"8.1\" eller senare. Att göra en uppdatering av tidigare\n"</div><div class='ctx'> "versioner än \"8.1\" rekommenderas ej."</div><div class='ctx'> </div><div class='hunk'>@@ -5187,7 +5187,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5481,7 +5481,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5502,7 +5502,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Här väljer du vilket skrivarsystem du ska använda. Andra operativsystem\n"</div><div class='hunk'>@@ -5645,7 +5645,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5662,7 +5662,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5713,7 +5713,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": konfigurera din anslutning till Internet eller ett\n"</div><div class='ctx'> "lokalt nätverk. Använd eventuell tryckt dokumentation eller använd\n"</div><div class='del'>-"Mandrakelinux Control Center efter installationen har slutförts för att\n"</div><div class='add'>+"Mandrivalinux Control Center efter installationen har slutförts för att\n"</div><div class='ctx'> "få tillgång till dokumentation och hjälp med inställningar.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" ställa in HTTP- och FTP-proxy inställingar om din\n"</div><div class='hunk'>@@ -5729,7 +5729,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" ändra konfigurationen av din starthanterare.\n"</div><div class='ctx'> " Detta bör endast göras av erfarna användare. \n"</div><div class='del'>-"Använd tryckt dokumentation eller den inbyggda hjälpen i Mandrakelinux\n"</div><div class='add'>+"Använd tryckt dokumentation eller den inbyggda hjälpen i Mandrivalinux\n"</div><div class='ctx'> "Control Center för konfiguration av starthanterare\n"</div><div class='ctx'> ".\n"</div><div class='ctx'> " * \"%s\": här kan du ställa in i detalj vilka tjänster som körs på din\n"</div><div class='hunk'>@@ -5791,11 +5791,11 @@ msgstr "Tjänster"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Välj vilken hårddisk du vill radera för att kunna installera din nya\n"</div><div class='del'>-"Mandrakelinux-partition. Var försiktig, alla data som för tillfället\n"</div><div class='add'>+"Mandrivalinux-partition. Var försiktig, alla data som för tillfället\n"</div><div class='ctx'> "finns på partitionen kommer att gå förlorad och kommer inte att kunna \n"</div><div class='ctx'> "återställas!"</div><div class='ctx'> </div><div class='hunk'>@@ -6148,7 +6148,7 @@ msgstr "Räknar ut storleken på Windows-partitionen"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Windows-partitionen är för fragmenterad, kör \"Defrag\" under Windows först."</div><div class='hunk'>@@ -6267,19 +6267,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6301,7 +6301,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6309,14 +6309,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6326,7 +6326,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6346,10 +6346,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6360,11 +6360,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6380,7 +6380,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Detta är en inofficiell översättning av licensavtalet för Linux Mandrake.\n"</div><div class='ctx'> "Denna text bestämmer inte reglerna för mjukvara i denna distribution - \n"</div><div class='hunk'>@@ -6393,16 +6393,16 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " Hädanefter avses med beteckningen \"Mjukvaruprodukter\",\n"</div><div class='ctx'> "operativsystemet, samt de olika komponenter som ingår i\n"</div><div class='del'>-"Mandrakelinux-distributionen. Mjukvaruprodukterna inkluderar, men är\n"</div><div class='add'>+"Mandrivalinux-distributionen. Mjukvaruprodukterna inkluderar, men är\n"</div><div class='ctx'> "inte begränsade till, programmen, metoderna, reglerna och\n"</div><div class='ctx'> "dokumentationen relaterade till operativsystemet och de olika\n"</div><div class='del'>-"komponenterna i Mandrakelinux-distributionen.\n"</div><div class='add'>+"komponenterna i Mandrivalinux-distributionen.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Licens\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " Läs denna text noggrant. Den är en licensavtal mellan dig\n"</div><div class='del'>-"och Mandrakesoft S.A., gällande mjukvaruprodukterna. Genom att\n"</div><div class='add'>+"och Mandriva S.A., gällande mjukvaruprodukterna. Genom att\n"</div><div class='ctx'> "installera, kopiera, eller använda mjukvaruprodukterna på något sätt,\n"</div><div class='ctx'> "accepterar du detta avtal, och godkänner att rätta dig efter dess\n"</div><div class='ctx'> "regler.\n"</div><div class='hunk'>@@ -6419,25 +6419,25 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " Mjukvaruprodukten och medföljande dokumentation tillhandahålls \"som\n"</div><div class='ctx'> "den är\", utan någon som helst garanti, endast begränsat av vad lagen\n"</div><div class='del'>-"kräver. Mandrakesoft S.A. ska, under inga omständigheter, till den\n"</div><div class='add'>+"kräver. Mandriva S.A. ska, under inga omständigheter, till den\n"</div><div class='ctx'> "grad lagen tillåter det, hållas ansvariga för olycks-, direkt eller\n"</div><div class='ctx'> "indirekt skada (bland annat, men inte begränsat till, minskad\n"</div><div class='ctx'> "försäljning, drifts-/affärs-avbrott, finansiella förluster,\n"</div><div class='ctx'> "rättsavgifter och böter i en rättsprocess mot er, eller några andra\n"</div><div class='ctx'> "därav följande förluster) som orsakats av användandet, eller oförmågan\n"</div><div class='del'>-"att använda mjukvaruprodukten, även om Mandrakesoft S.A. skulle ha\n"</div><div class='add'>+"att använda mjukvaruprodukten, även om Mandriva S.A. skulle ha\n"</div><div class='ctx'> "vetskap om möjligheten av en sådan händelse.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "BEGRÄNSAT ANSVAR GÄLLANDE ÄGANDET ELLER ANVÄNDANDET AV PROGRAMVARA FÖRBJUDEN "</div><div class='ctx'> "I VISSA LÄNDER\n"</div><div class='ctx'> "\n"</div><div class='del'>-" Mandrakesoft S.A. ska, under inga omständigheter, till den grad\n"</div><div class='add'>+" Mandriva S.A. ska, under inga omständigheter, till den grad\n"</div><div class='ctx'> "lagen tillåter det, hållas ansvariga för olycks-, direkt eller\n"</div><div class='ctx'> "indirekt skada (bland annat, men inte begränsat till, minskad\n"</div><div class='ctx'> "försäljning, drifts-/affärs-avbrott, finansiella förluster,\n"</div><div class='ctx'> "rättsavgifter och böter i en rättsprocess mot er, eller några andra\n"</div><div class='ctx'> "därav följande förluster) som orsakats av ägandet, användandet eller\n"</div><div class='del'>-"nedladdandet, från någon av Mandrakelinux platser, av\n"</div><div class='add'>+"nedladdandet, från någon av Mandrivalinux platser, av\n"</div><div class='ctx'> "mjukvarukomponenter som är förbjudna eller begränsade av landets\n"</div><div class='ctx'> "lagar. Detta begränsade ansvar gäller bland annat, men är inte\n"</div><div class='ctx'> "begränsat till, det kryptografiska mjukvarukomponenter som ingår i\n"</div><div class='hunk'>@@ -6454,9 +6454,9 @@ msgstr ""</div><div class='ctx'> "komponenterna. Läs avtalet för varje enskild komponent noga\n"</div><div class='ctx'> "innan ni använder komponenten i fråga. Varje fråga angående licensen\n"</div><div class='ctx'> "för en given komponent ska ställas till komponentens upphovsman,\n"</div><div class='del'>-"inte till Mandrakesoft S.A.\n"</div><div class='del'>-" Program skrivna av Mandrakesoft S.A. distribueras under GPL.\n"</div><div class='del'>-" Dokumentation skriven av Mandrakesoft S.A. distribueras under en\n"</div><div class='add'>+"inte till Mandriva S.A.\n"</div><div class='add'>+" Program skrivna av Mandriva S.A. distribueras under GPL.\n"</div><div class='add'>+" Dokumentation skriven av Mandriva S.A. distribueras under en\n"</div><div class='ctx'> "speciell licens. Se dokumentationen för detaljer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6465,10 +6465,10 @@ msgstr ""</div><div class='ctx'> " Alla rättigheter till Mjukvaruproduktens komponenter tillhör deras\n"</div><div class='ctx'> "respektive upphovsmän och är skyddade av\n"</div><div class='ctx'> "immaterialrätt/copyrightlagstiftning som kan appliceras på mjukvara.\n"</div><div class='del'>-" Mandrakesoft S.A. har rätt att ändra mjukvaruprodukten, helt eller\n"</div><div class='add'>+" Mandriva S.A. har rätt att ändra mjukvaruprodukten, helt eller\n"</div><div class='ctx'> "delvis, på alla sätt och för alla ändamål.\n"</div><div class='del'>-" \"Mandrake\", \"Mandrakelinux\" och associerade logotyper är\n"</div><div class='del'>-"registrerade varumärken tillhörande Mandrakesoft S.A.\n"</div><div class='add'>+" \"Mandriva\", \"Mandrivalinux\" och associerade logotyper är\n"</div><div class='add'>+"registrerade varumärken tillhörande Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Lagar\n"</div><div class='hunk'>@@ -6481,7 +6481,7 @@ msgstr ""</div><div class='ctx'> " Alla stridigheter över reglerna i detta avtal ska i första hand\n"</div><div class='ctx'> "göras upp utom domstol, och om detta ej är möjligt, inom en domstol i\n"</div><div class='ctx'> "Paris, Frankrike.\n"</div><div class='del'>-" För alla frågor rörande denna text, kontakta Mandrakesoft\n"</div><div class='add'>+" För alla frågor rörande denna text, kontakta Mandriva\n"</div><div class='ctx'> "S.A.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -6573,7 +6573,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6581,19 +6581,19 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gratulerar! Installationen är färdig.\n"</div><div class='ctx'> "Ta ur diskett och/eller cd-skiva och tryck Enter för att starta om datorn.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Information om uppdateringar för denna version av Mandrakelinux hittar du "</div><div class='add'>+"Information om uppdateringar för denna version av Mandrivalinux hittar du "</div><div class='ctx'> "på:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information om anpassning av systemet finns i kapitlet \"post install\" i\n"</div><div class='del'>-"boken \"Official Mandrakelinux User's Guide\"."</div><div class='add'>+"boken \"Official Mandrivalinux User's Guide\"."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6617,7 +6617,7 @@ msgstr ""</div><div class='ctx'> "Några viktiga paket blev inte installerade ordentligt.\n"</div><div class='ctx'> "Antingen är cd-enheten eller cd-skivan trasig.\n"</div><div class='ctx'> "Du kan kontrollera cd-skivan på en redan installerad\n"</div><div class='del'>-"Mandrakelinux-dator med kommandot \"rpm -qpl media/main/*.rpm\".\n"</div><div class='add'>+"Mandrivalinux-dator med kommandot \"rpm -qpl media/main/*.rpm\".\n"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_auto_install.pm:76 install_steps_stdio.pm:27</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6628,12 +6628,12 @@ msgstr "Påbörjar steg \"%s\"\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Systemet har ont om resurser. Du kan få problem med att installera\n"</div><div class='del'>-"Mandrakelinux. Om det blir problem kan du prova den textbaserade\n"</div><div class='add'>+"Mandrivalinux. Om det blir problem kan du prova den textbaserade\n"</div><div class='ctx'> "installationen istället. För att göra det tryck F1 när du startar\n"</div><div class='ctx'> "från cd-skivan, skriv sedan \"text\"."</div><div class='ctx'> </div><div class='hunk'>@@ -7177,9 +7177,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kontaktar Mandrakelinux webbplats för att hämta listan över tillgängliga "</div><div class='add'>+"Kontaktar Mandrivalinux webbplats för att hämta listan över tillgängliga "</div><div class='ctx'> "speglar..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7403,8 +7403,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux installation %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9993,13 +9993,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Drakfirewall-konfigurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Detta konfigurerar en personlig brandvägg för den här Mandrakelinux-datorn.\n"</div><div class='add'>+"Detta konfigurerar en personlig brandvägg för den här Mandrivalinux-datorn.\n"</div><div class='ctx'> "För en kraftfull och dedikerad brandväggslösning, se den\n"</div><div class='ctx'> "specialiserade distributionen MandrakeSecurity Firewall."</div><div class='ctx'> </div><div class='hunk'>@@ -14060,11 +14060,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Starta Scannerdrake (Hårdvara/bildläsare i Mandrakelinux kontrollcentral) "</div><div class='add'>+"Starta Scannerdrake (Hårdvara/bildläsare i Mandrivalinux kontrollcentral) "</div><div class='ctx'> "för att dela din bildläsare över nätverket.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -15990,23 +15990,23 @@ msgstr "Stoppa"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Vad är Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Vad är Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Välkommen till &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Välkommen till &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux är en &lt;b&gt;Linuxdistribution&lt;/b&gt; som innefattar kärnan av "</div><div class='add'>+"Mandrivalinux är en &lt;b&gt;Linuxdistribution&lt;/b&gt; som innefattar kärnan av "</div><div class='ctx'> "systemet, kallat &lt;b&gt;operativsystemet&lt;/b&gt; (baserat på Linuxkärnan), "</div><div class='ctx'> "tillsammans med &lt;b&gt;en massa program&lt;/b&gt; som möter varje behov som du kan "</div><div class='ctx'> "tänkas ha."</div><div class='hunk'>@@ -16014,11 +16014,11 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux är den mest &lt;b&gt;användarvänliga&lt;/b&gt; Linuxdistributionen. "</div><div class='del'>-"Mandrakelinux är även en av världens &lt;b&gt;mest använda&lt;/b&gt; Linux-"</div><div class='add'>+"Mandrivalinux är den mest &lt;b&gt;användarvänliga&lt;/b&gt; Linuxdistributionen. "</div><div class='add'>+"Mandrivalinux är även en av världens &lt;b&gt;mest använda&lt;/b&gt; Linux-"</div><div class='ctx'> "distributioner!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16034,14 +16034,14 @@ msgstr "Välkommen till &lt;b&gt;de öppna källkodernas värld&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux stödjer Open Source modellen. Detta betyder att ditt nya "</div><div class='del'>-"Mandrakelinux-operativsystem och dess många applikationer är resultatet av "</div><div class='del'>-"ett &lt;b&gt;samarbete &lt;/b&gt; mellan &lt;b&gt;Mandrakesofts utvecklare&lt;/b&gt; och "</div><div class='add'>+"Mandrivalinux stödjer Open Source modellen. Detta betyder att ditt nya "</div><div class='add'>+"Mandrivalinux-operativsystem och dess många applikationer är resultatet av "</div><div class='add'>+"ett &lt;b&gt;samarbete &lt;/b&gt; mellan &lt;b&gt;Mandrivas utvecklare&lt;/b&gt; och "</div><div class='ctx'> "&lt;b&gt;bidragsgivare runtom i världen&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='hunk'>@@ -16062,10 +16062,10 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Det mesta av mjukvaran som medföljer denna distribution och alla "</div><div class='del'>-"Mandrakelinux verktyg är licensierade under &lt;b&gt;GNU General Public Licence&lt;/b&gt;"</div><div class='add'>+"Mandrivalinux verktyg är licensierade under &lt;b&gt;GNU General Public Licence&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16091,20 +16091,20 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:13</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "&lt;b&gt;Join the Community&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Anslut dig till Mandrakelinux-gemenskapen!&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Anslut dig till Mandrivalinux-gemenskapen!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux har en av de &lt;b&gt;största grupperna&lt;/b&gt; av användare och "</div><div class='add'>+"Mandrivalinux har en av de &lt;b&gt;största grupperna&lt;/b&gt; av användare och "</div><div class='ctx'> "utvecklare. Sådana grupper utför en stor mängd skilda uppgifter, från att "</div><div class='ctx'> "rapportera buggar och översätta program till att utveckla nya applikationer. "</div><div class='del'>-"Gemenskapen är en &lt;b&gt;nyckelroll&lt;/b&gt; i Mandrakelinux värld."</div><div class='add'>+"Gemenskapen är en &lt;b&gt;nyckelroll&lt;/b&gt; i Mandrivalinux värld."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16125,11 +16125,11 @@ msgstr "&lt;b&gt;Nerladdningsversion&lt;/b&gt;."</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Du installerar nu &lt;b&gt;Mandrakelinux Nerladdningsversion&lt;/b&gt;. Detta är den "</div><div class='del'>-"fria gratisversionen som Mandrakesoft vill &lt;b&gt;göra tillgänglig för alla&lt;/b&gt;."</div><div class='add'>+"Du installerar nu &lt;b&gt;Mandrivalinux Nerladdningsversion&lt;/b&gt;. Detta är den "</div><div class='add'>+"fria gratisversionen som Mandriva vill &lt;b&gt;göra tillgänglig för alla&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16160,9 +16160,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='del'>-"De &lt;b&gt;tjänster som följer med&lt;/b&gt; andra Mandrakesoft produkter är inte "</div><div class='add'>+"De &lt;b&gt;tjänster som följer med&lt;/b&gt; andra Mandriva produkter är inte "</div><div class='ctx'> "heller tillgängliga."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -16172,8 +16172,8 @@ msgstr "&lt;b&gt;Discovery, Din Första Linux Desktop&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Du installerar nu &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Du installerar nu &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16195,17 +16195,17 @@ msgstr "&lt;b&gt;PowerPack, Den ultimata Linux desktopen&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Du installerar nu &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Du installerar nu &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack är Mandrakesofts &lt;b&gt;främsta Linux desktop produkt&lt;/b&gt;. PowerPack "</div><div class='add'>+"PowerPack är Mandrivas &lt;b&gt;främsta Linux desktop produkt&lt;/b&gt;. PowerPack "</div><div class='ctx'> "innehåller &lt;b&gt;tusentals applikationer&lt;/b&gt; - allt från de mest populära till "</div><div class='ctx'> "de mest avancerade."</div><div class='ctx'> </div><div class='hunk'>@@ -16216,8 +16216,8 @@ msgstr "&lt;b&gt;PowerPack+, Linuxlösningen för Desktop och Server&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Du installerar nu &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Du installerar nu &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16233,22 +16233,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft Produkter&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Produkter&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; har utvecklat ett stort antal &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; har utvecklat ett stort antal &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "produkter."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux produkterna är:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux produkterna är:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16268,54 +16268,54 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, Linuxlösningen för Desktop och Server."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux för x86-64&lt;/b&gt;, Mandrakelinux lösningen som utnyttjar "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux för x86-64&lt;/b&gt;, Mandrivalinux lösningen som utnyttjar "</div><div class='ctx'> "din 64-bit processor till fullo."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft Produkter (Vanliga Produkter)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Produkter (Vanliga Produkter)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft har utvecklat två produkter som gör det möjligt för dig att "</div><div class='del'>-"använda Mandrakelinux på &lt;b&gt;vilken dator som helst&lt;/b&gt; utan att ens behöva "</div><div class='add'>+"Mandriva har utvecklat två produkter som gör det möjligt för dig att "</div><div class='add'>+"använda Mandrivalinux på &lt;b&gt;vilken dator som helst&lt;/b&gt; utan att ens behöva "</div><div class='ctx'> "installera det."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, en Mandrakelinux distribution som körs helt och hållet från "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, en Mandrivalinux distribution som körs helt och hållet från "</div><div class='ctx'> "en bootbar cd-rom skiva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, en Mandrakelinux distribution som är förinstallerad "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, en Mandrivalinux distribution som är förinstallerad "</div><div class='ctx'> "på den ultra-kompakta \"LaCie\" mobila hårddisken."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft Produkter (Professionella lösningar)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Produkter (Professionella lösningar)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Följande produkter är de som utvecklats för att möta &lt;b&gt;professionella "</div><div class='hunk'>@@ -16323,18 +16323,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrakelinux Desktop för företag."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrivalinux Desktop för företag."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrakelinux Server lösning."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Mandrivalinux Server lösning."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrakelinux Säkerhetslösning"</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, Mandrivalinux Säkerhetslösning"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16378,9 +16378,9 @@ msgstr "&lt;b&gt;Välj din önskade skrivbordsmiljö&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Med PowerPack kan du välja mellan &lt;b&gt;skrivbordsmiljöer&lt;/b&gt;. Mandrakesoft har "</div><div class='add'>+"Med PowerPack kan du välja mellan &lt;b&gt;skrivbordsmiljöer&lt;/b&gt;. Mandriva har "</div><div class='ctx'> "valt &lt;b&gt;KDE&lt;/b&gt; som grundvalet."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -16406,9 +16406,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Med PowerPack+ kan du välja mellan &lt;b&gt;skrivbordsmiljöer&lt;/b&gt;. Mandrakesoft "</div><div class='add'>+"Med PowerPack+ kan du välja mellan &lt;b&gt;skrivbordsmiljöer&lt;/b&gt;. Mandriva "</div><div class='ctx'> "har valt &lt;b&gt;KDE&lt;/b&gt; som grundvalet."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16536,10 +16536,10 @@ msgstr "&lt;b&gt;Använd ett stort antal applikationer&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"I Mandrakelinux menyn kommer du att hitta &lt;b&gt;lättanvända&lt;/b&gt; applikationer "</div><div class='add'>+"I Mandrivalinux menyn kommer du att hitta &lt;b&gt;lättanvända&lt;/b&gt; applikationer "</div><div class='ctx'> "för &lt;b&gt;alla dina behov&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16806,18 +16806,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux kontrollcentral&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux kontrollcentral&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakelinux kontrollcentralen&lt;/b&gt; är en grundläggande samling verktyg "</div><div class='del'>-"specifika för Mandrakelinux för att förenkla konfigurationen av din dator."</div><div class='add'>+"&lt;b&gt;Mandrivalinux kontrollcentralen&lt;/b&gt; är en grundläggande samling verktyg "</div><div class='add'>+"specifika för Mandrivalinux för att förenkla konfigurationen av din dator."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16841,16 +16841,16 @@ msgstr "&lt;b&gt;Modellen för Öppen Källkod&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Som med all dataprogrammering kräver program med öppen källkod &lt;b&gt;tid och "</div><div class='ctx'> "människor&lt;/b&gt; för utvecklingen. För att respektera den öppna källkodens "</div><div class='del'>-"filosofi säljer Mandrakesoft produkter och tjänster för att kunna &lt;b&gt; "</div><div class='del'>-"fortsätta förbättra Mandrakelinux&lt;/b&gt;. Om du vill &lt;b&gt;stödja den öppna "</div><div class='del'>-"källkodens filosofi&lt;/b&gt; och utvecklandet av Mandrakelinux, &lt;b&gt;vänligen&lt;/b&gt; "</div><div class='add'>+"filosofi säljer Mandriva produkter och tjänster för att kunna &lt;b&gt; "</div><div class='add'>+"fortsätta förbättra Mandrivalinux&lt;/b&gt;. Om du vill &lt;b&gt;stödja den öppna "</div><div class='add'>+"källkodens filosofi&lt;/b&gt; och utvecklandet av Mandrivalinux, &lt;b&gt;vänligen&lt;/b&gt; "</div><div class='ctx'> "överväg att köpa någon av våra produkter eller tjänster!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16861,10 +16861,10 @@ msgstr "&lt;b&gt;Online Butik&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"För att lära dig mera om Mandrakesofts produkten och tjänster, kan du besöka "</div><div class='add'>+"För att lära dig mera om Mandrivas produkten och tjänster, kan du besöka "</div><div class='ctx'> "vår &lt;b&gt;e-handelsplattform&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16889,25 +16889,25 @@ msgstr "Stanna upp vid &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; idag"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; är det &lt;b&gt;perfekta komplementet&lt;/b&gt; till din "</div><div class='del'>-"Mandrakelinux produkt."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; är det &lt;b&gt;perfekta komplementet&lt;/b&gt; till din "</div><div class='add'>+"Mandrivalinux produkt."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Dra fördel av &lt;b&gt;värdefulla förmåner&lt;/b&gt; genom att ansluta dig till "</div><div class='del'>-"Mandrakeclub, såsom:"</div><div class='add'>+"Mandriva Club, såsom:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16929,40 +16929,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Delta i Mandrakelinux &lt;b&gt;användarforum&lt;/b&gt;"</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Delta i Mandrivalinux &lt;b&gt;användarforum&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Förhands- och priviligerad tillgång&lt;/b&gt;, före den allmäna "</div><div class='del'>-"lanseringen, till Mandrakelinux &lt;b&gt;ISO-avbilder&lt;/b&gt;."</div><div class='add'>+"lanseringen, till Mandrivalinux &lt;b&gt;ISO-avbilder&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; är en ny specialtjänst som Mandrakesoft stolt erbjuder "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; är en ny specialtjänst som Mandriva stolt erbjuder "</div><div class='ctx'> "sina kunder!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline tillhandahåller en brett register av värdefulla tjänster för "</div><div class='del'>-"att &lt;b&gt; enkelt uppdatera&lt;/b&gt; dina Mandrakelinux system."</div><div class='add'>+"Mandriva Online tillhandahåller en brett register av värdefulla tjänster för "</div><div class='add'>+"att &lt;b&gt; enkelt uppdatera&lt;/b&gt; dina Mandrivalinux system."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16986,39 +16986,39 @@ msgstr "\t* Flexibla &lt;b&gt; schemalagda&lt;/b&gt; uppdateringar."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='del'>-msgstr "\t* Hantering av &lt;b&gt;alla dina Mandrakelinux system&lt;/b&gt; med ett konto."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='add'>+msgstr "\t* Hantering av &lt;b&gt;alla dina Mandrivalinux system&lt;/b&gt; med ett konto."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Behöver du &lt;b&gt;hjälp?&lt;/b&gt; Få kontakt med Mandrakesofts tekniska experter på "</div><div class='add'>+"Behöver du &lt;b&gt;hjälp?&lt;/b&gt; Få kontakt med Mandrivas tekniska experter på "</div><div class='ctx'> "&lt;b&gt;vår tekniska hjälp-plattform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Tack vare hjälp från &lt;b&gt;kvalificerade Mandrakelinux experter&lt;/b&gt;, sparar du "</div><div class='add'>+"Tack vare hjälp från &lt;b&gt;kvalificerade Mandrivalinux experter&lt;/b&gt;, sparar du "</div><div class='ctx'> "mycket tid."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"För alla frågor rörande Mandrakelinux, har du möjligheten att köpa support-"</div><div class='add'>+"För alla frågor rörande Mandrivalinux, har du möjligheten att köpa support-"</div><div class='ctx'> "incidenter på &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17317,8 +17317,8 @@ msgstr "Övervakningsverkty, processhantering, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft Guider"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva Guider"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17416,8 +17416,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "FLAGGOR:\n"</div><div class='ctx'> "  --help            - visa det här hjälpmeddelandet.\n"</div><div class='del'>-"  --report          - programmet ska vara ett Mandrakelinux-verktyg\n"</div><div class='del'>-"  --incident        - programmet ska vara ett Mandrakelinux-verktyg"</div><div class='add'>+"  --report          - programmet ska vara ett Mandrivalinux-verktyg\n"</div><div class='add'>+"  --incident        - programmet ska vara ett Mandrivalinux-verktyg"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17473,7 +17473,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17487,7 +17487,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[FLAGGOR]...\n"</div><div class='del'>-"konfiguration av Mandrakelinux terminalserver\n"</div><div class='add'>+"konfiguration av Mandrivalinux terminalserver\n"</div><div class='ctx'> "--enable         : aktivera MTS\n"</div><div class='ctx'> "--disable        : inaktivera MTS\n"</div><div class='ctx'> "--start          : starta MTS\n"</div><div class='hunk'>@@ -17544,7 +17544,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17552,7 +17552,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[FLAGGOR]...\n"</div><div class='ctx'> "  --no-confirmation      fråga inte den första bekräftelsefrågan "</div><div class='del'>-"iMandrakeUpdate-läge\n"</div><div class='add'>+"iMandriva Update-läge\n"</div><div class='ctx'> "  --no-verify-rpm        verifiera inte paketsignaturer\n"</div><div class='ctx'> "  --changelog-first      visa ändringslogg före fillista i "</div><div class='ctx'> "beskrivningsfönstret\n"</div><div class='hunk'>@@ -20331,13 +20331,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Felrapporteringsverkyg för Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Felrapporteringsverkyg för Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux kontrollcentral"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux kontrollcentral"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20357,8 +20357,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20402,8 +20402,8 @@ msgstr "Konfigurationsguider"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Välj Mandrakesoft verktyg:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Välj Mandriva verktyg:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20829,19 +20829,19 @@ msgstr "Startad vid uppstart"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gränssnittet har inte konfigurerats ännu.\n"</div><div class='del'>-"Starta guiden \"Lägg till gränssnitt\" från Mandrakelinux kontrollcentral."</div><div class='add'>+"Starta guiden \"Lägg till gränssnitt\" från Mandrivalinux kontrollcentral."</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Gränssnittet har inte konfigurerats ännu.\n"</div><div class='del'>-"Starta guiden \"%s\" från Mandrakelinux kontrollcentral."</div><div class='add'>+"Starta guiden \"%s\" från Mandrivalinux kontrollcentral."</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20891,8 +20891,8 @@ msgstr "KDM (KDE inloggningshanterare)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux inloggningshanterare)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux inloggningshanterare)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21191,7 +21191,7 @@ msgstr "Importera"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21200,7 +21200,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (originalversion)\n"</div><div class='hunk'>@@ -21746,14 +21746,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Detta är fri mjukvara som kan spridas under de villkor som definieras i GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21782,8 +21782,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux kontrollcentral"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux kontrollcentral"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25309,8 +25309,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux verktygens loggar"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux verktygens loggar"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25825,10 +25825,10 @@ msgstr "Anslutning klar."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Anslutning misslyckades.\n"</div><div class='del'>-"Verifiera konfigurationen i Mandrakelinux kontrollcentral."</div><div class='add'>+"Verifiera konfigurationen i Mandrivalinux kontrollcentral."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/ta.po b/perl-install/share/po/ta.po<br/>index b06e3a4a7..1f474d056 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/ta.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/ta.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/ta.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/ta.po</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> # Drak X</div><div class='del'>-# Copyright (C) 2002 Mandrakesoft</div><div class='add'>+# Copyright (C) 2002 Mandriva</div><div class='ctx'> #</div><div class='ctx'> # NOTE: use UTF-8 only</div><div class='ctx'> #</div><div class='hunk'>@@ -62,7 +62,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -81,7 +81,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +89,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -97,7 +97,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -223,7 +223,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1250,7 +1250,7 @@ msgstr "மியான்மர்"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3556,13 +3556,13 @@ msgstr "வாெனாலி ஆதரவை ெசயலபடுத்து"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "உதவி இன்னமும் மொழிபெயர்கப்படவில்லை. Before continuing, you should read carefully "</div><div class='ctx'> "the terms of the license. It\n"</div><div class='del'>-"covers the whole Mandrakelinux distribution, and if you do not agree with\n"</div><div class='add'>+"covers the whole Mandrivalinux distribution, and if you do not agree with\n"</div><div class='ctx'> "all the terms in it, click on the \"Refuse\" button which will immediately\n"</div><div class='ctx'> "terminate the installation. To continue with the installation, click on the\n"</div><div class='ctx'> "\"Accept\" button."</div><div class='hunk'>@@ -3729,13 +3729,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"உதவி இன்னமும் மொழிபெயர்கப்படவில்லை.The Mandrakelinux installation is spread out "</div><div class='add'>+"உதவி இன்னமும் மொழிபெயர்கப்படவில்லை.The Mandrivalinux installation is spread out "</div><div class='ctx'> "over several CD-ROMs. DrakX\n"</div><div class='ctx'> "knows if a selected package is located on another CD-ROM and will eject the\n"</div><div class='ctx'> "current CD and ask you to insert a different one as required"</div><div class='hunk'>@@ -3744,11 +3744,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3801,7 +3801,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "உதவி இன்னமும் மொழிபெயர்கப்படவில்லை.It is now time to specify which programs you "</div><div class='ctx'> "wish to install on your\n"</div><div class='del'>-"system. There are thousands of packages available for Mandrakelinux, and\n"</div><div class='add'>+"system. There are thousands of packages available for Mandrivalinux, and\n"</div><div class='ctx'> "you are not supposed to know them all by heart.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you are performing a standard installation from a CD-ROM, you will first\n"</div><div class='hunk'>@@ -3905,10 +3905,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3944,10 +3944,10 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! If a server package has been selected, either intentionally or because\n"</div><div class='ctx'> "it was part of a whole group, you will be asked to confirm that you really\n"</div><div class='del'>-"want those servers to be installed. Under Mandrakelinux, any installed\n"</div><div class='add'>+"want those servers to be installed. Under Mandrivalinux, any installed\n"</div><div class='ctx'> "servers are started by default at boot time. Even if they are safe and have\n"</div><div class='ctx'> "no known issues at the time the distribution was shipped, it may happen\n"</div><div class='del'>-"that security holes are discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"that security holes are discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do\n"</div><div class='ctx'> "or why it is being installed, then click \"No\". Clicking \"Yes\" will\n"</div><div class='ctx'> "install the listed services and they will be started automatically by\n"</div><div class='hunk'>@@ -4081,7 +4081,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4185,12 +4185,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4217,7 +4217,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4226,7 +4226,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4251,7 +4251,7 @@ msgstr ""</div><div class='ctx'> "Linux operating system on your hard drive. If your hard drive is empty or\n"</div><div class='ctx'> "if an existing operating system is using all the available space, you will\n"</div><div class='ctx'> "need to partition it. Basically, partitioning a hard drive consists of\n"</div><div class='del'>-"logically dividing it to create space to install your new Mandrakelinux\n"</div><div class='add'>+"logically dividing it to create space to install your new Mandrivalinux\n"</div><div class='ctx'> "system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the partitioning process' effects are usually irreversible,\n"</div><div class='hunk'>@@ -4260,7 +4260,7 @@ msgstr ""</div><div class='ctx'> "beginning, please consult the manual and take your time.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you are running the installation in Expert mode, you will enter\n"</div><div class='del'>-"DiskDrake, the Mandrakelinux partitioning tool, which allows you to\n"</div><div class='add'>+"DiskDrake, the Mandrivalinux partitioning tool, which allows you to\n"</div><div class='ctx'> "fine-tune your partitions. See the DiskDrake section in the ``User Guide''.\n"</div><div class='ctx'> "From the installation interface, you can use the wizards as described here\n"</div><div class='ctx'> "by clicking the dialog's \"Wizard\" button.\n"</div><div class='hunk'>@@ -4288,7 +4288,7 @@ msgstr ""</div><div class='ctx'> "be performed without the loss of any data, provided you previously\n"</div><div class='ctx'> "defragment the Windows partition. Backing up your data will not hurt "</div><div class='ctx'> "either..\n"</div><div class='del'>-"This solution is recommended if you want to use both Mandrakelinux and\n"</div><div class='add'>+"This solution is recommended if you want to use both Mandrivalinux and\n"</div><div class='ctx'> "Microsoft Windows on the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4297,7 +4297,7 @@ msgstr ""</div><div class='ctx'> "Windows to store your data or to install new software;\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"Erase entire disk\": if you want to delete all data and all partitions\n"</div><div class='del'>-"present on your hard drive and replace them with your new Mandrakelinux\n"</div><div class='add'>+"present on your hard drive and replace them with your new Mandrivalinux\n"</div><div class='ctx'> "system, choose this option. Be careful with this solution because you will\n"</div><div class='ctx'> "not be able to revert your choice after you confirm;\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4452,7 +4452,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4478,7 +4478,7 @@ msgstr ""</div><div class='ctx'> "Click on \"OK\" when you are ready to format partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"Cancel\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions that will be checked\n"</div><div class='ctx'> "for bad blocks on the disk."</div><div class='hunk'>@@ -4495,7 +4495,7 @@ msgstr "முன்னது"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4538,7 +4538,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4563,7 +4563,7 @@ msgstr "பாதுகாப்பு மேலாளர்(பெயர் அ</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4635,7 +4635,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "உதவி இன்னமும் மொழிபெயர்கப்படவில்லை.At this point, you need to choose which "</div><div class='ctx'> "partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or from another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4719,7 +4719,7 @@ msgstr "சாதாரனர் முறைமைக்கு மாறு"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4750,7 +4750,7 @@ msgstr ""</div><div class='ctx'> "உதவி இன்னமும் மொழிபெயர்கப்படவில்ைல.More than one Microsoft partition has been "</div><div class='ctx'> "detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4794,7 +4794,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4803,13 +4803,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4861,7 +4861,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5080,7 +5080,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5101,12 +5101,12 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "உதவி இன்னமும் மொழிபெயர்கப்படவில்லை. Here, we select a printing system for your "</div><div class='ctx'> "computer. Other OSs may offer\n"</div><div class='del'>-"you one, but Mandrakelinux offers three.\n"</div><div class='add'>+"you one, but Mandrivalinux offers three.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"pdq\" - which means ``print, do not queue'', is the choice if you have\n"</div><div class='ctx'> "a direct connection to your printer and you want to be able to panic out of\n"</div><div class='hunk'>@@ -5254,7 +5254,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5271,7 +5271,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5333,7 +5333,7 @@ msgstr "சேவைகள்"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "உங்கள் கணினியில் மாண்ட்ேரக் லினக்ஸ் இயக்க அமைப்ேபா மட்டும்\n"</div><div class='hunk'>@@ -5678,7 +5678,7 @@ msgstr "விண்ேடாஸ் வகிற்றில் உள்ள இ</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "விண்ேடாஸ் வகிர் மிகவும் துண்டாக்கப்பட்டுள்ளது. தயவுசெய்து நீங்கள் கணினியை விண்ேடாஸில் "</div><div class='hunk'>@@ -5794,19 +5794,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5828,7 +5828,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5836,14 +5836,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5853,7 +5853,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5873,10 +5873,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5887,11 +5887,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5907,7 +5907,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5918,14 +5918,14 @@ msgstr ""</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5947,7 +5947,7 @@ msgstr ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5955,14 +5955,14 @@ msgstr ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5972,7 +5972,7 @@ msgstr ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5992,10 +5992,10 @@ msgstr ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6006,11 +6006,11 @@ msgstr ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6026,7 +6026,7 @@ msgstr ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6091,7 +6091,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6099,7 +6099,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "வாழ்த்துக்கள், நிறுவுதல் வெற்றிகரமாக முடிந்தது\n"</div><div class='ctx'> "நிறுவல்வட்ைடயும், நிறுவல் சிடியையும் வெளியெ எடுத்துவிட்டு மறுதொடக்கம் செய்யவும்.\n"</div><div class='hunk'>@@ -6148,7 +6148,7 @@ msgstr "தற்ேபாது இந்த  `%s நிலைக்கு ச�</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -6681,7 +6681,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr "தற்ேபாதுள்ள இணைப் பதிப்புதளங்களை அறிய மாண்ட்ேரக் இணையதளம் தொடர்புகொள்ளப்படுகிறது"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6896,7 +6896,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr "மாண்ட்ேரக் லினக்ஸ் நிறுவல்  %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -9480,7 +9480,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -13086,7 +13086,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14782,18 +14782,18 @@ msgstr "நிறுத்து"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "மாண்டடிரேக் லினக்ஸுக்கு வருக"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14802,7 +14802,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14819,9 +14819,9 @@ msgstr "திறந்த மூலநிரல் உலகுக்கு வ</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14841,7 +14841,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14867,10 +14867,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14889,8 +14889,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14917,7 +14917,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14927,7 +14927,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14946,13 +14946,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14964,7 +14964,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14978,19 +14978,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "மாண்ட்ேரக் கட்டுப்பட்டு மையம்"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -15011,61 +15011,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15103,7 +15103,7 @@ msgstr "உங்கள் கோப்பமைப்புக்கு மற�</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15124,7 +15124,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15241,7 +15241,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15476,14 +15476,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;மாண்ட்ேரக் கட்டுப்பட்டு மையம்&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15505,9 +15505,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15519,7 +15519,7 @@ msgstr "மாண்ட்ேரக் கட்டுப்பட்டு ம�</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15542,20 +15542,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;மாண்ட்ரேக் கிளப்&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15574,33 +15574,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;மாண்ட்ேரக்இணைய&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -15623,32 +15623,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;மாண்ட்ரேக் எக்ஸ்பர்ட்&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15939,7 +15939,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "மாண்ட்ேரக் கட்டுப்பட்டு மையம்"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -16035,7 +16035,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16083,7 +16083,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -18543,12 +18543,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "டிரேக்பிழை  அறிவிப்பாளன் கருவி"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "மாண்ட்ேரக் கட்டுப்பட்டு மையம்"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -18569,7 +18569,7 @@ msgstr "டிரேக்வன்ெபாருள்"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr "மாண்ட்ேரக்இணைய"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -18614,7 +18614,7 @@ msgstr "டிரேக்மாயாவிகள்"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19026,7 +19026,7 @@ msgstr "தொடங்கும்போதே துவக்கிவிட�</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "இந்த வலையமைப்பு அட்ைட இன்னும் வடிவமைக்கப்படவில்ைல\n"</div><div class='ctx'> "இதற்க்கான மாயாவியைத் துவக்கு"</div><div class='hunk'>@@ -19035,7 +19035,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "இந்த வலையமைப்பு அட்ைட இன்னும் வடிவமைக்கப்படவில்ைல\n"</div><div class='ctx'> "இதற்க்கான மாயாவியைத் துவக்கு"</div><div class='hunk'>@@ -19088,7 +19088,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -19378,7 +19378,7 @@ msgstr "இறக்குமதி செய்"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19866,7 +19866,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -19893,7 +19893,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "மாண்ட்ேரக் கட்டுப்பட்டு மையம்"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -22890,7 +22890,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "மாண்ட்ேரக் கட்டுப்பாடு மையம்"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -23394,7 +23394,7 @@ msgstr "தொடர்பு வேகம்: "</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -24235,7 +24235,7 @@ msgstr "நிறுவுதலில் பிழை நேர்ந்து�</div><div class='ctx'> #~ msgstr "நுழைவிடத்தை நீக்கு"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='ctx'> #~ msgstr "மாண்ட்ேரக் கட்டுப்பட்டு மையம்"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='hunk'>@@ -24692,7 +24692,7 @@ msgstr "நிறுவுதலில் பிழை நேர்ந்து�</div><div class='ctx'> #~ msgid "mkraid failed"</div><div class='ctx'> #~ msgstr "mkraid தோல்வியடைந்தது"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='ctx'> #~ msgstr "மாண்ட்ேரக்இணைய"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "The package %s is needed. Install it?"</div><div class='head'>diff --git a/perl-install/share/po/tg.po b/perl-install/share/po/tg.po<br/>index 8d63fe7b0..169be1240 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/tg.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/tg.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/tg.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/tg.po</a></div><div class='hunk'>@@ -76,7 +76,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Эҳтимолан дар калиди USB муҳофизат аз навиштан даргиронида\n"</div><div class='ctx'> "шудааст, лекин ҳозир бехатар баровардани он нашуда истодааст.\n"</div><div class='hunk'>@@ -84,7 +84,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Ба тугма барои боркунии мошина ангушт занед, онро бароред,\n"</div><div class='ctx'> "муҳофизат аз навиштанро хориҷ кунед, аз нав калидро ворид намоед ва бори "</div><div class='del'>-"дигар Mandrake Move-ро сар диҳед."</div><div class='add'>+"дигар Mandriva Move-ро сар диҳед."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -102,7 +102,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Калиди USB-и шумо ягон бахши дурусти Windows (FAT)-ро надорад.\n"</div><div class='hunk'>@@ -113,14 +113,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Инчунин шумо метавонед бе калиди USB давом диҳед - дар ин ҳолат\n"</div><div class='del'>-"шумо қодиред, ки Mandrake Move-ро ҳамчун live Mandrake\n"</div><div class='add'>+"шумо қодиред, ки Mandriva Move-ро ҳамчун live Mandriva\n"</div><div class='ctx'> "Operating System истифода баред."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -128,11 +128,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Дар системаи шумо ягон калиди USB пайдо нагардид. Агар шумо\n"</div><div class='del'>-"USB калидро ҳозир ворид кунед, Mandrake Move имконияти\n"</div><div class='add'>+"USB калидро ҳозир ворид кунед, Mandriva Move имконияти\n"</div><div class='ctx'> "восеҳи захиракунии додаҳоро дар феҳристи хонагии шумо,\n"</div><div class='ctx'> "батанзимдарории васеъи система барои худборшавии оянда\n"</div><div class='ctx'> "дар ин ё он компютер, медиҳад. Қайд: агар шумо калидро ҳозир\n"</div><div class='hunk'>@@ -140,7 +140,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Инчунин шумо метавонед бе калиди USB давом диҳед,\n"</div><div class='del'>-"шумо ҳоло имконияти истифодаи Mandrake Move-ро\n"</div><div class='add'>+"шумо ҳоло имконияти истифодаи Mandriva Move-ро\n"</div><div class='ctx'> "ҳамчун Системаи Амалии Mandrake доред."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -270,7 +270,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -286,7 +286,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Он мумкин аст аз сабаби харобии файлҳои батанзимдарории\n"</div><div class='ctx'> "системавӣ дар калиди USB рух дода бошад, дар ин ҳолат\n"</div><div class='del'>-"хориҷкунии ____ ва бозборкунии Mandrake Move масъаларо\n"</div><div class='add'>+"хориҷкунии ____ ва бозборкунии Mandriva Move масъаларо\n"</div><div class='ctx'> "ҳал кунад. Барои ин ба тугмаи мувофиқ ангушт занед.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1332,11 +1332,11 @@ msgstr "Интихоби забон"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux якчанд забонҳоро дастгирӣ менамояд. Забонҳоеро интихоб намоед, "</div><div class='add'>+"Mandrivalinux якчанд забонҳоро дастгирӣ менамояд. Забонҳоеро интихоб намоед, "</div><div class='ctx'> "ки\n"</div><div class='ctx'> "шумо онҳоро коргузорӣ кардан мехоҳед. Вақте ки коргузорӣ ба итмом мерасад "</div><div class='ctx'> "онҳо\n"</div><div class='hunk'>@@ -3780,12 +3780,12 @@ msgstr "даргиронидани пуштибонии радио"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Пеш аз давомдиҳӣ шумо бояд шартҳои литсензияро бо диққат хонед. Он\n"</div><div class='del'>-"ба ҳамаи тақсимоти  Mandrakelinux паҳн гардидааст. Агар шумо ба\n"</div><div class='add'>+"ба ҳамаи тақсимоти  Mandrivalinux паҳн гардидааст. Агар шумо ба\n"</div><div class='ctx'> "ҳамаи шартҳои литсензия розӣ бошед, пункти \"%s\"-ро қайд кунед. Агар розӣ\n"</div><div class='ctx'> "набошед, танҳо \"%s\" компютери худро хомӯш созед."</div><div class='ctx'> </div><div class='hunk'>@@ -3975,13 +3975,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Коргузории Mandrakelinux дар CD-ROM-ҳои мухталиф тақсим шудааст. Агар\n"</div><div class='add'>+"Коргузории Mandrivalinux дар CD-ROM-ҳои мухталиф тақсим шудааст. Агар\n"</div><div class='ctx'> "бастаи интихобшуда дар дигар CD-ROM ҷойгир бошад, DrakX диски фишурдаи\n"</div><div class='ctx'> "ҷориро ба берун кашида аз шумо вогузории диски талабшударо пурсон мешавад.\n"</div><div class='ctx'> "Агар шумо дар даст диски фишурдаи талабшударо надошта бошед, танҳо ба \"%s\" "</div><div class='hunk'>@@ -3992,11 +3992,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4048,11 +4048,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4158,10 +4158,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4193,11 +4193,11 @@ msgstr ""</div><div class='ctx'> "!! Агар бастаи хидматрасонро интихоб карда бошед, хоҳ барои интихоби муайяни "</div><div class='ctx'> "бастаи алоҳида, хоҳ барои он ки вай як қисми гурӯҳӣ баста\n"</div><div class='ctx'> "аст, шумо бояд тасдиқ кунед, ки дар ҳақиқат ин хидматрасонҳои\n"</div><div class='del'>-"коргузоришавандаро истифода бурдан мехоҳед. Дар Mandrakelinux\n"</div><div class='add'>+"коргузоришавандаро истифода бурдан мехоҳед. Дар Mandrivalinux\n"</div><div class='ctx'> "ҳамаи хидматрасонҳои коргузоришуда ҳангоми оғозёбӣ ба таври худкор, бо "</div><div class='ctx'> "нобаёнӣ сар дода мешаванд. Ҳарчанде, ки онҳо бехатаранд ва муаммоҳои\n"</div><div class='ctx'> "маълумро ҳангоми даргиронидан дар тақсимот надоранд, мумкин аст, ки\n"</div><div class='del'>-"дар бехатарӣ баъди барориши нусхаи хотимавии Mandrakelinux\n"</div><div class='add'>+"дар бехатарӣ баъди барориши нусхаи хотимавии Mandrivalinux\n"</div><div class='ctx'> "сӯрохиҳои муайян мешаванд. Агар шумо надонед, ки барои чӣ ин ё он\n"</div><div class='ctx'> "хидматрасон лозим аст ё барои чӣ он коргузорӣ мегардад пас ба \"%s\"\n"</div><div class='ctx'> "ангушт занед. Бо пахшкунии \"%s\" шумо хидматрасонҳои номбаршударо\n"</div><div class='hunk'>@@ -4361,7 +4361,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4417,7 +4417,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (барои системи X Window) ин асоси интерфейси графикии GNU/Linux мебошад,\n"</div><div class='ctx'> "ки дар он ҳамаи муҳитҳои графикӣ асос ёфтааст (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker ва ғайра) ва ба ҳайати Mandrakelinux дохил аст.\n"</div><div class='add'>+"WindowMaker ва ғайра) ва ба ҳайати Mandrivalinux дохил аст.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ба шумо рӯйхати параметрҳои гуногуне ки ба тағироти гирифтани тасвири\n"</div><div class='ctx'> "беҳтарини графикӣ пешбинӣ шудааст, дода мешавад: Корти графикӣ\n"</div><div class='hunk'>@@ -4550,12 +4550,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4582,7 +4582,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4591,7 +4591,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4612,12 +4612,12 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Дар ин қадам шумо бояд дар куҷои гардонандаи сахт ҷойгир кардани\n"</div><div class='del'>-"системаи омили Mandrakelinux-ро ҳал кунед. Агар гардонандаи сахти\n"</div><div class='add'>+"системаи омили Mandrivalinux-ро ҳал кунед. Агар гардонандаи сахти\n"</div><div class='ctx'> "шумо холӣ бошад ё системаи омили ҳозирбуда ҳамаи фазои имконпазирро\n"</div><div class='ctx'> "ишғол кунад, ба шумо лозим меояд, ки гардонандаи сахти худро\n"</div><div class='ctx'> "бахшбандӣ кунед. Бахшбандикунии гардонандаи сахт асосан аз тақсимоти "</div><div class='ctx'> "мантиқии фазои ишғолшуда барои коргузории системаи омилии \n"</div><div class='del'>-"Mandrakelinux иборат аст.\n"</div><div class='add'>+"Mandrivalinux иборат аст.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Азбаски ҷараёни бахшбандии гардонандаи сахт одатан барнагарданда\n"</div><div class='ctx'> "аст ва ба гумшавии додаҳо оварда расониданаш мумкин аст, агар дар "</div><div class='hunk'>@@ -4659,7 +4659,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": агар шумо хоҳед, ки ҳамаи додаҳоро дар ҳама қисматҳои\n"</div><div class='ctx'> "дар гардонандаи сахти худ мавҷудбударо нобуд созед ва ҷои онҳоро бо системаи "</div><div class='del'>-"нави Mandrakelinux иваз кунед, ин хосиятро интихоб\n"</div><div class='add'>+"нави Mandrivalinux иваз кунед, ин хосиятро интихоб\n"</div><div class='ctx'> "кунед. Эҳтиёт бошед, зеро баъди тасдиқот шумо интихоби худро\n"</div><div class='ctx'> "баргардонида наметавонед.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4824,7 +4824,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4848,7 +4848,7 @@ msgstr ""</div><div class='ctx'> "Агар шумо ба шаклбандии бахшҳо тайёр бошед ба \"%s\" ангушт занед.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Агар шумо хоҳед, ки дигар бахшҳоро барои коргузории системаи\n"</div><div class='del'>-"омилии навъи Mandrakelinux интихоб кунед ба \"%s\" ангушт занед.\n"</div><div class='add'>+"омилии навъи Mandrivalinux интихоб кунед ба \"%s\" ангушт занед.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Агар хоҳед бахшҳоеро, ки дар диск ба мавҷудияти қисмҳои бад\n"</div><div class='ctx'> "тафтиш карда шаванд интихоб намоед, ба \"%s\" ангушт занед."</div><div class='hunk'>@@ -4865,7 +4865,7 @@ msgstr "Гузашта"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4877,7 +4877,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ҳангоми коргузории Mandrakelinux хуб мешуд, ки баъзе бастаи\n"</div><div class='add'>+"Ҳангоми коргузории Mandrivalinux хуб мешуд, ки баъзе бастаи\n"</div><div class='ctx'> "барномаҳо нав карда шаванд, аз рӯзи барориши ибтидоӣ. Эҳтимолан\n"</div><div class='ctx'> "баъзе хатогиҳо ислоҳ шудаанд ва дархостҳо оиди бехтарӣ ҳал шудаанд.\n"</div><div class='ctx'> "Барои гирифтани фоида аз ин навсозиҳо, ҳозир ба шумо боркунии онҳо аз "</div><div class='hunk'>@@ -4908,7 +4908,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4938,7 +4938,7 @@ msgstr "Идоракунандаи Бехатарӣ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -5009,7 +5009,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Дар ин пункт шумо бояд интихоб намоед, ки кадом бахш(ҳо) барои\n"</div><div class='del'>-"коргузории системавӣ Mandrakelinux-и шумо истифода бурда мешаванд.\n"</div><div class='add'>+"коргузории системавӣ Mandrivalinux-и шумо истифода бурда мешаванд.\n"</div><div class='ctx'> "Агар бахшҳои алоқаи аз коргузории пешинаи GNU/Linux ё аз дигар\n"</div><div class='ctx'> "асбоби бахшбандикунӣ муайян шуда бошад, шумо метавонед бахшҳои мавҷударо "</div><div class='ctx'> "истифода баред. Дар дигар ҳолат бояд бахшҳои гардонандаи\n"</div><div class='hunk'>@@ -5103,7 +5103,7 @@ msgstr "Зомин байни усули мӯътадил/мутахассисӣ</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5133,7 +5133,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Дар гардонандаи сахти шумо зиёда аз як бахши Microsoft муайян гардид.\n"</div><div class='ctx'> "Марҳамат карда бахшеро, ки барои коргузории системаи нави омили\n"</div><div class='del'>-"Mandrakelinux андозаи онро тағир додан мехоҳед, интихоб намоед.\n"</div><div class='add'>+"Mandrivalinux андозаи онро тағир додан мехоҳед, интихоб намоед.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ҳар бахш ба таври зерин ба рӯйхат гирифта мешавад: \"ном дар Linux\",\n"</div><div class='ctx'> "\"ном дар Windows\" \"Ғунҷоиш\".\n"</div><div class='hunk'>@@ -5184,7 +5184,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5193,19 +5193,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ин қадам танҳо дар он ҳолате фаъол мегардад, ки дар мошинаи шумо\n"</div><div class='ctx'> "бахши кӯҳнаи GNU/Linux пайдо гардад.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX бояд донад, ки оё шумо мехоҳед, ки коргузории навро гузаронед\n"</div><div class='del'>-"ё системаи Mandrakelinux-и мавҷударо афзоиш диҳед:\n"</div><div class='add'>+"ё системаи Mandrivalinux-и мавҷударо афзоиш диҳед:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Дар бисёр ҳолатҳо ин вариант ба нобудшавии системаи кӯҳна\n"</div><div class='ctx'> "оварда мерасонад. Агар хоҳед, ки бахшҳои гардонандаи сахти худро иваз\n"</div><div class='hunk'>@@ -5214,14 +5214,14 @@ msgstr ""</div><div class='ctx'> "додаҳои мавҷудаи худро аз бознависӣ захира карда метавонанд.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": ин синфи коргузорӣ ба шумо имконияти авкунии бастаи\n"</div><div class='del'>-"барномаҳои дар системаи Mandrakelinux-и коргузоришударо медиҳад.\n"</div><div class='add'>+"барномаҳои дар системаи Mandrivalinux-и коргузоришударо медиҳад.\n"</div><div class='ctx'> "Нақшаи бахшбандии ҷорӣ ва додаҳои корванд, ивазнашавандаанд.\n"</div><div class='ctx'> "Бештари дигар қадамҳо низ дастрас мегарданд, ба монанди коргузории "</div><div class='ctx'> "низоммеъёр.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Интихоби хосияти ``Густариш'' дар системаҳои Mandrakelinux аз нусхаи\n"</div><div class='add'>+"Интихоби хосияти ``Густариш'' дар системаҳои Mandrivalinux аз нусхаи\n"</div><div class='ctx'> "\"8.1\" сар карда то охирон хеле хуб хоҳад кор кард. Гузаронидани Густариш\n"</div><div class='del'>-"дар системаҳои Mandrakelinux болотар аз \"8.1\" маслиҳат дода мешавад."</div><div class='add'>+"дар системаҳои Mandrivalinux болотар аз \"8.1\" маслиҳат дода мешавад."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5278,7 +5278,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5547,7 +5547,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5568,11 +5568,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ҳоло вақте расидааст барои интихоби системаи чопкунӣ барои компютери\n"</div><div class='del'>-"шумо. Дигар СО ба шумо як намудро пешкаш карда метавонад, Mandrakelinux\n"</div><div class='add'>+"шумо. Дигар СО ба шумо як намудро пешкаш карда метавонад, Mandrivalinux\n"</div><div class='ctx'> "бошад, ду намудро. Ҳар яке аз системаҳо барои батанзимдарории\n"</div><div class='ctx'> "муайяни беҳтарин мебошад.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5720,7 +5720,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5737,7 +5737,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5862,11 +5862,11 @@ msgstr "Хидматрасонҳо"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Диски сахтеро, интихоб намоед, ки шумо онро барои офаридани қисми\n"</div><div class='del'>-"Mandrakelinux дур намудан мехоҳед. Эҳтиёт шавед, ки дар он ҳамаи\n"</div><div class='add'>+"Mandrivalinux дур намудан мехоҳед. Эҳтиёт шавед, ки дар он ҳамаи\n"</div><div class='ctx'> "додаҳои мавҷуд буда гум хоҳад шуд ва он барқарор намегардад!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6225,12 +6225,12 @@ msgstr "Андозаи бахшбандии Windows ҳисоб шуда исто</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Қисми Windows-и шумо бениҳоят тика гардидааст. Лутфан, компютери худро дар "</div><div class='ctx'> "зери Windows аз сари нав оғоз намоед, ``defrag''-ро ба кор андозед ва сониян "</div><div class='del'>-"такроран коргузории Mandrakelinux-ро мавриди истифодабарӣ қарор диҳед."</div><div class='add'>+"такроран коргузории Mandrivalinux-ро мавриди истифодабарӣ қарор диҳед."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6347,19 +6347,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6381,7 +6381,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6389,14 +6389,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6406,7 +6406,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6426,10 +6426,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6440,11 +6440,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6460,21 +6460,21 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Муқаддима\n"</div><div class='del'>-"Системи операсионӣ ва қисмҳои гуногуне ки дар тақсимоти Mandrakelinux \n"</div><div class='add'>+"Системи операсионӣ ва қисмҳои гуногуне ки дар тақсимоти Mandrivalinux \n"</div><div class='ctx'> "дастрас мебошад баъдан \"Маҳсулотҳои Нармафзор\" номида мешавад.\n"</div><div class='ctx'> "Маҳсулотҳои Нармафзор иборат аст аз маҷмӯи барномаҳо, усулҳо, қоидаҳо\n"</div><div class='ctx'> "ва ҳуҷҷатҳое ки бо системи операсионӣ ва қисмҳои гуногуни тақсимоти\n"</div><div class='del'>-"Mandrakelinux алоқаманд аст.\n"</div><div class='add'>+"Mandrivalinux алоқаманд аст.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Шартномаи Лисензионӣ\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Лутфан ин ҳучҷатро бо диққат хонед. Ҳуҷҷати мазкур ин шартномаи лисензионӣ "</div><div class='ctx'> "байни шумо ва \n"</div><div class='del'>-"Mandrakesoft S.A., ки он ба Маҳсулотҳои Нармафзор тааллуқ дорад.\n"</div><div class='add'>+"Mandriva S.A., ки он ба Маҳсулотҳои Нармафзор тааллуқ дорад.\n"</div><div class='ctx'> "Маҳсулотҳои Барномавиро муқаррар намуда, чоп намуда ва истифода намудан бо "</div><div class='ctx'> "мақсадҳои дигар шумо комилан бо шарту қоидаҳои шартномаи мазкур розӣ "</div><div class='ctx'> "мебошед. Агар шумо бо яке аз қисмҳои Шартномаи мазкур розӣ набошед, онгоҳ ба "</div><div class='hunk'>@@ -6490,16 +6490,16 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Маҳсулотҳои Барномавӣ ва ҳуҷҷати пешниҳодшуда бечунучаро\"мебошад\"бе ҳеҷ "</div><div class='ctx'> "кафолат дар доираи қонун.\n"</div><div class='del'>-"Mandrakesoft S.A. дар ягон ҳолате аз тарафи қонун пешбинӣ шуда маъсулятро "</div><div class='add'>+"Mandriva S.A. дар ягон ҳолате аз тарафи қонун пешбинӣ шуда маъсулятро "</div><div class='ctx'> "барои камбудии муаяйне, тасодуфӣ, бевосита ва бавосита (аз он ҷумла камбудии "</div><div class='ctx'> "беҳудуд аз муфлисшавии бизнес, танаффус дар фаъолияти тиҷоратӣ, муфлисшавии "</div><div class='ctx'> "молиявӣ, хароҷотҳои судӣ ва ҷаримаҳое ки натиҷаи мубоҳисаи судӣ мебошад ё "</div><div class='ctx'> "дигар камбудиҳои бавосита), ки натиҷаи истифодаи Маҳсулотҳои Барномавӣ, "</div><div class='del'>-"ҳатто агар ба Mandrakesoft S.A. маълум бошад дар хусуси имконият ё ин ки "</div><div class='add'>+"ҳатто агар ба Mandriva S.A. маълум бошад дар хусуси имконият ё ин ки "</div><div class='ctx'> "ҳолати чунин камбудӣ\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "ӮҲДАДОРИИ МАҲДУДНОКЕ БО НИГОҲДОРӢ ВА ИСТИФОДАИ ТАЪМИНОТИ БАРНОМАВӢ ДАР ЯК "</div><div class='del'>-"ЧАНД МАМЛАКАТҲО ВОБАСТА АСТ Мувофиқи доираҳои қонунӣ Mandrakesoft S.A. ва "</div><div class='add'>+"ЧАНД МАМЛАКАТҲО ВОБАСТА АСТ Мувофиқи доираҳои қонунӣ Mandriva S.A. ва "</div><div class='ctx'> "паҳнкунандагони он бе ҳеҷ шарту асос маъсулиятро В пределах, дозволенных "</div><div class='ctx'> "законом, или ее распространители\n"</div><div class='ctx'> "ни при каких условиях не несут ответственности за любой, какой бы то ни "</div><div class='hunk'>@@ -6511,7 +6511,7 @@ msgstr ""</div><div class='ctx'> "разбирательств, или любых других косвенных потерь), являющихся результатом\n"</div><div class='ctx'> "владения и использования компонентов программного обеспечения,\n"</div><div class='ctx'> "или являющихся результатом скачивания компонентов программного обеспечения\n"</div><div class='del'>-"с одного из сайтов Mandrakelinux, запрещенных или ограниченных в некоторых\n"</div><div class='add'>+"с одного из сайтов Mandrivalinux, запрещенных или ограниченных в некоторых\n"</div><div class='ctx'> "странах местными законами.\n"</div><div class='ctx'> "Ограниченная ответственность применяется, но не ограничивается,\n"</div><div class='ctx'> "к компонентам сильной криптографии, включаемых в Программные Продукты.\n"</div><div class='hunk'>@@ -6527,10 +6527,10 @@ msgstr ""</div><div class='ctx'> "они распространяются. Пожалуйста, внимательно читайте условия и положения\n"</div><div class='ctx'> "лицензионного соглашения для каждого из компонент перед использованием\n"</div><div class='ctx'> "любого компонента. Любые вопросы по лицензии компонента должны быть\n"</div><div class='del'>-"адресованы автору компонента, а не Mandrakesoft.\n"</div><div class='del'>-"Программы, разработанные Mandrakesoft S.A., находятся под действием "</div><div class='add'>+"адресованы автору компонента, а не Mandriva.\n"</div><div class='add'>+"Программы, разработанные Mandriva S.A., находятся под действием "</div><div class='ctx'> "лицензии\n"</div><div class='del'>-"GPL. Документация, написанная Mandrakesoft S.A., находится под действием\n"</div><div class='add'>+"GPL. Документация, написанная Mandriva S.A., находится под действием\n"</div><div class='ctx'> "особой лицензии. Пожалуйста, обратитесь к документации за дополнительной\n"</div><div class='ctx'> "информацией.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6540,11 +6540,11 @@ msgstr ""</div><div class='ctx'> "соответствующим\n"</div><div class='ctx'> "авторам и защищены законами об интеллектуальной собственности и авторском\n"</div><div class='ctx'> "праве, применительно к программному обеспечению.\n"</div><div class='del'>-"Mandrakesoft S.A. сохраняет за собой право изменять или адаптировать\n"</div><div class='add'>+"Mandriva S.A. сохраняет за собой право изменять или адаптировать\n"</div><div class='ctx'> "Программные Продукты, как целиком, так и по частям, любым способом и для\n"</div><div class='ctx'> "любых целей.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" и соответствующие логотипы являются "</div><div class='del'>-"торговыми марками Mandrakesoft S.A.\n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" и соответствующие логотипы являются "</div><div class='add'>+"торговыми марками Mandriva S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Основные законы\n"</div><div class='hunk'>@@ -6559,7 +6559,7 @@ msgstr ""</div><div class='ctx'> "будут оспариваться в суде. В последнюю очередь оспаривание вопроса будет "</div><div class='ctx'> "передано в соответствующий Законодательный Суд Парижа - Франция. По любым "</div><div class='ctx'> "вопросам, касающимся этого документа, пожалуйста, свяжитесь\n"</div><div class='del'>-"с Mandrakesoft S.A.\n"</div><div class='add'>+"с Mandriva S.A.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6659,7 +6659,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6667,14 +6667,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Табрикоти моро қабул намоед, коргузорӣ ба итмом расид.\n"</div><div class='ctx'> "Расонаи худборшавиро дур намоед ва барои бозхудборшавӣ ба Enter ангушт "</div><div class='ctx'> "занед.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Барои гирифтани маълумот оиди собитии барои ин нусхаи Mandrakelinux дастрас\n"</div><div class='add'>+"Барои гирифтани маълумот оиди собитии барои ин нусхаи Mandrivalinux дастрас\n"</div><div class='ctx'> "буда ба Рӯйхати хатогиҳо муроҷиат намоед, ки мавҷуд аст дар:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6682,7 +6682,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Маълумот оиди танзимдарории системи шумо дар порчаи post install-и\n"</div><div class='del'>-"Дастуамали Расмиии Корванди Mandrakelinux мавҷуд аст."</div><div class='add'>+"Дастуамали Расмиии Корванди Mandrivalinux мавҷуд аст."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6717,11 +6717,11 @@ msgstr "Гузориш ба қадами `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Дар системи шумо захира кам аст. Ҳангоми коргузорӣ намудани Mandrakelinux "</div><div class='add'>+"Дар системи шумо захира кам аст. Ҳангоми коргузорӣ намудани Mandrivalinux "</div><div class='ctx'> "шумо метавонед бо муаммоҳо дучор гардед. Агар ин рӯй диҳад, онгоҳ шумо "</div><div class='ctx'> "метавонед коргузории матниро ба амал оред. Ҳангоми худборкунии CDROM ба`F1' "</div><div class='ctx'> "ангушт занед  ва сониян ба `text' дохил шавед."</div><div class='hunk'>@@ -7276,7 +7276,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Барои ба даст даровардани рӯйхати қуттиҳои дастрас пайвастшавӣ ба Mandrake "</div><div class='ctx'> "Linuxweb site ба роҳ монда шудааст..."</div><div class='hunk'>@@ -7505,8 +7505,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Коргузории Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Коргузории Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10095,13 +10095,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Танзимгари drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Вай фейрволҳои шахсиро барои ин мошинаи Mandrakelinux ба танзим медарорад.\n"</div><div class='add'>+"Вай фейрволҳои шахсиро барои ин мошинаи Mandrivalinux ба танзим медарорад.\n"</div><div class='ctx'> "Барои ҳалли фейрволи тахассуснок ва пуриқтидор, марҳамат карда ба тақсимоти\n"</div><div class='ctx'> "MandrakeSecurity Firewall нигаред."</div><div class='ctx'> </div><div class='hunk'>@@ -14196,7 +14196,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16200,33 +16200,33 @@ msgstr "Ист"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux чист?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux чист?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Марҳамат ба &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Марҳамат ба &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux ин &lt;b&gt;тақсимоти Linux&lt;/b&gt;, ки дар худ ҳастаи системаро дарбар "</div><div class='add'>+"Mandrivalinux ин &lt;b&gt;тақсимоти Linux&lt;/b&gt;, ки дар худ ҳастаи системаро дарбар "</div><div class='ctx'> "мегирад ва он &lt;b&gt;системаи омил&lt;/b&gt; ном дорад (ба ҳастаи Linux асос ёфтааст) "</div><div class='ctx'> "ба ҳамроҳии &lt;b&gt;замимаҳои бисёр&lt;/b&gt; ба дилхоҳ дархости шумо ҷавобгӯ аст."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Дар айни замон Mandrakelinux ин тақсимоти бештар &lt;b&gt;бо корванд иртиботи "</div><div class='add'>+"Дар айни замон Mandrivalinux ин тақсимоти бештар &lt;b&gt;бо корванд иртиботи "</div><div class='ctx'> "дӯстона доштаи&lt;/b&gt; Linux мебошад. Инчунин он тақсимоти ҷаҳонии Linux-и "</div><div class='ctx'> "&lt;b&gt;васеъ истифодашаванда&lt;/b&gt; мебошад!"</div><div class='ctx'> </div><div class='hunk'>@@ -16243,14 +16243,14 @@ msgstr "Марҳамат ба &lt;b&gt;ҷаҳони сарчашмаи кушод&lt;b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux ба усули сарчашмаи кушод масъул аст. Ин маънои онро дорад, ки "</div><div class='add'>+"Mandrivalinux ба усули сарчашмаи кушод масъул аст. Ин маънои онро дорад, ки "</div><div class='ctx'> "ин барориши нав натиҷаи &lt;b&gt;ҳамкории&lt;/b&gt; байни &lt;b&gt;гурӯҳи коргардонони "</div><div class='del'>-"Mandrakesoft&lt;/b&gt; ва &lt;b&gt;ҷамъияти шабакаи ҷаҳонии&lt;/b&gt; ҳамкорони Mandrakelinux "</div><div class='add'>+"Mandriva&lt;/b&gt; ва &lt;b&gt;ҷамъияти шабакаи ҷаҳонии&lt;/b&gt; ҳамкорони Mandrivalinux "</div><div class='ctx'> "мебошад."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='hunk'>@@ -16271,10 +16271,10 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Бештари таъминотҳои барномавӣ ба тақсимот ҳамроҳ карда шудаанд ва ҳамаи "</div><div class='del'>-"асбобҳои Mandrakelinux ҷавознома таҳти &lt;b&gt;Ҷавозномаи Умумии Оммавӣ&lt;b&gt; доранд."</div><div class='add'>+"асбобҳои Mandrivalinux ҷавознома таҳти &lt;b&gt;Ҷавозномаи Умумии Оммавӣ&lt;b&gt; доранд."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16304,15 +16304,15 @@ msgstr "&lt;b&gt;Ба Ҷамъомад ҳамроҳ шавед!&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux яке аз &lt;b&gt;ҷамъиятҳои калонтарини&lt;/b&gt; корвандон ва "</div><div class='add'>+"Mandrivalinux яке аз &lt;b&gt;ҷамъиятҳои калонтарини&lt;/b&gt; корвандон ва "</div><div class='ctx'> "коргардононро дорад. Вазифаи чунин ҷамъият хеле васеъ аст, аз маърӯза оиди "</div><div class='ctx'> "хатогӣ то коркарди замимаҳои нав. Ҷамъият &lt;b&gt;мавқеъи асосиро&lt;/b&gt; дар ҷаҳони "</div><div class='del'>-"Mandrakelinux ишғол мекунад."</div><div class='add'>+"Mandrivalinux ишғол мекунад."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16334,11 +16334,11 @@ msgstr "&lt;b&gt;Нусхаи Корандозӣ&lt;b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Дар айни замон шумо &lt;b&gt;Mandrakelinux Download&lt;/b&gt;-ро коргузорӣ карна "</div><div class='del'>-"истодаед. Ин нисхаи озоде, ки онро Mandrakesoft  &lt;b&gt;ба ҳама дастрас кардан&lt;/"</div><div class='add'>+"Дар айни замон шумо &lt;b&gt;Mandrivalinux Download&lt;/b&gt;-ро коргузорӣ карна "</div><div class='add'>+"истодаед. Ин нисхаи озоде, ки онро Mandriva  &lt;b&gt;ба ҳама дастрас кардан&lt;/"</div><div class='ctx'> "b&gt; мехоҳад."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -16372,10 +16372,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Шимо инчунин ба &lt;b&gt;хидматҳои ҳамроҳшуда&lt;/b&gt; ба дигар маҳсулотҳои "</div><div class='del'>-"Mandrakesoft дастрасӣ пайдо намекунед."</div><div class='add'>+"Mandriva дастрасӣ пайдо намекунед."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16384,9 +16384,9 @@ msgstr "&lt;b&gt;Discovery,Мизи Кории Якуми Linux-и Шумо&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Дар айни замон шумо &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;-ро коргузорӣ карда "</div><div class='add'>+"Дар айни замон шумо &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;-ро коргузорӣ карда "</div><div class='ctx'> "истодаед."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -16409,19 +16409,19 @@ msgstr "&lt;b&gt;PowerPack,Мизи Кории Ниҳоии Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Дар айни замон шумо &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;-ро коргузорӣ карна "</div><div class='add'>+"Дар айни замон шумо &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;-ро коргузорӣ карна "</div><div class='ctx'> "истодаед"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack ин маҳсулоти асосии &lt;b&gt;мизи кории Mandrakesoft&lt;b&gt; мебошад. Илова "</div><div class='add'>+"PowerPack ин маҳсулоти асосии &lt;b&gt;мизи кории Mandriva&lt;b&gt; мебошад. Илова "</div><div class='ctx'> "он ки вай тақсимоти Linux-и соддатарин ва бо корванд хеле иртиботи дӯстона "</div><div class='ctx'> "дорад, PowerPack боз ҳазорҳо &lt;b&gt;замимаҳоро&lt;b&gt; дар бар мегирад: аз ҳама "</div><div class='ctx'> "машҳуртарин сар карда то бисёртехникӣ."</div><div class='hunk'>@@ -16433,9 +16433,9 @@ msgstr "&lt;b&gt;PowerPack+, Ҳалнокии Linux барои Мизҳои Корӣ �</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Дар айни замон шумо &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;-ро коргузорӣ карна "</div><div class='add'>+"Дар айни замон шумо &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;-ро коргузорӣ карна "</div><div class='ctx'> "истодаед."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -16452,22 +16452,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Маҳсулотҳои Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Маҳсулотҳои Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; Шумораи зиёди маҳсулотҳои &lt;b&gt;Mandrakelinux&lt;/b&gt;-ро кор "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; Шумораи зиёди маҳсулотҳои &lt;b&gt;Mandrivalinux&lt;/b&gt;-ро кор "</div><div class='ctx'> "карда баромадааст."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Маҳсулотҳои Mandrakelinux инҳоянд:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Маҳсулотҳои Mandrivalinux инҳоянд:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16488,76 +16488,76 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux барои x86-64&lt;/b&gt;, Ҳалнокии Mandrakelinux барои беҳтар "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux барои x86-64&lt;/b&gt;, Ҳалнокии Mandrivalinux барои беҳтар "</div><div class='ctx'> "кардани пардозандаи 64-битаи шумо."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Маҳсулотҳои Mandrakesoft (Маҳсулотҳои Nomad)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Маҳсулотҳои Mandriva (Маҳсулотҳои Nomad)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft ду маҳсулотеро кор карда баромадааст, ки ба шумо имконияти  "</div><div class='del'>-"истифодабарии Mandrakelinux-ро дар &lt;b&gt;компютери дилхоҳ&lt;/b&gt; ва бе зарурати "</div><div class='add'>+"Mandriva ду маҳсулотеро кор карда баромадааст, ки ба шумо имконияти  "</div><div class='add'>+"истифодабарии Mandrivalinux-ро дар &lt;b&gt;компютери дилхоҳ&lt;/b&gt; ва бе зарурати "</div><div class='ctx'> "коргузории он медиҳад:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Ҳаракатдиҳӣ&lt;/b&gt;, тақсимоти Mandrakelinux, ки аз  CD-ROM-и боршаванда "</div><div class='add'>+"\t* &lt;b&gt;Ҳаракатдиҳӣ&lt;/b&gt;, тақсимоти Mandrivalinux, ки аз  CD-ROM-и боршаванда "</div><div class='ctx'> "иҷро мешавад."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, тақсимоти Mandrakelinux, ки пештар дар “LaCie "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, тақсимоти Mandrivalinux, ки пештар дар “LaCie "</div><div class='ctx'> "Mobile Hard Drive” коргузорӣ шудааст."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Маҳсулотҳои Mandrakesoft (Ҳалнокии Тахассусӣ)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Маҳсулотҳои Mandriva (Ҳалнокии Тахассусӣ)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Дар поён маҳсулоти Mandrakesoft оварда шудаанд, ки ба &lt;b&gt;талаботҳои "</div><div class='add'>+"Дар поён маҳсулоти Mandriva оварда шудаанд, ки ба &lt;b&gt;талаботҳои "</div><div class='ctx'> "мутахассисӣ&lt;/b&gt; ҷавобгӯянд:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Мизи Кории Корпаративӣ&lt;/b&gt;, Мизи Кории Mandrakelinux барои Соҳибкорон."</div><div class='add'>+"\t* &lt;b&gt;Мизи Кории Корпаративӣ&lt;/b&gt;, Мизи Кории Mandrivalinux барои Соҳибкорон."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Хидматрасони Корпаративӣ&lt;/b&gt;, Ҳалнокии Хидматрасони Mandrakelinux."</div><div class='add'>+"\t* &lt;b&gt;Хидматрасони Корпаративӣ&lt;/b&gt;, Ҳалнокии Хидматрасони Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Экрани Байнишабакавии Хурд&lt;/b&gt;, Ҳалнокии Бехатарии Mandrakelinux."</div><div class='add'>+"\t* &lt;b&gt;Экрани Байнишабакавии Хурд&lt;/b&gt;, Ҳалнокии Бехатарии Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16601,10 +16601,10 @@ msgstr "&lt;b&gt;Мудири графикии Мизи Кории худро инти</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Бо PowerPack, шумо &lt;b&gt;муҳити графикии мизи кориро&lt;/b&gt; интихоб карда "</div><div class='del'>-"метавонед. Mandrakesoft &lt;b&gt;KDE&lt;/b&gt;-ро бо нобаёнӣ интихоб кардааст."</div><div class='add'>+"метавонед. Mandriva &lt;b&gt;KDE&lt;/b&gt;-ро бо нобаёнӣ интихоб кардааст."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16629,10 +16629,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Бо PowerPack, шумо &lt;b&gt;муҳити графикии мизи кориро&lt;/b&gt; интихоб карда "</div><div class='del'>-"метавонед. Mandrakesoft &lt;b&gt;KDE&lt;/b&gt;-ро бо нобаёнӣ интихоб кардааст."</div><div class='add'>+"метавонед. Mandriva &lt;b&gt;KDE&lt;/b&gt;-ро бо нобаёнӣ интихоб кардааст."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16761,10 +16761,10 @@ msgstr "&lt;b&gt;Аз Шумораи Зиёди Замимаҳо Баҳра Баред</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Дар менюи Mandrakelinux шумо метавонед замимаҳои &lt;b&gt;дар истифода оддиро&lt;b&gt; "</div><div class='add'>+"Дар менюи Mandrivalinux шумо метавонед замимаҳои &lt;b&gt;дар истифода оддиро&lt;b&gt; "</div><div class='ctx'> "барои &lt;b&gt;ҳамаи супоришҳои худ ёбед&lt;b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -17039,17 +17039,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Маркази Идораи Mandrakelinux&lt;b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Маркази Идораи Mandrivalinux&lt;b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Маркази Идораи Mandrakelinux&lt;/b&gt; ин маҷмӯаи зарурии барномаҳои пушибонии "</div><div class='add'>+"&lt;b&gt;Маркази Идораи Mandrivalinux&lt;/b&gt; ин маҷмӯаи зарурии барномаҳои пушибонии "</div><div class='ctx'> "махсуси Mandrake барои содданомоии батанзимдарории компютери шумо мебошад."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -17075,16 +17075,16 @@ msgstr "&lt;b&gt;Модели Сарчашмаи Кушод&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ба монанди ҳамаи барномаҳои компютерӣ, таъминоти барномавии сарчашмаи кушод "</div><div class='ctx'> "&lt;b&gt;вақт ва одамонро&lt;/b&gt; барои коркард талаб мекунад. Барои ҳурмати фалсафаи "</div><div class='del'>-"сарчашмаи кушод Mandrakesoft шумораи маҳсулот ва хизматҳои иловашударо "</div><div class='del'>-"мефурӯшад барои &lt;b&gt;исботи фаъолияти Mandrakelinux&lt;/b&gt;. Агар хеҳед, ки "</div><div class='del'>-"&lt;b&gt;фалсафаи сарчашмаи кушодро&lt;/b&gt; ва рушди Mandrakelinux-ро дастгири кунед, "</div><div class='add'>+"сарчашмаи кушод Mandriva шумораи маҳсулот ва хизматҳои иловашударо "</div><div class='add'>+"мефурӯшад барои &lt;b&gt;исботи фаъолияти Mandrivalinux&lt;/b&gt;. Агар хеҳед, ки "</div><div class='add'>+"&lt;b&gt;фалсафаи сарчашмаи кушодро&lt;/b&gt; ва рушди Mandrivalinux-ро дастгири кунед, "</div><div class='ctx'> "&lt;b&gt;марҳамат карда&lt;/b&gt; яке аз маҳсулот ё хизматҳои моро харед!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -17095,10 +17095,10 @@ msgstr "&lt;b&gt;Мағозаи Шабакавӣ&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Барои гирифтани маълумоти бештар оиди маҳсулот ва хизматҳои Mandrakesoft "</div><div class='add'>+"Барои гирифтани маълумоти бештар оиди маҳсулот ва хизматҳои Mandriva "</div><div class='ctx'> "шумо ба &lt;b&gt;истгоҳи тиҷорати электронии&lt;/b&gt; мо ташриф оварда метавонед."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -17124,24 +17124,24 @@ msgstr "Имрӯз дар &lt;b&gt;store.mandrakesoft.com&lt;b&gt; ист кунед"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; ин &lt;b&gt;шарики беҳтарин&lt;/b&gt; ба маҳсулоти Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; ин &lt;b&gt;шарики беҳтарин&lt;/b&gt; ба маҳсулоти Mandrivalinux "</div><div class='ctx'> "мебошад.."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Бо воридшавӣ ба клуби Mandrakeclub аз &lt;b&gt;имтиёзҳои зиёд&lt;/b&gt;, маҳсулоту "</div><div class='add'>+"Бо воридшавӣ ба клуби Mandriva Club аз &lt;b&gt;имтиёзҳои зиёд&lt;/b&gt;, маҳсулоту "</div><div class='ctx'> "хизматҳо фоида кунед, ба монанди:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -17164,40 +17164,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Иштикор дар Mandrakelinux &lt;b&gt;форумҳои корванд&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Иштикор дар Mandrivalinux &lt;b&gt;форумҳои корванд&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Дастёбии барвақт ва бартариятнок&lt;/b&gt;, пеш аз барориши оммавӣ ба "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO симоҳо&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO симоҳо&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Mandrake Ғайрихудмухтор&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; хизмати нави ҷоизадоре, ки Mandrakesoft аз пешкаши он "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; хизмати нави ҷоизадоре, ки Mandriva аз пешкаши он "</div><div class='ctx'> "ба мизоҷон фахр мекунад!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline шумораи зиёди хизматҳои арзишнокро барои &lt;b&gt;навсозии осони&lt;/"</div><div class='del'>-"b&gt; системаи Mandrakelinux-и шумо пешкаш мекунад:"</div><div class='add'>+"Mandriva Online шумораи зиёди хизматҳои арзишнокро барои &lt;b&gt;навсозии осони&lt;/"</div><div class='add'>+"b&gt; системаи Mandrivalinux-и шумо пешкаш мекунад:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17223,39 +17223,39 @@ msgstr "\t* Навсозиҳои чандири &lt;b&gt;ҷадвалбандӣ&lt;/b&gt;."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='del'>-msgstr "\t* Мудирият бо &lt;b&gt;ҳамаи системаҳои Mandrakelinux&lt;/b&gt; бо як ҳисоб."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='add'>+msgstr "\t* Мудирият бо &lt;b&gt;ҳамаи системаҳои Mandrivalinux&lt;/b&gt; бо як ҳисоб."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ба шумо &lt;b&gt;кӯмак&lt;/b&gt; лозим аст? Бо кордонони техникии Mandrakesoft дар "</div><div class='add'>+"Ба шумо &lt;b&gt;кӯмак&lt;/b&gt; лозим аст? Бо кордонони техникии Mandriva дар "</div><div class='ctx'> "&lt;b&gt;истгоҳи пуштибонии техникии моён&lt;/b&gt; www.mandrakeexpert.com.во хӯред."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ба туфайли ёрии &lt;b&gt;кордонони мутахассиси Mandrakelinux&lt;/b&gt;, шумо бештари "</div><div class='add'>+"Ба туфайли ёрии &lt;b&gt;кордонони мутахассиси Mandrivalinux&lt;/b&gt;, шумо бештари "</div><div class='ctx'> "вақти худро захира мекунед."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Бо ҳама гуна суолҳои ба Mandrakelinux вобаста, шумо метавонед ҳолати "</div><div class='add'>+"Бо ҳама гуна суолҳои ба Mandrivalinux вобаста, шумо метавонед ҳолати "</div><div class='ctx'> "пуштибониро дар &lt;b&gt;store.mandrakesoft.com&lt;/b&gt; харед."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17555,8 +17555,8 @@ msgstr "Дидабонии асбобҳо, ҳисоботи ҷараёнҳо, tc</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Устодҳои Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Устодҳои Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17708,7 +17708,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17780,14 +17780,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[ИНТИХОБ]...\n"</div><div class='del'>-"  --no-confirmation      тасдиқоти якум дар усули MandrakeUpdate-ро "</div><div class='add'>+"  --no-confirmation      тасдиқоти якум дар усули Mandriva Update-ро "</div><div class='ctx'> "напурсед\n"</div><div class='ctx'> "  --no-verify-rpm        имзоҳои бастаҳоро наозмоед\n"</div><div class='ctx'> "  --changelog-first      феҳристи тағиротҳоро пеш аз рӯйхати файлҳо дар "</div><div class='hunk'>@@ -20594,13 +20594,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux Асбоби Сохтани Маърӯза оиди Хатогӣ"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux Асбоби Сохтани Маърӯза оиди Хатогӣ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Маркази Идораи Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Маркази Идораи Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20620,7 +20620,7 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='ctx'> msgstr "Mandrake Ғайрихудмухтор"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='hunk'>@@ -20665,7 +20665,7 @@ msgstr "Устоди Танзимдарорӣ"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -21092,20 +21092,20 @@ msgstr "Дар худборшав шурӯъ шудааст"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ин интерфейс то ҳол танзим нашудааст.\n"</div><div class='del'>-"Аз Маркази Идораи Mandrakelinux ёрдамчии \"Иловакунии интерфейс\"-ро ба кор "</div><div class='add'>+"Аз Маркази Идораи Mandrivalinux ёрдамчии \"Иловакунии интерфейс\"-ро ба кор "</div><div class='ctx'> "андозед"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Шумо ягон пайвастшавии Интернети танзимшударо надоред.\n"</div><div class='del'>-"\"%s\"-ро аз Маркази Идораи Mandrakelinux сар диҳед"</div><div class='add'>+"\"%s\"-ро аз Маркази Идораи Mandrivalinux сар диҳед"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -21155,8 +21155,8 @@ msgstr "KDM (KDE Мудири Намоиш)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux Мудири Намоиш)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux Мудири Намоиш)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21457,7 +21457,7 @@ msgstr "Воридот"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21466,7 +21466,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (нусхаи аслӣ)\n"</div><div class='hunk'>@@ -22029,14 +22029,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Ин таъминоти барномавии озод ва он метавонад мутобиқи шартҳои литсензияи GNU "</div><div class='ctx'> "GPL паҳн гардад.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -22066,8 +22066,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Маркази Идораи Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Маркази Идораи Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25618,8 +25618,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Шарҳдиҳандаҳои Асбобҳои Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Шарҳдиҳандаҳои Асбобҳои Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26137,7 +26137,7 @@ msgstr "Пайвастшавӣ ба итмом расид."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Пайвастшавӣ ба итмом расид.\n"</div><div class='ctx'> "Ба танзимдарориро дар Маркази Назорати Mandrake санҷед."</div><div class='hunk'>@@ -27020,8 +27020,8 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ msgstr "Шумо ягон ҳуруфро интихоб накардед"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Устодҳои Mandrakesoft"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Устодҳои Mandriva"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Баррас дастрас нест! Марҳамат карда онро коргузорӣ кунед"</div><div class='hunk'>@@ -27137,7 +27137,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click the button to reboot the machine, unplug it, remove write "</div><div class='ctx'> #~ "protection,\n"</div><div class='del'>-#~ "plug the key again, and launch Mandrake Move again."</div><div class='add'>+#~ "plug the key again, and launch Mandriva Move again."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Эҳтимолан дар калиди USB муҳофизат аз навиштан даргиронида\n"</div><div class='ctx'> #~ "шудааст, лекин ҳозир бехатар баровардани он нашуда истодааст.\n"</div><div class='hunk'>@@ -27145,7 +27145,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Ба тугма барои боркунии мошина ангушт занед, онро бароред,\n"</div><div class='ctx'> #~ "муҳофизат аз навиштанро хориҷ кунед, аз нав калидро ворид намоед ва бори "</div><div class='del'>-#~ "дигар Mandrake Move-ро сар диҳед."</div><div class='add'>+#~ "дигар Mandriva Move-ро сар диҳед."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Your USB key doesn't have any valid Windows (FAT) partitions.\n"</div><div class='hunk'>@@ -27156,7 +27156,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-#~ "able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+#~ "able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> #~ "Operating System."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Калиди USB-и шумо ягон бахши дурусти Windows (FAT)-ро надорад.\n"</div><div class='hunk'>@@ -27167,12 +27167,12 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Инчунин шумо метавонед бе калиди USB давом диҳед - дар ин ҳолат\n"</div><div class='del'>-#~ "шумо қодиред, ки Mandrake Move-ро ҳамчун live Mandrake\n"</div><div class='add'>+#~ "шумо қодиред, ки Mandriva Move-ро ҳамчун live Mandriva\n"</div><div class='ctx'> #~ "Operating System истифода баред."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "We didn't detect any USB key on your system. If you\n"</div><div class='del'>-#~ "plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+#~ "plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> #~ "to transparently save the data in your home directory and\n"</div><div class='ctx'> #~ "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> #~ "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -27180,11 +27180,11 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-#~ "able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+#~ "able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> #~ "Operating System."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Дар системаи шумо ягон калиди USB пайдо нагардид. Агар шумо\n"</div><div class='del'>-#~ "USB калидро ҳозир ворид кунед, Mandrake Move имконияти\n"</div><div class='add'>+#~ "USB калидро ҳозир ворид кунед, Mandriva Move имконияти\n"</div><div class='ctx'> #~ "восеҳи захиракунии додаҳоро дар феҳристи хонагии шумо,\n"</div><div class='ctx'> #~ "батанзимдарории васеъи система барои худборшавии оянда\n"</div><div class='ctx'> #~ "дар ин ё он компютер, медиҳад. Қайд: агар шумо калидро ҳозир\n"</div><div class='hunk'>@@ -27193,7 +27193,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Инчунин шумо метавонед бе калиди USB давом диҳед,\n"</div><div class='del'>-#~ "шумо ҳоло имконияти истифодаи Mandrake Move-ро\n"</div><div class='add'>+#~ "шумо ҳоло имконияти истифодаи Mandriva Move-ро\n"</div><div class='ctx'> #~ "ҳамчун Системаи Амалии Mandrake доред."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27445,11 +27445,11 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "chose the individual package or because it was part of a group of "</div><div class='ctx'> #~ "packages,\n"</div><div class='ctx'> #~ "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-#~ "installed. By default Mandrakelinux will automatically start any "</div><div class='add'>+#~ "installed. By default Mandrivalinux will automatically start any "</div><div class='ctx'> #~ "installed\n"</div><div class='ctx'> #~ "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> #~ "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-#~ "security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+#~ "security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> #~ "finalized. If you don't know what a particular service is supposed to do "</div><div class='ctx'> #~ "or\n"</div><div class='ctx'> #~ "why it's being installed, then click \"%s\". Clicking \"%s\" will "</div><div class='hunk'>@@ -27489,11 +27489,11 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "!! Агар бастаи хидматрасонро интихоб карда бошед, хоҳ барои интихоби "</div><div class='ctx'> #~ "муайяни бастаи алоҳида, хоҳ барои он ки вай як қисми гурӯҳӣ баста\n"</div><div class='ctx'> #~ "аст, шумо бояд тасдиқ кунед, ки дар ҳақиқат ин хидматрасонҳои\n"</div><div class='del'>-#~ "коргузоришавандаро истифода бурдан мехоҳед. Дар Mandrakelinux\n"</div><div class='add'>+#~ "коргузоришавандаро истифода бурдан мехоҳед. Дар Mandrivalinux\n"</div><div class='ctx'> #~ "ҳамаи хидматрасонҳои коргузоришуда ҳангоми оғозёбӣ ба таври худкор, бо "</div><div class='ctx'> #~ "нобаёнӣ сар дода мешаванд. Ҳарчанде, ки онҳо бехатаранд ва муаммоҳои\n"</div><div class='ctx'> #~ "маълумро ҳангоми даргиронидан дар тақсимот надоранд, мумкин аст, ки\n"</div><div class='del'>-#~ "дар бехатарӣ баъди барориши нусхаи хотимавии Mandrakelinux\n"</div><div class='add'>+#~ "дар бехатарӣ баъди барориши нусхаи хотимавии Mandrivalinux\n"</div><div class='ctx'> #~ "сӯрохиҳои муайян мешаванд. Агар шумо надонед, ки барои чӣ ин ё он\n"</div><div class='ctx'> #~ "хидматрасон лозим аст ё барои чӣ он коргузорӣ мегардад пас ба \"%s\"\n"</div><div class='ctx'> #~ "ангушт занед. Бо пахшкунии \"%s\" шумо хидматрасонҳои номбаршударо\n"</div><div class='hunk'>@@ -27557,14 +27557,14 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "!!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+#~ "You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> #~ "operating system on your hard drive. If your hard drive is empty or if "</div><div class='ctx'> #~ "an\n"</div><div class='ctx'> #~ "existing operating system is using all the available space you will have "</div><div class='ctx'> #~ "to\n"</div><div class='ctx'> #~ "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> #~ "logically divide it to create the space needed to install your new\n"</div><div class='del'>-#~ "Mandrakelinux system.\n"</div><div class='add'>+#~ "Mandrivalinux system.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> #~ "and can lead to data losses, partitioning can be intimidating and "</div><div class='hunk'>@@ -27600,7 +27600,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> #~ "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> #~ "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-#~ "recommended if you want to use both Mandrakelinux and Microsoft Windows "</div><div class='add'>+#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "</div><div class='ctx'> #~ "on\n"</div><div class='ctx'> #~ "the same computer.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -27611,7 +27611,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "to store your data or to install new software.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-#~ "your hard drive and replace them with your new Mandrakelinux system, "</div><div class='add'>+#~ "your hard drive and replace them with your new Mandrivalinux system, "</div><div class='ctx'> #~ "choose\n"</div><div class='ctx'> #~ "this option. Be careful, because you won't be able to undo this "</div><div class='ctx'> #~ "operation\n"</div><div class='hunk'>@@ -27638,12 +27638,12 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "Guide''."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Дар ин қадам шумо бояд дар куҷои гардонандаи сахт ҷойгир кардани\n"</div><div class='del'>-#~ "системаи омили Mandrakelinux-ро ҳал кунед. Агар гардонандаи сахти\n"</div><div class='add'>+#~ "системаи омили Mandrivalinux-ро ҳал кунед. Агар гардонандаи сахти\n"</div><div class='ctx'> #~ "шумо холӣ бошад ё системаи омили ҳозирбуда ҳамаи фазои имконпазирро\n"</div><div class='ctx'> #~ "ишғол кунад, ба шумо лозим меояд, ки гардонандаи сахти худро\n"</div><div class='ctx'> #~ "бахшбандӣ кунед. Бахшбандикунии гардонандаи сахт асосан аз тақсимоти "</div><div class='ctx'> #~ "мантиқии фазои ишғолшуда барои коргузории системаи омилии \n"</div><div class='del'>-#~ "Mandrakelinux иборат аст.\n"</div><div class='add'>+#~ "Mandrivalinux иборат аст.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Азбаски ҷараёни бахшбандии гардонандаи сахт одатан барнагарданда\n"</div><div class='ctx'> #~ "аст ва ба гумшавии додаҳо оварда расониданаш мумкин аст, агар дар "</div><div class='hunk'>@@ -27686,7 +27686,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": агар шумо хоҳед, ки ҳамаи додаҳоро дар ҳама қисматҳои\n"</div><div class='ctx'> #~ "дар гардонандаи сахти худ мавҷудбударо нобуд созед ва ҷои онҳоро бо "</div><div class='del'>-#~ "системаи нави Mandrakelinux иваз кунед, ин хосиятро интихоб\n"</div><div class='add'>+#~ "системаи нави Mandrivalinux иваз кунед, ин хосиятро интихоб\n"</div><div class='ctx'> #~ "кунед. Эҳтиёт бошед, зеро баъди тасдиқот шумо интихоби худро\n"</div><div class='ctx'> #~ "баргардонида наметавонед.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -27809,7 +27809,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-#~ "Mandrakelinux operating system installation.\n"</div><div class='add'>+#~ "Mandrivalinux operating system installation.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click on \"%s\" if you wish to select partitions which will be checked "</div><div class='ctx'> #~ "for\n"</div><div class='hunk'>@@ -27834,7 +27834,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "Агар шумо ба шаклбандии бахшҳо тайёр бошед ба \"%s\" ангушт занед.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Агар шумо хоҳед, ки дигар бахшҳоро барои коргузории системаи\n"</div><div class='del'>-#~ "омилии навъи Mandrakelinux интихоб кунед ба \"%s\" ангушт занед.\n"</div><div class='add'>+#~ "омилии навъи Mandrivalinux интихоб кунед ба \"%s\" ангушт занед.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Агар хоҳед бахшҳоеро, ки дар диск ба мавҷудияти қисмҳои бад\n"</div><div class='ctx'> #~ "тафтиш карда шаванд интихоб намоед, ба \"%s\" ангушт занед."</div><div class='hunk'>@@ -27850,7 +27850,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "If you don't know what to choose, keep the default option. You'll be "</div><div class='ctx'> #~ "able\n"</div><div class='del'>-#~ "to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+#~ "to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> #~ "Control Center.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Fill the \"%s\" field with the e-mail address of the person responsible "</div><div class='hunk'>@@ -27876,7 +27876,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "At this point, you need to choose which partition(s) will be used for "</div><div class='ctx'> #~ "the\n"</div><div class='del'>-#~ "installation of your Mandrakelinux system. If partitions have already "</div><div class='add'>+#~ "installation of your Mandrivalinux system. If partitions have already "</div><div class='ctx'> #~ "been\n"</div><div class='ctx'> #~ "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> #~ "partitioning tool, you can use existing partitions. Otherwise, hard "</div><div class='hunk'>@@ -27959,7 +27959,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "emergency boot situations."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Дар ин пункт шумо бояд интихоб намоед, ки кадом бахш(ҳо) барои\n"</div><div class='del'>-#~ "коргузории системавӣ Mandrakelinux-и шумо истифода бурда мешаванд.\n"</div><div class='add'>+#~ "коргузории системавӣ Mandrivalinux-и шумо истифода бурда мешаванд.\n"</div><div class='ctx'> #~ "Агар бахшҳои алоқаи аз коргузории пешинаи GNU/Linux ё аз дигар\n"</div><div class='ctx'> #~ "асбоби бахшбандикунӣ муайян шуда бошад, шумо метавонед бахшҳои мавҷударо "</div><div class='ctx'> #~ "истифода баред. Дар дигар ҳолат бояд бахшҳои гардонандаи\n"</div><div class='hunk'>@@ -28058,7 +28058,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "found on your machine.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-#~ "upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+#~ "upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> #~ "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -28068,21 +28068,21 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "the file system, you should use this option.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-#~ "currently installed on your Mandrakelinux system. Your current "</div><div class='add'>+#~ "currently installed on your Mandrivalinux system. Your current "</div><div class='ctx'> #~ "partitioning\n"</div><div class='ctx'> #~ "scheme and user data won't be altered. Most of the other configuration\n"</div><div class='ctx'> #~ "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> #~ "\n"</div><div class='del'>-#~ "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> #~ "running version \"8.1\" or later. Performing an upgrade on versions "</div><div class='ctx'> #~ "prior\n"</div><div class='del'>-#~ "to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+#~ "to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Ин қадам танҳо дар он ҳолате фаъол мегардад, ки дар мошинаи шумо\n"</div><div class='ctx'> #~ "бахши кӯҳнаи GNU/Linux пайдо гардад.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "DrakX бояд донад, ки оё шумо мехоҳед, ки коргузории навро гузаронед\n"</div><div class='del'>-#~ "ё системаи Mandrakelinux-и мавҷударо афзоиш диҳед:\n"</div><div class='add'>+#~ "ё системаи Mandrivalinux-и мавҷударо афзоиш диҳед:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": Дар бисёр ҳолатҳо ин вариант ба нобудшавии системаи кӯҳна\n"</div><div class='ctx'> #~ "оварда мерасонад. Агар хоҳед, ки бахшҳои гардонандаи сахти худро иваз\n"</div><div class='hunk'>@@ -28091,15 +28091,15 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "додаҳои мавҷудаи худро аз бознависӣ захира карда метавонанд.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": ин синфи коргузорӣ ба шумо имконияти авкунии бастаи\n"</div><div class='del'>-#~ "барномаҳои дар системаи Mandrakelinux-и коргузоришударо медиҳад.\n"</div><div class='add'>+#~ "барномаҳои дар системаи Mandrivalinux-и коргузоришударо медиҳад.\n"</div><div class='ctx'> #~ "Нақшаи бахшбандии ҷорӣ ва додаҳои корванд, ивазнашавандаанд.\n"</div><div class='ctx'> #~ "Бештари дигар қадамҳо низ дастрас мегарданд, ба монанди коргузории "</div><div class='ctx'> #~ "низоммеъёр.\n"</div><div class='ctx'> #~ "\n"</div><div class='del'>-#~ "Интихоби хосияти ``Густариш'' дар системаҳои Mandrakelinux аз нусхаи\n"</div><div class='add'>+#~ "Интихоби хосияти ``Густариш'' дар системаҳои Mandrivalinux аз нусхаи\n"</div><div class='ctx'> #~ "\"8.1\" сар карда то охирон хеле хуб хоҳад кор кард. Гузаронидани "</div><div class='ctx'> #~ "Густариш\n"</div><div class='del'>-#~ "дар системаҳои Mandrakelinux болотар аз \"8.1\" маслиҳат дода мешавад."</div><div class='add'>+#~ "дар системаҳои Mandrivalinux болотар аз \"8.1\" маслиҳат дода мешавад."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Depending on the language you chose (), DrakX will automatically select "</div><div class='hunk'>@@ -28280,7 +28280,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-#~ "operating systems may offer you one, but Mandrakelinux offers two. Each "</div><div class='add'>+#~ "operating systems may offer you one, but Mandrivalinux offers two. Each "</div><div class='ctx'> #~ "of\n"</div><div class='ctx'> #~ "the printing systems is best suited to particular types of "</div><div class='ctx'> #~ "configuration.\n"</div><div class='hunk'>@@ -28308,11 +28308,11 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "If you make a choice now, and later find that you don't like your "</div><div class='ctx'> #~ "printing\n"</div><div class='del'>-#~ "system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+#~ "system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> #~ "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Ҳоло вақте расидааст барои интихоби системаи чопкунӣ барои компютери\n"</div><div class='del'>-#~ "шумо. Дигар СО ба шумо як намудро пешкаш карда метавонад, Mandrakelinux\n"</div><div class='add'>+#~ "шумо. Дигар СО ба шумо як намудро пешкаш карда метавонад, Mandrivalinux\n"</div><div class='ctx'> #~ "бошад, ду намудро. Ҳар яке аз системаҳо барои батанзимдарории\n"</div><div class='ctx'> #~ "муайяни беҳтарин мебошад.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28409,7 +28409,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ " * \"%s\": if you wish to configure your Internet or local network "</div><div class='ctx'> #~ "access,\n"</div><div class='ctx'> #~ "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-#~ "Mandrakelinux Control Center after the installation has finished to "</div><div class='add'>+#~ "Mandrivalinux Control Center after the installation has finished to "</div><div class='ctx'> #~ "benefit\n"</div><div class='ctx'> #~ "from full in-line help.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28432,7 +28432,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ "this\n"</div><div class='ctx'> #~ "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> #~ "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-#~ "Mandrakelinux Control Center.\n"</div><div class='add'>+#~ "Mandrivalinux Control Center.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": through this entry you can fine tune which services will be "</div><div class='ctx'> #~ "run\n"</div><div class='hunk'>@@ -28782,10 +28782,10 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "You won't have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-#~ "Mandrakesoft products either."</div><div class='add'>+#~ "Mandriva products either."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Шимо инчунин ба &lt;b&gt;хидматҳои ҳамроҳшуда&lt;/b&gt; ба дигар маҳсулотҳои "</div><div class='del'>-#~ "Mandrakesoft дастрасӣ пайдо намекунед."</div><div class='add'>+#~ "Mandriva дастрасӣ пайдо намекунед."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "KDE will make your &lt;b&gt;first steps&lt;/b&gt; with Linux so &lt;b&gt;easy&lt;/b&gt; that you "</div><div class='hunk'>@@ -28818,14 +28818,14 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "[OPTION]...\n"</div><div class='ctx'> #~ "  --no-confirmation      don't ask first confirmation question in "</div><div class='del'>-#~ "MandrakeUpdate mode\n"</div><div class='add'>+#~ "Mandriva Update mode\n"</div><div class='ctx'> #~ "  --no-verify-rpm        don't verify packages signatures\n"</div><div class='ctx'> #~ "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> #~ "description window\n"</div><div class='ctx'> #~ "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "[ИНТИХОБ]...\n"</div><div class='del'>-#~ "  --no-confirmation      тасдиқоти якум дар усули MandrakeUpdate-ро "</div><div class='add'>+#~ "  --no-confirmation      тасдиқоти якум дар усули Mandriva Update-ро "</div><div class='ctx'> #~ "напурсед\n"</div><div class='ctx'> #~ "  --no-verify-rpm        имзоҳои бастаҳоро наозмоед\n"</div><div class='ctx'> #~ "  --changelog-first      феҳристи тағиротҳоро пеш аз рӯйхати файлҳо дар "</div><div class='hunk'>@@ -28872,10 +28872,10 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "You don't have any configured Internet connection.\n"</div><div class='del'>-#~ "Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+#~ "Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Шумо ягон пайвастшавии Интернети танзимшударо надоред.\n"</div><div class='del'>-#~ "\"Илованамоии Пайвастшавӣ\"-ро аз Маркази Идораи Mandrakelinux сар диҳед"</div><div class='add'>+#~ "\"Илованамоии Пайвастшавӣ\"-ро аз Маркази Идораи Mandrivalinux сар диҳед"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "DHCP Server Configuration.\n"</div><div class='head'>diff --git a/perl-install/share/po/th.po b/perl-install/share/po/th.po<br/>index 6fdb32da9..700feef63 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/th.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/th.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/th.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/th.po</a></div><div class='hunk'>@@ -59,7 +59,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -78,7 +78,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -86,7 +86,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -94,7 +94,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -220,7 +220,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1222,7 +1222,7 @@ msgstr "เลือกภาษาที่คุณใช้"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"</div><div class='hunk'>@@ -3499,7 +3499,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3609,7 +3609,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3620,11 +3620,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3731,10 +3731,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3843,7 +3843,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -3941,12 +3941,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -3973,7 +3973,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -3982,7 +3982,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4111,7 +4111,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4129,7 +4129,7 @@ msgstr "ก่อน"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4158,7 +4158,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4174,7 +4174,7 @@ msgstr "อ๊อปชั่นของเครื่องพิมพ์แ</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4260,7 +4260,7 @@ msgstr "สำหรับผู้ชำนาญ &gt; ปกติ"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4305,7 +4305,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4314,13 +4314,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4361,7 +4361,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4518,7 +4518,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4539,7 +4539,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4658,7 +4658,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4675,7 +4675,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4737,10 +4737,10 @@ msgstr "บริการ"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"เลือก harddisk ที่ต้องการลบและลง Mandrakelinux\n"</div><div class='add'>+"เลือก harddisk ที่ต้องการลบและลง Mandrivalinux\n"</div><div class='ctx'> "ควรระวังเป็นอย่างมากดพราะว่าข้อมูลทุกอย่างจะถูกลบ\n"</div><div class='ctx'> "และจะไม่สามารถกู้คืนได้"</div><div class='ctx'> </div><div class='hunk'>@@ -5068,7 +5068,7 @@ msgstr "ใช้พื้นที่ที่ว่างใน Windows partit</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr "Windows partition ของคุณกระจัดกระจายมากเกินไป กรุณา Defrag ก่อน"</div><div class='ctx'> </div><div class='hunk'>@@ -5180,19 +5180,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5214,7 +5214,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5222,14 +5222,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5239,7 +5239,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5259,10 +5259,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5273,11 +5273,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5293,7 +5293,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5303,14 +5303,14 @@ msgstr ""</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5332,7 +5332,7 @@ msgstr ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5340,14 +5340,14 @@ msgstr ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5357,7 +5357,7 @@ msgstr ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5377,10 +5377,10 @@ msgstr ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5391,11 +5391,11 @@ msgstr ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5411,7 +5411,7 @@ msgstr ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5467,7 +5467,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5475,7 +5475,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "ขอแสดงความยินดี การติดตั้งเสร็จเรียบร้อย\n"</div><div class='ctx'> "ให้เอาสื่อที่ใช้บูตออกจากไดรว์ (แผ่นฟล้อปปี้หรือซีดี) กดปุ่ม reboot เพื่อรีบูต\n"</div><div class='hunk'>@@ -5524,12 +5524,12 @@ msgstr "เข้าสู่ขั้นตอน `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "เครื่องของคุณมีทรัพยากรค่อนข้างต่ำคุณอาจมีปัญหาติดตั้ง \n"</div><div class='del'>-"Mandrakelinux  ถ้าเป็นเช่นนั้น กรุณาทดลองติดตั้งแบบ text \n"</div><div class='add'>+"Mandrivalinux  ถ้าเป็นเช่นนั้น กรุณาทดลองติดตั้งแบบ text \n"</div><div class='ctx'> "กรุณากด F1 ขณะ boot จาก cdrom แล้วพิมพ์ text"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_gtk.pm:228 install_steps_interactive.pm:624</div><div class='hunk'>@@ -6040,7 +6040,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6254,7 +6254,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr "การติดตั้งลีนุกซ์-แมนเดรก %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -8825,7 +8825,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12442,7 +12442,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14144,18 +14144,18 @@ msgstr "หยุด"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "แบบผู้เชี่ยวชาญ (Expert)"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14164,7 +14164,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14181,9 +14181,9 @@ msgstr "ทดสอบการคอนฟิก"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14203,7 +14203,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14229,10 +14229,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14251,8 +14251,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14279,7 +14279,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14289,7 +14289,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14308,13 +14308,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14326,7 +14326,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14340,19 +14340,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='ctx'> msgstr "Control Center"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14373,61 +14373,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14465,7 +14465,7 @@ msgstr "Graphical Desktops อื่นๆ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14486,7 +14486,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14603,7 +14603,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14838,14 +14838,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "Control Center"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14867,9 +14867,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14881,7 +14881,7 @@ msgstr "Control Center"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14904,20 +14904,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> msgstr "Control Center"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -14936,33 +14936,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> msgstr "Control Center"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -14985,32 +14985,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> msgstr "Control Center"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15301,7 +15301,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='ctx'> msgstr "Control Center"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='hunk'>@@ -15397,7 +15397,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15445,7 +15445,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17895,13 +17895,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux ฐานควบคุม"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux ฐานควบคุม"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17921,8 +17921,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17966,7 +17966,7 @@ msgstr "Network Configuration Wizard"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18372,14 +18372,14 @@ msgstr "เริ่มทำงานตอน boot"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='hunk'>@@ -18430,7 +18430,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18722,7 +18722,7 @@ msgstr "นำเข้า"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19192,7 +19192,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -19219,8 +19219,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux ฐานควบคุม"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux ฐานควบคุม"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -22198,7 +22198,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Control Center"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -22702,7 +22702,7 @@ msgstr "ชนิดการเชื่อมต่อ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='hunk'>@@ -23536,7 +23536,7 @@ msgstr "การติดตั้งไม่สำเร็จ"</div><div class='ctx'> #~ msgstr "ลบคิว"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='ctx'> #~ msgstr "Control Center"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='head'>diff --git a/perl-install/share/po/tl.po b/perl-install/share/po/tl.po<br/>index 034f06954..f4a36a05d 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/tl.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/tl.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/tl.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/tl.po</a></div><div class='hunk'>@@ -62,7 +62,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ang USB key ay tila may proteksiyon laban sa pagsulat, pero hindi\n"</div><div class='ctx'> "natin ligtas na mahuhugot ito ngayon.\n"</div><div class='hunk'>@@ -70,7 +70,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "I-click ang button para i-reboot ang makina, hugutin ang USB key, alisin\n"</div><div class='ctx'> "ang proteksiyon nito laban sa pagsulat, ipasak muli ang key, at i-launch\n"</div><div class='del'>-"ulit ang Mandrake Move."</div><div class='add'>+"ulit ang Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -88,7 +88,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ang inyong USB key ay walang balidong partisyon ng Windows (FAT).\n"</div><div class='hunk'>@@ -99,14 +99,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Maaari rin kayong magpatuloy na walang USB key - magagamit ninyo\n"</div><div class='del'>-"pa rin ang Mandrake Move bilang isang normal na \"live\" Mandrake\n"</div><div class='add'>+"pa rin ang Mandriva Move bilang isang normal na \"live\" Mandrake\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -114,20 +114,20 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Wala kaming natiktikang USB key sa inyong sistema. Kapag\n"</div><div class='ctx'> "kayo ay magpapasak ng USB key ngayon, magkakaroon ng\n"</div><div class='del'>-"kakayahan ang Mandrake Move na i-save ang inyong data sa\n"</div><div class='add'>+"kakayahan ang Mandriva Move na i-save ang inyong data sa\n"</div><div class='ctx'> "\"home directory\" at mga configuration ng inyong sistema, para\n"</div><div class='del'>-"sa susunod na pag-boot ng Mandrake Move. Tandaan: Kapag\n"</div><div class='add'>+"sa susunod na pag-boot ng Mandriva Move. Tandaan: Kapag\n"</div><div class='ctx'> "magpapasak kayo ng USB key ngayon, maghintay po lamang\n"</div><div class='ctx'> "ng ilang sandali bago tiktikan muli.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Maaari rin kayong magpatuloy na walang USB key - magagamit \n"</div><div class='del'>-"ninyo pa rin ang Mandrake Move bilang isang normal na \"live\"\n"</div><div class='add'>+"ninyo pa rin ang Mandriva Move bilang isang normal na \"live\"\n"</div><div class='ctx'> "Mandrake Operating System."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -255,7 +255,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -271,7 +271,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Ito ay marahil dahil \"corrupted\" ang mga \"configuration file\"\n"</div><div class='ctx'> "ng sistema na nasa USB key. Maaayos ito sa pamamagitan\n"</div><div class='del'>-"ng pagtanggal ng mga ito at pag-reboot ng Mandrake Move.\n"</div><div class='add'>+"ng pagtanggal ng mga ito at pag-reboot ng Mandriva Move.\n"</div><div class='ctx'> "Para gawin ito i-click ang angkop na button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1310,11 +1310,11 @@ msgstr "Mano-manong pili"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Kaya ng Mandrakelinux na sumuporta sa maraming wika. Piliin\n"</div><div class='add'>+"Kaya ng Mandrivalinux na sumuporta sa maraming wika. Piliin\n"</div><div class='ctx'> "ang mga wika na nais ninyong i-install. Sila ay mapapakinabangan\n"</div><div class='ctx'> "kung natapos na ang inyong installation at ni-restart ang inyong sistema."</div><div class='ctx'> </div><div class='hunk'>@@ -3744,12 +3744,12 @@ msgstr "Paganahin ang suporta sa radyo"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bago magpatuloy, kailangang basahin ninyong mabuti ang mga nasasaad sa\n"</div><div class='del'>-"lisensiya. Tinutukoy nito ang kabuoang distribusyon ng Mandrakelinux. Kung\n"</div><div class='add'>+"lisensiya. Tinutukoy nito ang kabuoang distribusyon ng Mandrivalinux. Kung\n"</div><div class='ctx'> "kayo ay sumasang-ayon sa lahat ng nasasaad, i-check ang \"%s\" na box.\n"</div><div class='ctx'> "Kung hindi, i-click ang \"%s\" na button para i-reboot ang inyong computer."</div><div class='ctx'> </div><div class='hunk'>@@ -3953,13 +3953,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ang installation ng Mandrakelinux ay nakahati sa ilang mga CD-ROM.\n"</div><div class='add'>+"Ang installation ng Mandrivalinux ay nakahati sa ilang mga CD-ROM.\n"</div><div class='ctx'> "Kung ang napiling package ay nakalagay sa ibang CD-ROM, iluluwa ng DrakX\n"</div><div class='ctx'> "ang kasalukuyang CD at ipapasuksok sa inyo ang tamang CD."</div><div class='ctx'> </div><div class='hunk'>@@ -3967,11 +3967,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4024,11 +4024,11 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Panahon na para piliin kung aling mga program ang nais ninyong i-install sa\n"</div><div class='ctx'> "inyong sistema. Mayroong libo-libong mga package na available para sa\n"</div><div class='del'>-"Mandrakelinux, at upang mas madali itong pangasiwaan, ang mga package\n"</div><div class='add'>+"Mandrivalinux, at upang mas madali itong pangasiwaan, ang mga package\n"</div><div class='ctx'> "ay inayos sa mga pangkat ng magkakatulad na mga application.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ang mga package ay inayos sa mga pangkat na batay sa paggamit ng\n"</div><div class='del'>-"inyong makina. Inaayos ng Mandrakelinux ang mga pangkat ng mga\n"</div><div class='add'>+"inyong makina. Inaayos ng Mandrivalinux ang mga pangkat ng mga\n"</div><div class='ctx'> "package sa apat na kategoriya. Maaari ninyong paghaluhaluin at\n"</div><div class='ctx'> "pagbagaybagayin ang mga application mula sa sari-saring kategoriya,\n"</div><div class='ctx'> "para ang installation na ``Workstation'' ay maaari pa ring maka-install\n"</div><div class='hunk'>@@ -4137,10 +4137,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4173,11 +4173,11 @@ msgstr ""</div><div class='ctx'> "!! Kung ang isang package ng server ay napili, dahil kayo ay pumili ng\n"</div><div class='ctx'> "bukod na package o kaya iyon ay bahagi ng isang pangkat ng mga package,\n"</div><div class='ctx'> "kayo ay tatanungin kung gusto ninyo talagang i-install ang mga server na\n"</div><div class='del'>-"iyon. Bilang default, sisimulan kaagad ng Mandrakelinux pag-boot ang kahit\n"</div><div class='add'>+"iyon. Bilang default, sisimulan kaagad ng Mandrivalinux pag-boot ang kahit\n"</div><div class='ctx'> "anong na-install na mga service. Kahit na sila ay ligtas at walang kilalang "</div><div class='ctx'> "mga\n"</div><div class='ctx'> "issue nang mailabas ang distribusyon, maaring matuklasan na may butas sa\n"</div><div class='del'>-"seguridad pagkatapos matapos ang version ng Mandrakelinux na ito. Kung\n"</div><div class='add'>+"seguridad pagkatapos matapos ang version ng Mandrivalinux na ito. Kung\n"</div><div class='ctx'> "hindi ninyo nalalaman ang ginagawa ng isang service o bakit ito ini-"</div><div class='ctx'> "install,\n"</div><div class='ctx'> "i-click ang \"%s\". Ang pagki-click sa \"%s\" ay mag-i-install ng mga "</div><div class='hunk'>@@ -4346,7 +4346,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4402,7 +4402,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (para sa \"X Window System\") ay ang puso ng \"graphical interface\"\n"</div><div class='ctx'> "ng GNU/Linux na kung saan lahat ng mga \"graphical environment\" (KDE,\n"</div><div class='del'>-"GNOME, AfterStep, WindowMaker, atbp.) na kasama sa Mandrakelinux ay\n"</div><div class='add'>+"GNOME, AfterStep, WindowMaker, atbp.) na kasama sa Mandrivalinux ay\n"</div><div class='ctx'> "nakaasa.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ihaharap sa inyo ang isang talaan ng iba-ibang mga parameter na babaguhin\n"</div><div class='hunk'>@@ -4529,12 +4529,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4561,7 +4561,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4570,7 +4570,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4591,13 +4591,13 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sa puntong ito, kailangan ninyong magpasya kung saan ninyo nais i-install\n"</div><div class='del'>-"ang Mandrakelinux na \"operating system\" (OS) sa inyong \"hard drive\".\n"</div><div class='add'>+"ang Mandrivalinux na \"operating system\" (OS) sa inyong \"hard drive\".\n"</div><div class='ctx'> "Kung ang inyong \"hard drive\" ay walang laman o kung may namamalaging\n"</div><div class='ctx'> "\"operating system\" na gumagamit sa lahat ng available na puwang,\n"</div><div class='ctx'> "kakailanganin ninyong ipartisyon ang drive. Ang pagpapartisyon ng isang\n"</div><div class='ctx'> "\"hard drive\" ay ginagawa sa pamamagitan ng paghahati-hati nito sa\n"</div><div class='ctx'> "kaisipan (\"logical\") upang makagawa ng puwang na kinakailangan para\n"</div><div class='del'>-"ma-install ang inyong bagong sistema ng Mandrakelinux.\n"</div><div class='add'>+"ma-install ang inyong bagong sistema ng Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Dahil kadalasan na hindi na mababawi ang paraan ng pagpapartisyon ng\n"</div><div class='ctx'> "hard drive at maaaring magdulot ng pagkawala ng data  kung mayroon\n"</div><div class='hunk'>@@ -4633,7 +4633,7 @@ msgstr ""</div><div class='ctx'> "walang mawawalang data, kung dati na ninyong na-defragment ang partisyon\n"</div><div class='ctx'> "ng Windows. Matinding itinatagubilin na i-backup ang inyong data. Ang\n"</div><div class='ctx'> "paggamit sa option na ito ay ipinapayo kung nais ninyong gamitin pareho ang\n"</div><div class='del'>-"Mandrakelinux at Microsoft Windows sa iisang computer.\n"</div><div class='add'>+"Mandrivalinux at Microsoft Windows sa iisang computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Bago piliin ang option na ito, pakiunawa na pagkatapos ng paraang ito,\n"</div><div class='ctx'> "ang laki ng partisyon ng inyong Microsoft Windows ay magiging mas\n"</div><div class='hunk'>@@ -4643,7 +4643,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": kung gusto ninyong tanggalin lahat ng data at mga partisyon\n"</div><div class='ctx'> "na mayroon sa inyong hard drive at palitan sila ng inyong bagong sistema\n"</div><div class='del'>-"ng Mandrakelinux, piliin ang option na ito. Maging maingat, dahil hindi na\n"</div><div class='add'>+"ng Mandrivalinux, piliin ang option na ito. Maging maingat, dahil hindi na\n"</div><div class='ctx'> "ninyo maaaring bawiin ang inyong pili matapos ninyong patotohanan ito.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! kung pipiliin ninyo ang option na ito, lahat ng data sa inyong disk "</div><div class='hunk'>@@ -4809,7 +4809,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4835,7 +4835,7 @@ msgstr ""</div><div class='ctx'> "I-click ang \"%s\" kung handa na kayong i-format ang mga partisyon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "I-click ang \"%s\" kung gusto ninyong pumili ng ibang partisyon para sa\n"</div><div class='del'>-"inyong pag-i-install ng bagong Mandrakelinux na \"operating system\".\n"</div><div class='add'>+"inyong pag-i-install ng bagong Mandrivalinux na \"operating system\".\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "I-click ang \"%s\" kung nais ninyong piliin ang mga partisyon na susuriin\n"</div><div class='ctx'> "para sa mga \"bad blocks\" (mga sirang bloke) sa disk."</div><div class='hunk'>@@ -4852,7 +4852,7 @@ msgstr "Nakaraan"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4864,7 +4864,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Pagdating ng panahon na kayo ay nag-i-install ng Mandrakelinux, mas\n"</div><div class='add'>+"Pagdating ng panahon na kayo ay nag-i-install ng Mandrivalinux, mas\n"</div><div class='ctx'> "malamang na ilang mga package ay nabago na simula nang naunang\n"</div><div class='ctx'> "paglabas. Maaaring inayos ang mga sira (\"bug\"), naresolba ang mga tanong\n"</div><div class='ctx'> "sa sequridad. Para pakinabangan ang mga update (pagbabago) na ito ,\n"</div><div class='hunk'>@@ -4895,7 +4895,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4924,7 +4924,7 @@ msgstr "Tagapamala ng Seguridad"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4995,7 +4995,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Sa puntong ito, kailangan ninyong piliin kung aling mga partisyon ang\n"</div><div class='del'>-"gagamitin para sa pag-i-install ng sistema na Mandrakelinux. Kung ang\n"</div><div class='add'>+"gagamitin para sa pag-i-install ng sistema na Mandrivalinux. Kung ang\n"</div><div class='ctx'> "mga partisyon ay nai-define na, mula sa dating pag-i-install ng GNU/Linux\n"</div><div class='ctx'> "o ng ibang kasangkapang pangpartisyon, maaari ninyong gamiting ang\n"</div><div class='ctx'> "mga mayroon nang partisyon. Kung hindi, dapat mag-define ng mga\n"</div><div class='hunk'>@@ -5094,7 +5094,7 @@ msgstr "Lipat sa normal o bihasang mode"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5125,7 +5125,7 @@ msgstr ""</div><div class='ctx'> "Mahigit sa isang partisyon ng Microsoft ang natiktikan sa inyong hard "</div><div class='ctx'> "drive.\n"</div><div class='ctx'> "Pakipili kung alin ang gusto ninyong i-resize para ma-install ang inyong\n"</div><div class='del'>-"bagong \"operating sytem\" na Mandrakelinux.\n"</div><div class='add'>+"bagong \"operating sytem\" na Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Bawat partition ay nakalista ng ganito: \"Pangalan ng Linux\",\n"</div><div class='ctx'> "\"Pangalan ng Windows\", \"Capacity\".\n"</div><div class='hunk'>@@ -5180,7 +5180,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5189,19 +5189,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ang hakbang na ito pagaganahin lamang kung mayroong nakitang\n"</div><div class='ctx'> "partisyon ng GNU/Linux sa inyong makina.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Kailangang malaman ngayon ng DrakX kung gusto ninyong magsagawa\n"</div><div class='del'>-"ng bagong install o upgrade ng namamalaging Mandrakelinux na sistema:\n"</div><div class='add'>+"ng bagong install o upgrade ng namamalaging Mandrivalinux na sistema:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Para sa karamihang bahagi, ganap na binubura nito ang lumang\n"</div><div class='ctx'> "sistema. Kung nais ninyong baguhin kung paano ang pagpartisyon sa inyong\n"</div><div class='hunk'>@@ -5212,13 +5212,13 @@ msgstr ""</div><div class='ctx'> " * \"%s\": ang klase ng pag-i-install na ito ay pahihintulutan kayong i-"</div><div class='ctx'> "update\n"</div><div class='ctx'> "ang mga package na kasalukuyang naka-install sa inyong sistema ng\n"</div><div class='del'>-"Mandrakelinux. Ang inyong kasalukuyang pakana ng pagpapartisyon at\n"</div><div class='add'>+"Mandrivalinux. Ang inyong kasalukuyang pakana ng pagpapartisyon at\n"</div><div class='ctx'> "data ng gumagamit ay hindi nabago. Karamihan ng ibang mga hakbang sa\n"</div><div class='ctx'> "pagko-configure ay mayroon pa rin, katulad ng standard na pag-i-install.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ang paggamit sa ``Upgrade'' na option ay gagana ng mabuti sa mga sistema\n"</div><div class='del'>-"ng Mandrakelinux na nagpapatakbo ng version \"8.1\" o pataas. Ang\n"</div><div class='del'>-"pagsasagawa ng upgrade sa mga version bago ng Mandrakelinux \"8.1\" ay\n"</div><div class='add'>+"ng Mandrivalinux na nagpapatakbo ng version \"8.1\" o pataas. Ang\n"</div><div class='add'>+"pagsasagawa ng upgrade sa mga version bago ng Mandrivalinux \"8.1\" ay\n"</div><div class='ctx'> "hindi ipinapayo."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -5279,7 +5279,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5321,7 +5321,7 @@ msgstr ""</div><div class='ctx'> "Tungkol sa suporta sa UTF-8 (unicode): Ang Unicode ay isang bagong\n"</div><div class='ctx'> "\"character encoding\" na nagnanais masakop ang lahat ng namamalaging\n"</div><div class='ctx'> "wika. Ang buong suporta dita ng GNU/Linux ay ginagawa pa rin. Sa dahilang\n"</div><div class='del'>-"ito, gagamitin ito o hindi ng Mandrakelinux depende sa mga pili ng mga\n"</div><div class='add'>+"ito, gagamitin ito o hindi ng Mandrivalinux depende sa mga pili ng mga\n"</div><div class='ctx'> "gumagamit:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Kung kayo ay pipili ng wika na may malakas na \"legacy encoding"</div><div class='hunk'>@@ -5585,7 +5585,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5606,12 +5606,12 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Panahon na upang pumili ng sistema ng pagpi-print para sa inyong computer.\n"</div><div class='ctx'> "Ang ibang mga \"operating system\" (OS) ay mag-aalok lamang ng isa, pero\n"</div><div class='del'>-"ang Mandrakelinux ay nag-aalok ng dalawa. Bawat isa sa dalawang sistema\n"</div><div class='add'>+"ang Mandrivalinux ay nag-aalok ng dalawa. Bawat isa sa dalawang sistema\n"</div><div class='ctx'> "ng pagpi-print na ito ay nababagay sa natatanging uri ng configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- na acronym para sa ``print, do not queue'', ang piliin kung "</div><div class='hunk'>@@ -5763,7 +5763,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5780,7 +5780,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5918,11 +5918,11 @@ msgstr "Mga serbisyo"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Piliin ang hard drive na inyong gustong burahin upang ma-install ang\n"</div><div class='del'>-"inyong bagong Mandrakelinux na partisyon. Mag-ingat, lahat ng data\n"</div><div class='add'>+"inyong bagong Mandrivalinux na partisyon. Mag-ingat, lahat ng data\n"</div><div class='ctx'> "sa drive na ito ay mawawala at hindi na ito mababawi!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -6275,12 +6275,12 @@ msgstr "Kino-compute ang laki ng partisyon ng Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ang inyong partisyon ng Windows ay sobrang fragmented. Paki-reboot ang "</div><div class='ctx'> "inyong computer sa Windows, patakbuhin ang ``defrag'', at simulan ulit ang "</div><div class='del'>-"pag-i-install ng Mandrakelinux."</div><div class='add'>+"pag-i-install ng Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6398,19 +6398,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6432,7 +6432,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6440,14 +6440,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6457,7 +6457,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6477,10 +6477,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6491,11 +6491,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6511,26 +6511,26 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Pagpapakilala\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ang \"operating system\" (OS) at ang mga iba't-ibang bahagi na available sa "</div><div class='del'>-"distribusyon ng Mandrakelinux\n"</div><div class='add'>+"distribusyon ng Mandrivalinux\n"</div><div class='ctx'> "ay tatawaging \"Software Products\" magmula ngayon. Ang mga Software "</div><div class='ctx'> "Products ay\n"</div><div class='ctx'> "nagsasama ng, pero hindi limitado dito, mga kumpol ng mga program, paraan, "</div><div class='ctx'> "pamamalakad\n"</div><div class='ctx'> "at dokumentasyon na may kaugnayan sa \"operating system\" at iba't-ibang mga "</div><div class='ctx'> "bahagi ng\n"</div><div class='del'>-"distribusyon ng Mandrakelinux.\n"</div><div class='add'>+"distribusyon ng Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Kasunduang Lisensiya\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Pakibasa ng mabuti ang dokumentong ito. Ang dokumentong ito ay kasunduan na "</div><div class='ctx'> "lisensiya\n"</div><div class='del'>-"sa pagitan ninyo at ng Mandrakesoft S.A. na sumasakod sa \"Software Products"</div><div class='add'>+"sa pagitan ninyo at ng Mandriva S.A. na sumasakod sa \"Software Products"</div><div class='ctx'> "\". Sa\n"</div><div class='ctx'> "pag-i-install, pagkokopya o paggagamit ng Software Products sa ano mang "</div><div class='ctx'> "paraan, kayo\n"</div><div class='hunk'>@@ -6557,7 +6557,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Ang mga Software Product at nakakabit na dokumentasyon ay binigay na \"as is"</div><div class='ctx'> "\", na walang warranty,\n"</div><div class='del'>-"hanggang sa pinahihintulutan ng batas. Ang Mandrakesoft S.A. ay, sa ano mang "</div><div class='add'>+"hanggang sa pinahihintulutan ng batas. Ang Mandriva S.A. ay, sa ano mang "</div><div class='ctx'> "pangyayari at hanggang\n"</div><div class='ctx'> "sa pinahihintulutan ng batas, walang pananagutan para sa mga natatangi, di-"</div><div class='ctx'> "sinasadya, anumang direkta\n"</div><div class='hunk'>@@ -6567,7 +6567,7 @@ msgstr ""</div><div class='ctx'> "bunga ng hatol ng\n"</div><div class='ctx'> "hukuman, o kahit ano pang ibang kakalabasang kawalan) na gawa ng paggamit ng "</div><div class='ctx'> "o hindi magamit ang\n"</div><div class='del'>-"Software Products, kahit na napayuhan ang Mandrakesoft S.A. ng ikapangyayari "</div><div class='add'>+"Software Products, kahit na napayuhan ang Mandriva S.A. ng ikapangyayari "</div><div class='ctx'> "o pangyayari ng gayong\n"</div><div class='ctx'> "mga kapinsalaan.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6575,7 +6575,7 @@ msgstr ""</div><div class='ctx'> "IPINAGBABAWAL NA\n"</div><div class='ctx'> "SOFTWARE SA MGA IBANG BANSA\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Hanggang sa pinahihintulutan ng batas, ang Mandrakesoft S.A. o ang mga "</div><div class='add'>+"Hanggang sa pinahihintulutan ng batas, ang Mandriva S.A. o ang mga "</div><div class='ctx'> "distributor nito ay, sa ano\n"</div><div class='ctx'> "mang pangyayari, walang pananagutan para sa mga natatangi, di-sinasadya, "</div><div class='ctx'> "anumang direkta\n"</div><div class='hunk'>@@ -6587,7 +6587,7 @@ msgstr ""</div><div class='ctx'> "at paggamit ng mga\n"</div><div class='ctx'> "software component o gawa ng  pagda-download ng mga software component mula "</div><div class='ctx'> "sa isa sa mga site ng\n"</div><div class='del'>-"Mandrakelinux  na ipinagbabawal ng batas sa mga ibang bansa ng mga local na "</div><div class='add'>+"Mandrivalinux  na ipinagbabawal ng batas sa mga ibang bansa ng mga local na "</div><div class='ctx'> "batas. Itong may\n"</div><div class='ctx'> "hanggahang pananagutan ay sumasakop, pero hindi lamang dito, sa mga strong "</div><div class='ctx'> "cryptography component\n"</div><div class='hunk'>@@ -6609,10 +6609,10 @@ msgstr ""</div><div class='ctx'> "lisensiya para sa bawat component bago gumamit ng kahit anong component. Ang "</div><div class='ctx'> "kahit anong tanong\n"</div><div class='ctx'> "sa lisensiya ng component ay dapat ipaabot sa autor ng component at hindi sa "</div><div class='del'>-"Mandrakesoft. Ang mga\n"</div><div class='del'>-"program na nilinang ng Mandrakesoft S.A. ay nasasaklaw ng GPL License. Ang "</div><div class='add'>+"Mandriva. Ang mga\n"</div><div class='add'>+"program na nilinang ng Mandriva S.A. ay nasasaklaw ng GPL License. Ang "</div><div class='ctx'> "dokumentasyon na sinulat\n"</div><div class='del'>-"ng Mandrakesoft S.A. ay nasasaklaw ng tiyak na lisensiya. Pakisangguni ang "</div><div class='add'>+"ng Mandriva S.A. ay nasasaklaw ng tiyak na lisensiya. Pakisangguni ang "</div><div class='ctx'> "dokumentasyon para sa\n"</div><div class='ctx'> "karagdagang detalye.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6624,12 +6624,12 @@ msgstr ""</div><div class='ctx'> "kani-kanilang mga\n"</div><div class='ctx'> "autor at protektado by mga batas ng intellectual property at copyright na "</div><div class='ctx'> "nagagamit sa mga software\n"</div><div class='del'>-"program. Inilalaan ng Mandrakesoft S.A. ang mga karapatan nito na baguhin o "</div><div class='add'>+"program. Inilalaan ng Mandriva S.A. ang mga karapatan nito na baguhin o "</div><div class='ctx'> "i-adapt ang mga Software\n"</div><div class='ctx'> "Products, sa kabuuan o bahagi, sa lahat ng paraan at para sa lahat ng "</div><div class='ctx'> "layunin.\n"</div><div class='del'>-"Ang \"Mandrake\", \"Mandrakelinux\" at mga kasamahang logo ay mga trademark "</div><div class='del'>-"ng Mandrakesoft S.A.  \n"</div><div class='add'>+"Ang \"Mandriva\", \"Mandrivalinux\" at mga kasamahang logo ay mga trademark "</div><div class='add'>+"ng Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. \"Governing Laws\" (Mga Sumasaklaw na Batas)\n"</div><div class='hunk'>@@ -6646,7 +6646,7 @@ msgstr ""</div><div class='ctx'> "huling gagawin, ang pagtatalo ay isasangguni sa mga naaangkop na mga Hukuman "</div><div class='ctx'> "ng Batas ng Paris - France.\n"</div><div class='ctx'> "Para sa kahit anong katanungan sa dokumentong ito, makipag-alam sa "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6740,7 +6740,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6748,14 +6748,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Maligayang bati, tapos na ang pag-i-install.\n"</div><div class='ctx'> "Tanggalin ang boot media at pindutin ang return para mag-boot ulit.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Para sa inpormasyon sa mga fixes na available para sa labas ng "</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "na ito, konsultahin ang Errata na available mula sa:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6800,12 +6800,12 @@ msgstr "Pumpasok sa hakbang na `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ang inyong sistema mababa sa kakayahan. Maaari kayong magkaproblema\n"</div><div class='del'>-"sa pag-install ng Mandrakelinux. Kung mangyari ito, maaari ninyong subukan\n"</div><div class='add'>+"sa pag-install ng Mandrivalinux. Kung mangyari ito, maaari ninyong subukan\n"</div><div class='ctx'> "ang \"text install\". Para dito, pindutin ang `F1' kapag nagbo-boot sa "</div><div class='ctx'> "CDROM,\n"</div><div class='ctx'> "at ipasok ang `text'."</div><div class='hunk'>@@ -7347,9 +7347,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Nakikipag-alam sa web site ng Mandrakelinux para makuha ang talaan ng mga "</div><div class='add'>+"Nakikipag-alam sa web site ng Mandrivalinux para makuha ang talaan ng mga "</div><div class='ctx'> "available na mirror..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7578,8 +7578,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Pag-install ng Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Pag-install ng Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -10170,14 +10170,14 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ito ay nagko-configure ng personal na firewall para sa makinang ito ng\n"</div><div class='del'>-"Mandrakelinux. Para sa mas makapangyarihan at dedicated na solusyon\n"</div><div class='add'>+"Mandrivalinux. Para sa mas makapangyarihan at dedicated na solusyon\n"</div><div class='ctx'> "ng firewall, pakitingnan ang pinatanging distribusyon na MandrakeSecurity\n"</div><div class='ctx'> "Firewall."</div><div class='ctx'> </div><div class='hunk'>@@ -14232,7 +14232,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16185,18 +16185,18 @@ msgstr "Hinto"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Ano ang Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Ano ang Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Maligayang pagdating sa &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Maligayang pagdating sa &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -16205,12 +16205,12 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ang Mandrakelinux ay isang Open Source na distribusyon na binubuo ng libo-"</div><div class='add'>+"Ang Mandrivalinux ay isang Open Source na distribusyon na binubuo ng libo-"</div><div class='ctx'> "libong mga piling-pili na application mula sa mundo ng Libreng Software "</div><div class='del'>-"(Free Software). Ang Mandrakelinux ay isa sa mga pinaka ginagamit na "</div><div class='add'>+"(Free Software). Ang Mandrivalinux ay isa sa mga pinaka ginagamit na "</div><div class='ctx'> "distribusyon ng Linux sa buong mundo!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -16226,15 +16226,15 @@ msgstr "Maligayang pagdating sa mundo ng Open Source!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ang Mandrakelinux ay committed sa Open Source na Model at buo ang paggalang "</div><div class='add'>+"Ang Mandrivalinux ay committed sa Open Source na Model at buo ang paggalang "</div><div class='ctx'> "sa General Public License. Itong bagong release ay bunga ng bayanihan ng mga "</div><div class='del'>-"pangkat ng developer ng Mandrakesoft at ng buong mundong komunidad ng mga "</div><div class='del'>-"taga-ambag sa Mandrakelinux."</div><div class='add'>+"pangkat ng developer ng Mandriva at ng buong mundong komunidad ng mga "</div><div class='add'>+"taga-ambag sa Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -16254,7 +16254,7 @@ msgstr "&lt;b&gt;Tandaan&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16275,15 +16275,15 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Join the Community&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Sumali na sa komunidad ng Mandrakelinux!&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Sumali na sa komunidad ng Mandrivalinux!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -16297,13 +16297,13 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Download Version&lt;/b&gt;"</div><div class='del'>-msgstr "Ito ang Mandrakelinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='add'>+msgstr "Ito ang Mandrivalinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -16330,7 +16330,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -16340,7 +16340,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -16363,17 +16363,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ang PowerPack ay ang premier na produktong Linux desktop ng Mandrakesoft. "</div><div class='add'>+"Ang PowerPack ay ang premier na produktong Linux desktop ng Mandriva. "</div><div class='ctx'> "Bukod sa pagiging pinakamadali at pinaka user-friendly na distribusyon ng "</div><div class='ctx'> "Linux, ang PowerPack ay nagsasama ng libo-libong mga application - lahat "</div><div class='ctx'> "mula sa pinakatanyag sa pinakateknikal."</div><div class='hunk'>@@ -16385,7 +16385,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -16403,20 +16403,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux Updates Applet"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux Updates Applet"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16436,61 +16436,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr "Alamin ang tungkol sa aming &lt;b&gt;Personal Solutions&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -16528,7 +16528,7 @@ msgstr "&lt;b&gt;Piliin ang inyong graphical na Desktop environment!&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -16549,7 +16549,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -16669,10 +16669,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Sa Mandrakelinux menu makakakita kayo ng mga madaling gamitin na application "</div><div class='add'>+"Sa Mandrivalinux menu makakakita kayo ng mga madaling gamitin na application "</div><div class='ctx'> "para sa lahat ng inyong gawain:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16923,17 +16923,17 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Ang Mandrakelinux Control Center ay kinakailangang koleksyon ng mga "</div><div class='add'>+"Ang Mandrivalinux Control Center ay kinakailangang koleksyon ng mga "</div><div class='ctx'> "kagamitang pang Mandrake lamang para maging simple ang pagco-configure ng "</div><div class='ctx'> "inyong computer."</div><div class='ctx'> </div><div class='hunk'>@@ -16960,9 +16960,9 @@ msgstr "&lt;b&gt;Ang Piling KDE&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16974,11 +16974,11 @@ msgstr "&lt;b&gt;MandrakeStore&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Hanapin ang lahat ng produkto at serbisyo ng Mandrakesoft sa "</div><div class='del'>-"&lt;b&gt;Mandrakestore&lt;/b&gt; -- ang aming buong serbisyong plataporma ng e-commerce."</div><div class='add'>+"Hanapin ang lahat ng produkto at serbisyo ng Mandriva sa "</div><div class='add'>+"&lt;b&gt;Mandriva Store&lt;/b&gt; -- ang aming buong serbisyong plataporma ng e-commerce."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16999,23 +16999,23 @@ msgstr "Dumaan kayo ngayon sa &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Makinabang sa mga mahahalagang bigay-pala, produkto at serbisyo sa "</div><div class='del'>-"pamamagitan ng pagsali sa Mandrakeclub, gaya ng:"</div><div class='add'>+"pamamagitan ng pagsali sa Mandriva Club, gaya ng:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -17023,7 +17023,7 @@ msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Special discounts&lt;/b&gt; on products and services of our online store "</div><div class='ctx'> "&lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* Espesyal na mga tawad para sa mga produkto at serbisyo sa Mandrakestore"</div><div class='add'>+"\t* Espesyal na mga tawad para sa mga produkto at serbisyo sa Mandriva Store"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:21</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17034,7 +17034,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* Makilahok sa \"online chat\" (usapan sa internet) gamit ang &lt;b&gt;Kopete&lt;/b&gt;"</div><div class='ctx'> </div><div class='hunk'>@@ -17042,26 +17042,26 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -17084,32 +17084,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -17410,8 +17410,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -17564,7 +17564,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17578,7 +17578,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[MGA_OPTION]...\n"</div><div class='del'>-"Taga-configure ng Mandrake Terminal Server\n"</div><div class='add'>+"Taga-configure ng Mandriva Terminal Server\n"</div><div class='ctx'> "--enable         : paganahin ang MTS\n"</div><div class='ctx'> "--disable        : i-disable ang MTS\n"</div><div class='ctx'> "--start          : paandarin ang MTS\n"</div><div class='hunk'>@@ -17636,14 +17636,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='del'>-"  --no-confirmation      huwag magtanong ng unang patotoo sa MandrakeUpdate "</div><div class='add'>+"  --no-confirmation      huwag magtanong ng unang patotoo sa Mandriva Update "</div><div class='ctx'> "na mode\n"</div><div class='ctx'> "  --no-verify-rpm        huwag i-verify ang mga signature ng mga package\n"</div><div class='ctx'> "  --changelog-first      ipakita ang changelog bago ang filelist sa window "</div><div class='hunk'>@@ -20441,13 +20441,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Mandrake Bug Report Tool"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Control Center"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20467,8 +20467,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20512,7 +20512,7 @@ msgstr "Mga Configuration Wizard"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -20939,7 +20939,7 @@ msgstr "Sinimulan sa boot"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ang interface na ito ay hindi pa na-configure.\n"</div><div class='ctx'> "Patakbuhin ang \"Magdagdag ng interface\" na assistant mula sa Mandrake "</div><div class='hunk'>@@ -20949,7 +20949,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ang interface na ito ay hindi pa na-configure.\n"</div><div class='ctx'> "Patakbuhin ang \"%s\" na assistant mula sa Mandrake Control Center"</div><div class='hunk'>@@ -21002,7 +21002,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -21301,7 +21301,7 @@ msgstr "Mag-import"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21310,7 +21310,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright (C) 2001-2002 ng Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 ng Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original na version)\n"</div><div class='hunk'>@@ -21860,14 +21860,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Ito ay libreng software at maaaring muling ipamahagi sa ilalim ng mga "</div><div class='ctx'> "nasasaad sa GNU GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21896,7 +21896,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Mandrake Control Center"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -25441,7 +25441,7 @@ msgstr "Tapos na ang pagbabago, pero para magkabisa dapat kayong mag-logout."</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Mandrake Tools Logs"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -25958,10 +25958,10 @@ msgstr "Kompleta na ang koneksyon."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Koneksyon ay nabigo.\n"</div><div class='del'>-"I-verify ang inyong configuration sa Mandrakelinux Control Center."</div><div class='add'>+"I-verify ang inyong configuration sa Mandrivalinux Control Center."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -26838,8 +26838,8 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ msgstr "Hindi kayo nakapili ng font"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Walang available na browser! Mag-install ng isa"</div><div class='hunk'>@@ -26974,13 +26974,13 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ msgstr "Error sa pagbubukas ng %s para sa pagsusulat: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Ito ay HardDrake, isang kagamitang gawa ng Mandrakelinux na pang-"</div><div class='add'>+#~ "Ito ay HardDrake, isang kagamitang gawa ng Mandrivalinux na pang-"</div><div class='ctx'> #~ "configure ng hardware.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Autor:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='hunk'>@@ -27407,18 +27407,18 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "Nabigong tanggalin ang printer na \"%s\" mula sa Star Office/OpenOffice."</div><div class='ctx'> #~ "org/GIMP."</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Congratulations for choosing Mandrakelinux!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Maligayang bati sa pagpili ng Mandrakelinux!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Congratulations for choosing Mandrivalinux!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Maligayang bati sa pagpili ng Mandrivalinux!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux operating system and its many applications is the "</div><div class='del'>-#~ "result of collaborative efforts between Mandrakesoft developers and "</div><div class='del'>-#~ "Mandrakelinux contributors throughout the world."</div><div class='add'>+#~ "Your new Mandrivalinux operating system and its many applications is the "</div><div class='add'>+#~ "result of collaborative efforts between Mandriva developers and "</div><div class='add'>+#~ "Mandrivalinux contributors throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Ang iyong bagong Mandrakelinux na operating system (OS) at marami nitong "</div><div class='add'>+#~ "Ang iyong bagong Mandrivalinux na operating system (OS) at marami nitong "</div><div class='ctx'> #~ "mga application ay bunga ng mala-bayanihang pagsisikap sa pagitan ng mga "</div><div class='del'>-#~ "developer ng Mandrakesoft at mga nag-aambag (mula sa iba't-ibang bahagi "</div><div class='del'>-#~ "ng mundo) sa Mandrakelinux."</div><div class='add'>+#~ "developer ng Mandriva at mga nag-aambag (mula sa iba't-ibang bahagi "</div><div class='add'>+#~ "ng mundo) sa Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "We would like to thank everyone who participated in the development of "</div><div class='hunk'>@@ -27524,27 +27524,27 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "Tingnan at i-edit ang mga image at photo gamit ang &lt;b&gt;GQview&lt;/b&gt; at "</div><div class='ctx'> #~ "&lt;b&gt;Ang Gimp!&lt;/b&gt;"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Become a &lt;b&gt;Mandrakeclub&lt;/b&gt; member!"</div><div class='del'>-#~ msgstr "Maging kasapi ng &lt;b&gt;Mandrakeclub&lt;/b&gt;!"</div><div class='add'>+#~ msgid "Become a &lt;b&gt;Mandriva Club&lt;/b&gt; member!"</div><div class='add'>+#~ msgstr "Maging kasapi ng &lt;b&gt;Mandriva Club&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Take advantage of valuable benefits, products and services by joining "</div><div class='del'>-#~ "Mandrakeclub, such as:"</div><div class='add'>+#~ "Mandriva Club, such as:"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Makinabang sa mga mahahalagang bigay-pala, produkto at serbisyo sa "</div><div class='del'>-#~ "pamamagitan ng pagsali sa Mandrakeclub, gaya ng:"</div><div class='add'>+#~ "pamamagitan ng pagsali sa Mandriva Club, gaya ng:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Full access to commercial applications"</div><div class='ctx'> #~ msgstr "\t* Buong access sa mga commercial na application"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"</div><div class='add'>+#~ "\t* Special download mirror list exclusively for Mandriva Club Members"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "\t* Espesyal na talaan ng mga download mirror para lamang sa mga Kasapi "</div><div class='del'>-#~ "ng Mandrakeclub"</div><div class='add'>+#~ "ng Mandriva Club"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Voting for software to put in Mandrakelinux"</div><div class='del'>-#~ msgstr "\t* Pagboto para sa mga software na ilalagay sa Mandrakelinux"</div><div class='add'>+#~ msgid "\t* Voting for software to put in Mandrivalinux"</div><div class='add'>+#~ msgstr "\t* Pagboto para sa mga software na ilalagay sa Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "\t* Plus much more"</div><div class='ctx'> #~ msgstr "\t* At higit na marami pa"</div><div class='hunk'>@@ -27556,12 +27556,12 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ msgid "Do you require assistance?"</div><div class='ctx'> #~ msgstr "Nangangailangan ba kayo ng tulong?"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt; is the primary source for technical support."</div><div class='add'>+#~ msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt; is the primary source for technical support."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "&lt;b&gt;Mandrakeexpert&lt;/b&gt; ay ang pangunahing pinagmulan ng tulong teknikal."</div><div class='add'>+#~ "&lt;b&gt;Mandriva Expert&lt;/b&gt; ay ang pangunahing pinagmulan ng tulong teknikal."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "If you have Linux questions, subscribe to Mandrakeexpert at &lt;b&gt;www."</div><div class='add'>+#~ "If you have Linux questions, subscribe to Mandriva Expert at &lt;b&gt;www."</div><div class='ctx'> #~ "mandrakeexpert.com&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Kung mayroon kayong tanong sa Linux, mag-subscribe sa &lt;b&gt;www."</div><div class='hunk'>@@ -27582,24 +27582,24 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "dumalaw sa &lt;b&gt;www.mandrake-linux.com&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "</div><div class='add'>+#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "</div><div class='ctx'> #~ "the latest versions of the most popular Open Source applications."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Ang Mandrakelinux ay naglalaman ng mga tanyag na graphical desktop na KDE "</div><div class='add'>+#~ "Ang Mandrivalinux ay naglalaman ng mga tanyag na graphical desktop na KDE "</div><div class='ctx'> #~ "at GNOME, at ang pinakahuling version ng pinakatanyag na mga Open Source "</div><div class='ctx'> #~ "application."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "</div><div class='add'>+#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "</div><div class='ctx'> #~ "to install and easy to use Linux distribution."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Ang Mandrakelinux ay kilalang-kilala bilang (1) pinaka \"user friendly"</div><div class='add'>+#~ "Ang Mandrivalinux ay kilalang-kilala bilang (1) pinaka \"user friendly"</div><div class='ctx'> #~ "\" (mabait sa gumagamit); (2) pinaka madaling i-install; at (3) pinaka "</div><div class='ctx'> #~ "madaling gamitin; na distribusyon ng Linux."</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='add'>+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with &lt;b&gt;Mandrakemove&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Alamin ang Mandrakelinux sa bootable na CD gamit ang &lt;b&gt;Mandrakemove&lt;/"</div><div class='add'>+#~ "\t* Alamin ang Mandrivalinux sa bootable na CD gamit ang &lt;b&gt;Mandrakemove&lt;/"</div><div class='ctx'> #~ "b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27650,12 +27650,12 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "&lt;b&gt;MandrakeClustering&lt;/b&gt;: the power and speed of a Linux cluster "</div><div class='ctx'> #~ "combined with the stability and easy-of-use of the world-famous "</div><div class='del'>-#~ "Mandrakelinux distribution. A unique blend for incomparable HPC "</div><div class='add'>+#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "</div><div class='ctx'> #~ "performance."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "&lt;b&gt;MandrakeClustering&lt;/b&gt;: ang kapangyarihan at bilis ng Linux cluster na "</div><div class='ctx'> #~ "sinamahan ng stability (kapanatagan) at ease-of-use (madaling gamitin) ng "</div><div class='del'>-#~ "tanyag sa mundo na distribusyon ng Mandrakelinux. Isang kakaibang halo "</div><div class='add'>+#~ "tanyag sa mundo na distribusyon ng Mandrivalinux. Isang kakaibang halo "</div><div class='ctx'> #~ "para sa walang katulad na HPC performance."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27667,14 +27667,14 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "mula standard hanggang professional support, mula 1 hanggang 50 mga "</div><div class='ctx'> #~ "incident, piliin ang isang makasisiya sa inyong mga pangangailangan!"</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Become a Mandrakeclub member!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Maging Kasapi ng Mandrakeclub!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Become a Mandriva Club member!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Maging Kasapi ng Mandriva Club!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Do you require assistance?&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Nangangailangan ba kayo ng tulong?&lt;/b&gt;"</div><div class='ctx'> </div><div class='del'>-#~ msgid "This is the Mandrakelinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='del'>-#~ msgstr "Ito ang Mandrakelinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='add'>+#~ msgid "This is the Mandrivalinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='add'>+#~ msgstr "Ito ang Mandrivalinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "The free download version does not include commercial software, and "</div><div class='hunk'>@@ -27686,14 +27686,14 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "at RTC) at video card (gaya ng ATI® at NVIDIA®)."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux distribution and its many applications are the "</div><div class='del'>-#~ "result of collaborative efforts between Mandrakesoft developers and "</div><div class='del'>-#~ "Mandrakelinux contributors throughout the world."</div><div class='add'>+#~ "Your new Mandrivalinux distribution and its many applications are the "</div><div class='add'>+#~ "result of collaborative efforts between Mandriva developers and "</div><div class='add'>+#~ "Mandrivalinux contributors throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Ang inyong bagong distribusyon ng Mandrakelinux at marami nitong mga "</div><div class='add'>+#~ "Ang inyong bagong distribusyon ng Mandrivalinux at marami nitong mga "</div><div class='ctx'> #~ "application ay bunga ng mala-bayanihang pagsisikap sa pagitan ng mga "</div><div class='del'>-#~ "developer ng Mandrakesoft at mga nag-aambag (mula sa iba't-ibang bahagi "</div><div class='del'>-#~ "ng mundo) sa Mandrakelinux."</div><div class='add'>+#~ "developer ng Mandriva at mga nag-aambag (mula sa iba't-ibang bahagi "</div><div class='add'>+#~ "ng mundo) sa Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;PowerPack+&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;PowerPack+&lt;/b&gt;"</div><div class='hunk'>@@ -27709,25 +27709,25 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "komprehensibong pagpili ng mga world-class server application."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "It is the only Mandrakelinux product that includes the groupware solution."</div><div class='add'>+#~ "It is the only Mandrivalinux product that includes the groupware solution."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Ito lang ang tanging produkto ng Mandrakelinux na isinasama ang groupware "</div><div class='add'>+#~ "Ito lang ang tanging produkto ng Mandrivalinux na isinasama ang groupware "</div><div class='ctx'> #~ "solution."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "When you log into your Mandrakelinux system for the first time, you can "</div><div class='add'>+#~ "When you log into your Mandrivalinux system for the first time, you can "</div><div class='ctx'> #~ "choose between several popular graphical desktops environments, "</div><div class='ctx'> #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Kung kayo ay magla-login sa Mandrakelinux na sistema sa kauna-unahang "</div><div class='add'>+#~ "Kung kayo ay magla-login sa Mandrivalinux na sistema sa kauna-unahang "</div><div class='ctx'> #~ "pagkakataon, maaari kayong pumili sa ilang mga tanyag na graphical "</div><div class='ctx'> #~ "desktop environment, gaya ng: KDE, GNOME, WindowMaker, IceWM, at iba pa."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "</div><div class='add'>+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "</div><div class='ctx'> #~ "of your tasks:"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Sa Mandrakelinux menu makakakita kayo ng mga madaling gamitin na "</div><div class='add'>+#~ "Sa Mandrivalinux menu makakakita kayo ng mga madaling gamitin na "</div><div class='ctx'> #~ "application para sa lahat ng inyong gawain:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -27774,13 +27774,13 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ msgstr "\t* Address Book (server at client)"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Your new Mandrakelinux distribution is the result of collaborative "</div><div class='del'>-#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "</div><div class='add'>+#~ "Your new Mandrivalinux distribution is the result of collaborative "</div><div class='add'>+#~ "efforts between Mandriva developers and Mandrivalinux contributors "</div><div class='ctx'> #~ "throughout the world."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Ang inyong bagong distribusyon ng Mandrakelinux ay bunga ng mala-"</div><div class='del'>-#~ "bayanihang pagsisikap sa pagitan ng mga developer ng Mandrakesoft at mga "</div><div class='del'>-#~ "nag-aambag (mula sa iba't-ibang bahagi ng mundo) sa Mandrakelinux."</div><div class='add'>+#~ "Ang inyong bagong distribusyon ng Mandrivalinux ay bunga ng mala-"</div><div class='add'>+#~ "bayanihang pagsisikap sa pagitan ng mga developer ng Mandriva at mga "</div><div class='add'>+#~ "nag-aambag (mula sa iba't-ibang bahagi ng mundo) sa Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "We would like to thank everyone who participated in the development of "</div><div class='hunk'>@@ -27850,13 +27850,13 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Before continuing, you should carefully read the terms of the license. "</div><div class='ctx'> #~ "It\n"</div><div class='del'>-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "</div><div class='add'>+#~ "covers the entire Mandrivalinux distribution. If you do agree with all "</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"</div><div class='ctx'> #~ "will reboot your computer."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Bago magpatuloy, kailangang basahin ninyong mabuti ang mga nasasaad sa\n"</div><div class='del'>-#~ "lisensiya. Tinutukoy nito ang kabuoang distribusyon ng Mandrakelinux. "</div><div class='add'>+#~ "lisensiya. Tinutukoy nito ang kabuoang distribusyon ng Mandrivalinux. "</div><div class='ctx'> #~ "Kung\n"</div><div class='ctx'> #~ "kayo ay sumasang-ayon sa lahat ng nasasaad, i-check ang \"%s\" na box.\n"</div><div class='ctx'> #~ "Kung hindi, i-click ang \"%s\" na button para i-reboot ang inyong "</div><div class='hunk'>@@ -27982,25 +27982,25 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "ang check sa \"%s\" na box."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+#~ "The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> #~ "selected package is located on another CD-ROM, DrakX will eject the "</div><div class='ctx'> #~ "current\n"</div><div class='ctx'> #~ "CD and ask you to insert the correct CD as required."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Ang installation ng Mandrakelinux ay nakahati sa ilang mga CD-ROM.\n"</div><div class='add'>+#~ "Ang installation ng Mandrivalinux ay nakahati sa ilang mga CD-ROM.\n"</div><div class='ctx'> #~ "Kung ang napiling package ay nakalagay sa ibang CD-ROM, iluluwa ng DrakX\n"</div><div class='ctx'> #~ "ang kasalukuyang CD at ipapasuksok sa inyo ang tamang CD."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "It is now time to specify which programs you wish to install on your\n"</div><div class='del'>-#~ "system. There are thousands of packages available for Mandrakelinux, and\n"</div><div class='add'>+#~ "system. There are thousands of packages available for Mandrivalinux, and\n"</div><div class='ctx'> #~ "to make it simpler to manage the packages have been placed into groups "</div><div class='ctx'> #~ "of\n"</div><div class='ctx'> #~ "similar applications.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Packages are sorted into groups corresponding to a particular use of "</div><div class='ctx'> #~ "your\n"</div><div class='del'>-#~ "machine. Mandrakelinux sorts packages groups in four categories. You can\n"</div><div class='add'>+#~ "machine. Mandrivalinux sorts packages groups in four categories. You can\n"</div><div class='ctx'> #~ "mix and match applications from the various categories, so a\n"</div><div class='ctx'> #~ "``Workstation'' installation can still have applications from the\n"</div><div class='ctx'> #~ "``Development'' category installed.\n"</div><div class='hunk'>@@ -28055,11 +28055,11 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "Panahon na para piliin kung aling mga program ang nais ninyong i-install "</div><div class='ctx'> #~ "sa\n"</div><div class='ctx'> #~ "inyong sistema. Mayroong libo-libong mga package na available para sa\n"</div><div class='del'>-#~ "Mandrakelinux, at upang mas madali itong pangasiwaan, ang mga package\n"</div><div class='add'>+#~ "Mandrivalinux, at upang mas madali itong pangasiwaan, ang mga package\n"</div><div class='ctx'> #~ "ay inayos sa mga pangkat ng magkakatulad na mga application.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Ang mga package ay inayos sa mga pangkat na batay sa paggamit ng\n"</div><div class='del'>-#~ "inyong makina. Inaayos ng Mandrakelinux ang mga pangkat ng mga\n"</div><div class='add'>+#~ "inyong makina. Inaayos ng Mandrivalinux ang mga pangkat ng mga\n"</div><div class='ctx'> #~ "package sa apat na kategoriya. Maaari ninyong paghaluhaluin at\n"</div><div class='ctx'> #~ "pagbagaybagayin ang mga application mula sa sari-saring kategoriya,\n"</div><div class='ctx'> #~ "para ang installation na ``Workstation'' ay maaari pa ring maka-install\n"</div><div class='hunk'>@@ -28135,11 +28135,11 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "chose the individual package or because it was part of a group of "</div><div class='ctx'> #~ "packages,\n"</div><div class='ctx'> #~ "you will be asked to confirm that you really want those servers to be\n"</div><div class='del'>-#~ "installed. By default Mandrakelinux will automatically start any "</div><div class='add'>+#~ "installed. By default Mandrivalinux will automatically start any "</div><div class='ctx'> #~ "installed\n"</div><div class='ctx'> #~ "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> #~ "the time the distribution was shipped, it is entirely possible that that\n"</div><div class='del'>-#~ "security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+#~ "security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> #~ "finalized. If you do not know what a particular service is supposed to "</div><div class='ctx'> #~ "do\n"</div><div class='ctx'> #~ "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"</div><div class='hunk'>@@ -28180,12 +28180,12 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "!! Kung ang isang package ng server ay napili, dahil kayo ay pumili ng\n"</div><div class='ctx'> #~ "bukod na package o kaya iyon ay bahagi ng isang pangkat ng mga package,\n"</div><div class='ctx'> #~ "kayo ay tatanungin kung gusto ninyo talagang i-install ang mga server na\n"</div><div class='del'>-#~ "iyon. Bilang default, sisimulan kaagad ng Mandrakelinux pag-boot ang "</div><div class='add'>+#~ "iyon. Bilang default, sisimulan kaagad ng Mandrivalinux pag-boot ang "</div><div class='ctx'> #~ "kahit\n"</div><div class='ctx'> #~ "anong na-install na mga service. Kahit na sila ay ligtas at walang "</div><div class='ctx'> #~ "kilalang mga\n"</div><div class='ctx'> #~ "issue nang mailabas ang distribusyon, maaring matuklasan na may butas sa\n"</div><div class='del'>-#~ "seguridad pagkatapos matapos ang version ng Mandrakelinux na ito. Kung\n"</div><div class='add'>+#~ "seguridad pagkatapos matapos ang version ng Mandrivalinux na ito. Kung\n"</div><div class='ctx'> #~ "hindi ninyo nalalaman ang ginagawa ng isang service o bakit ito ini-"</div><div class='ctx'> #~ "install,\n"</div><div class='ctx'> #~ "i-click ang \"%s\". Ang pagki-click sa \"%s\" ay mag-i-install ng mga "</div><div class='hunk'>@@ -28219,7 +28219,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "You will now set up your Internet/network connection. If you wish to\n"</div><div class='ctx'> #~ "connect your computer to the Internet or to a local network, click \"%s"</div><div class='ctx'> #~ "\".\n"</div><div class='del'>-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"</div><div class='add'>+#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"</div><div class='ctx'> #~ "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"</div><div class='ctx'> #~ "configure the network, or to do it later, in which case clicking the \"%s"</div><div class='ctx'> #~ "\"\n"</div><div class='hunk'>@@ -28240,7 +28240,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "modems\n"</div><div class='ctx'> #~ "that require additional software to work compared to Normal modems. Some "</div><div class='ctx'> #~ "of\n"</div><div class='del'>-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"</div><div class='add'>+#~ "those modems actually work under Mandrivalinux, some others do not. You\n"</div><div class='ctx'> #~ "can consult the list of supported modems at LinModems.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You can consult the ``Starter Guide'' chapter about Internet connections\n"</div><div class='hunk'>@@ -28250,7 +28250,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Ngayon ay ise-setup ninyo ang inyong koneksyon sa Internet/network.\n"</div><div class='ctx'> #~ "Kung nais ninyong i-connect ang inyong computer sa Internet o sa isang\n"</div><div class='del'>-#~ "\"local network\", i-click ang \"%s\". Susubukin ng Mandrakelinux na\n"</div><div class='add'>+#~ "\"local network\", i-click ang \"%s\". Susubukin ng Mandrivalinux na\n"</div><div class='ctx'> #~ "automatic na tiktikan ang mga network device at mga modem. Kung nabigo\n"</div><div class='ctx'> #~ "itong pagtitiktik, tanggalin ang check sa \"%s\" na box. Maaarin rin "</div><div class='ctx'> #~ "ninyong piliin\n"</div><div class='hunk'>@@ -28273,7 +28273,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "Tungkol sa Winmodem Connection. Ang mga Winmodem ay mga espesyal na\n"</div><div class='ctx'> #~ "\"integrated low-end modem\" na nangangailangan ng karagdagang software\n"</div><div class='ctx'> #~ "para gumana, kung ikukumpara sa mga Normal modem. Ilan sa mga gayong\n"</div><div class='del'>-#~ "modem ay talagang gagana sa ilalim ng Mandrakelinux, ilang iba pa ay "</div><div class='add'>+#~ "modem ay talagang gagana sa ilalim ng Mandrivalinux, ilang iba pa ay "</div><div class='ctx'> #~ "hindi.\n"</div><div class='ctx'> #~ "Maaari ninyong konsultahin ang listahan ng mga suportadong modem sa\n"</div><div class='ctx'> #~ "\"LinModems\".\n"</div><div class='hunk'>@@ -28414,7 +28414,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "X (for X Window System) is the heart of the GNU/Linux graphical "</div><div class='ctx'> #~ "interface\n"</div><div class='ctx'> #~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-#~ "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "You will be presented with a list of different parameters to change to "</div><div class='ctx'> #~ "get\n"</div><div class='hunk'>@@ -28477,7 +28477,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "X (para sa \"X Window System\") ay ang puso ng \"graphical interface\"\n"</div><div class='ctx'> #~ "ng GNU/Linux na kung saan lahat ng mga \"graphical environment\" (KDE,\n"</div><div class='del'>-#~ "GNOME, AfterStep, WindowMaker, atbp.) na kasama sa Mandrakelinux ay\n"</div><div class='add'>+#~ "GNOME, AfterStep, WindowMaker, atbp.) na kasama sa Mandrivalinux ay\n"</div><div class='ctx'> #~ "nakaasa.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Ihaharap sa inyo ang isang talaan ng iba-ibang mga parameter na "</div><div class='hunk'>@@ -28612,7 +28612,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "have to partition the drive. Basically, partitioning a hard drive "</div><div class='ctx'> #~ "consists\n"</div><div class='ctx'> #~ "of logically dividing it to create the space needed to install your new\n"</div><div class='del'>-#~ "Mandrakelinux system.\n"</div><div class='add'>+#~ "Mandrivalinux system.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> #~ "and can lead to lost data if there is an existing operating system "</div><div class='hunk'>@@ -28651,7 +28651,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> #~ "data, provided you have previously defragmented the Windows partition.\n"</div><div class='ctx'> #~ "Backing up your data is strongly recommended.. Using this option is\n"</div><div class='del'>-#~ "recommended if you want to use both Mandrakelinux and Microsoft Windows "</div><div class='add'>+#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "</div><div class='ctx'> #~ "on\n"</div><div class='ctx'> #~ "the same computer.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28661,7 +28661,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "Windows to store your data or to install new software.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": if you want to delete all data and all partitions present on\n"</div><div class='del'>-#~ "your hard drive and replace them with your new Mandrakelinux system,\n"</div><div class='add'>+#~ "your hard drive and replace them with your new Mandrivalinux system,\n"</div><div class='ctx'> #~ "choose this option. Be careful, because you will not be able to undo "</div><div class='ctx'> #~ "your\n"</div><div class='ctx'> #~ "choice after you confirm.\n"</div><div class='hunk'>@@ -28688,13 +28688,13 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Sa puntong ito, kailangan ninyong magpasya kung saan ninyo nais i-"</div><div class='ctx'> #~ "install\n"</div><div class='del'>-#~ "ang Mandrakelinux na \"operating system\" (OS) sa inyong \"hard drive\".\n"</div><div class='add'>+#~ "ang Mandrivalinux na \"operating system\" (OS) sa inyong \"hard drive\".\n"</div><div class='ctx'> #~ "Kung ang inyong \"hard drive\" ay walang laman o kung may namamalaging\n"</div><div class='ctx'> #~ "\"operating system\" na gumagamit sa lahat ng available na puwang,\n"</div><div class='ctx'> #~ "kakailanganin ninyong ipartisyon ang drive. Ang pagpapartisyon ng isang\n"</div><div class='ctx'> #~ "\"hard drive\" ay ginagawa sa pamamagitan ng paghahati-hati nito sa\n"</div><div class='ctx'> #~ "kaisipan (\"logical\") upang makagawa ng puwang na kinakailangan para\n"</div><div class='del'>-#~ "ma-install ang inyong bagong sistema ng Mandrakelinux.\n"</div><div class='add'>+#~ "ma-install ang inyong bagong sistema ng Mandrivalinux.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Dahil kadalasan na hindi na mababawi ang paraan ng pagpapartisyon ng\n"</div><div class='ctx'> #~ "hard drive at maaaring magdulot ng pagkawala ng data  kung mayroon\n"</div><div class='hunk'>@@ -28740,7 +28740,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "ng Windows. Matinding itinatagubilin na i-backup ang inyong data. Ang\n"</div><div class='ctx'> #~ "paggamit sa option na ito ay ipinapayo kung nais ninyong gamitin pareho "</div><div class='ctx'> #~ "ang\n"</div><div class='del'>-#~ "Mandrakelinux at Microsoft Windows sa iisang computer.\n"</div><div class='add'>+#~ "Mandrivalinux at Microsoft Windows sa iisang computer.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "   Bago piliin ang option na ito, pakiunawa na pagkatapos ng paraang "</div><div class='ctx'> #~ "ito,\n"</div><div class='hunk'>@@ -28751,7 +28751,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": kung gusto ninyong tanggalin lahat ng data at mga partisyon\n"</div><div class='ctx'> #~ "na mayroon sa inyong hard drive at palitan sila ng inyong bagong sistema\n"</div><div class='del'>-#~ "ng Mandrakelinux, piliin ang option na ito. Maging maingat, dahil hindi "</div><div class='add'>+#~ "ng Mandrivalinux, piliin ang option na ito. Maging maingat, dahil hindi "</div><div class='ctx'> #~ "na\n"</div><div class='ctx'> #~ "ninyo maaaring bawiin ang inyong pili matapos ninyong patotohanan ito.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -28876,7 +28876,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "Click on \"%s\" when you are ready to format the partitions.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-#~ "Mandrakelinux operating system installation.\n"</div><div class='add'>+#~ "Mandrivalinux operating system installation.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Click on \"%s\" if you wish to select partitions that will be checked "</div><div class='ctx'> #~ "for\n"</div><div class='hunk'>@@ -28905,14 +28905,14 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "I-click ang \"%s\" kung handa na kayong i-format ang mga partisyon.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "I-click ang \"%s\" kung gusto ninyong pumili ng ibang partisyon para sa\n"</div><div class='del'>-#~ "inyong pag-i-install ng bagong Mandrakelinux na \"operating system\".\n"</div><div class='add'>+#~ "inyong pag-i-install ng bagong Mandrivalinux na \"operating system\".\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "I-click ang \"%s\" kung nais ninyong piliin ang mga partisyon na "</div><div class='ctx'> #~ "susuriin\n"</div><div class='ctx'> #~ "para sa mga \"bad blocks\" (mga sirang bloke) sa disk."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "At the time you are installing Mandrakelinux, it is likely that some\n"</div><div class='add'>+#~ "At the time you are installing Mandrivalinux, it is likely that some\n"</div><div class='ctx'> #~ "packages will have been updated since the initial release. Bugs may have\n"</div><div class='ctx'> #~ "been fixed, security issues resolved. To allow you to benefit from these\n"</div><div class='ctx'> #~ "updates, you are now able to download them from the Internet. Check \"%s"</div><div class='hunk'>@@ -28927,7 +28927,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "selected package(s), or \"%s\" to abort."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Pagdating ng panahon na kayo ay nag-i-install ng Mandrakelinux, mas\n"</div><div class='add'>+#~ "Pagdating ng panahon na kayo ay nag-i-install ng Mandrivalinux, mas\n"</div><div class='ctx'> #~ "malamang na ilang mga package ay nabago na simula nang naunang\n"</div><div class='ctx'> #~ "paglabas. Maaaring inayos ang mga sira (\"bug\"), naresolba ang mga "</div><div class='ctx'> #~ "tanong\n"</div><div class='hunk'>@@ -28998,7 +28998,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "DrakX now needs to know if you want to perform a new install or an "</div><div class='ctx'> #~ "upgrade\n"</div><div class='del'>-#~ "of an existing Mandrakelinux system:\n"</div><div class='add'>+#~ "of an existing Mandrivalinux system:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": For the most part, this completely wipes out the old system. "</div><div class='ctx'> #~ "If\n"</div><div class='hunk'>@@ -29010,21 +29010,21 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "written.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": this installation class allows you to update the packages\n"</div><div class='del'>-#~ "currently installed on your Mandrakelinux system. Your current\n"</div><div class='add'>+#~ "currently installed on your Mandrivalinux system. Your current\n"</div><div class='ctx'> #~ "partitioning scheme and user data is not altered. Most of other\n"</div><div class='ctx'> #~ "configuration steps remain available, similar to a standard "</div><div class='ctx'> #~ "installation.\n"</div><div class='ctx'> #~ "\n"</div><div class='del'>-#~ "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> #~ "running version \"8.1\" or later. Performing an Upgrade on versions "</div><div class='ctx'> #~ "prior\n"</div><div class='del'>-#~ "to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+#~ "to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Ang hakbang na ito pagaganahin lamang kung mayroong nakitang\n"</div><div class='ctx'> #~ "partisyon ng GNU/Linux sa inyong makina.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Kailangang malaman ngayon ng DrakX kung gusto ninyong magsagawa\n"</div><div class='del'>-#~ "ng bagong install o upgrade ng namamalaging Mandrakelinux na sistema:\n"</div><div class='add'>+#~ "ng bagong install o upgrade ng namamalaging Mandrivalinux na sistema:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\": Para sa karamihang bahagi, ganap na binubura nito ang lumang\n"</div><div class='ctx'> #~ "sistema. Kung nais ninyong baguhin kung paano ang pagpartisyon sa inyong\n"</div><div class='hunk'>@@ -29036,13 +29036,13 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ " * \"%s\": ang klase ng pag-i-install na ito ay pahihintulutan kayong i-"</div><div class='ctx'> #~ "update\n"</div><div class='ctx'> #~ "ang mga package na kasalukuyang naka-install sa inyong sistema ng\n"</div><div class='del'>-#~ "Mandrakelinux. Ang inyong kasalukuyang pakana ng pagpapartisyon at\n"</div><div class='add'>+#~ "Mandrivalinux. Ang inyong kasalukuyang pakana ng pagpapartisyon at\n"</div><div class='ctx'> #~ "data ng gumagamit ay hindi nabago. Karamihan ng ibang mga hakbang sa\n"</div><div class='ctx'> #~ "pagko-configure ay mayroon pa rin, katulad ng standard na pag-i-install.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Ang paggamit sa ``Upgrade'' na option ay gagana ng mabuti sa mga sistema\n"</div><div class='del'>-#~ "ng Mandrakelinux na nagpapatakbo ng version \"8.1\" o pataas. Ang\n"</div><div class='del'>-#~ "pagsasagawa ng upgrade sa mga version bago ng Mandrakelinux \"8.1\" ay\n"</div><div class='add'>+#~ "ng Mandrivalinux na nagpapatakbo ng version \"8.1\" o pataas. Ang\n"</div><div class='add'>+#~ "pagsasagawa ng upgrade sa mga version bago ng Mandrivalinux \"8.1\" ay\n"</div><div class='ctx'> #~ "hindi ipinapayo."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -29109,7 +29109,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "About UTF-8 (unicode) support: Unicode is a new character encoding meant "</div><div class='ctx'> #~ "to\n"</div><div class='ctx'> #~ "cover all existing languages. Though full support for it in GNU/Linux is\n"</div><div class='del'>-#~ "still under development. For that reason, Mandrakelinux will be using it\n"</div><div class='add'>+#~ "still under development. For that reason, Mandrivalinux will be using it\n"</div><div class='ctx'> #~ "or not depending on the user choices:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * If you choose a languages with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -29158,7 +29158,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "\"character encoding\" na nagnanais masakop ang lahat ng namamalaging\n"</div><div class='ctx'> #~ "wika. Ang buong suporta dita ng GNU/Linux ay ginagawa pa rin. Sa "</div><div class='ctx'> #~ "dahilang\n"</div><div class='del'>-#~ "ito, gagamitin ito o hindi ng Mandrakelinux depende sa mga pili ng mga\n"</div><div class='add'>+#~ "ito, gagamitin ito o hindi ng Mandrivalinux depende sa mga pili ng mga\n"</div><div class='ctx'> #~ "gumagamit:\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * Kung kayo ay pipili ng wika na may malakas na \"legacy encoding"</div><div class='hunk'>@@ -29416,7 +29416,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "checking this box.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"</div><div class='del'>-#~ "\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"</div><div class='add'>+#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"</div><div class='ctx'> #~ "system! Be sure you know what you are doing before changing any of the\n"</div><div class='ctx'> #~ "options. !!\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -29459,7 +29459,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "bootloader\n"</div><div class='ctx'> #~ "(sa pagpili ng \"%s\"), dapat ninyong tiyaking na kayo ay may paraan "</div><div class='ctx'> #~ "para\n"</div><div class='del'>-#~ "i-boot ang inyong sistema ng Mandrakelinux! Tiyakin na alam ninyo ang\n"</div><div class='add'>+#~ "i-boot ang inyong sistema ng Mandrivalinux! Tiyakin na alam ninyo ang\n"</div><div class='ctx'> #~ "inyong ginagawa bego baguhin ang kahit na anong mga option. !!\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ "Ang pagki-click sa \"%s\" na pindutan sa dialog na ito ay mag-aalok ng "</div><div class='hunk'>@@ -29561,7 +29561,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Now, it's time to select a printing system for your computer. Other OSs "</div><div class='ctx'> #~ "may\n"</div><div class='del'>-#~ "offer you one, but Mandrakelinux offers two. Each of the printing "</div><div class='add'>+#~ "offer you one, but Mandrivalinux offers two. Each of the printing "</div><div class='ctx'> #~ "systems\n"</div><div class='ctx'> #~ "is best suited to particular types of configuration.\n"</div><div class='ctx'> #~ "\n"</div><div class='hunk'>@@ -29599,7 +29599,7 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "Panahon na upang pumili ng sistema ng pagpi-print para sa inyong "</div><div class='ctx'> #~ "computer.\n"</div><div class='ctx'> #~ "Ang ibang mga \"operating system\" (OS) ay mag-aalok lamang ng isa, pero\n"</div><div class='del'>-#~ "ang Mandrakelinux ay nag-aalok ng dalawa. Bawat isa sa dalawang sistema\n"</div><div class='add'>+#~ "ang Mandrivalinux ay nag-aalok ng dalawa. Bawat isa sa dalawang sistema\n"</div><div class='ctx'> #~ "ng pagpi-print na ito ay nababagay sa natatanging uri ng configuration.\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ " * \"%s\" -- na acronym para sa ``print, do not queue'', ang piliin kung "</div><div class='hunk'>@@ -30166,10 +30166,10 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "computer."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='add'>+#~ "Find all Mandriva products and services at &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='ctx'> #~ "our full service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Hanapin ang lahat ng produkto at serbisyo ng Mandrakesoft sa "</div><div class='add'>+#~ "Hanapin ang lahat ng produkto at serbisyo ng Mandriva sa "</div><div class='ctx'> #~ "&lt;b&gt;MandrakeStore&lt;/b&gt; -- ang aming buong serbisyong plataporma ng e-"</div><div class='ctx'> #~ "commerce."</div><div class='ctx'> </div><div class='hunk'>@@ -30194,26 +30194,26 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "\t* Espesyal na mga tawad para sa mga produkto at serbisyo sa "</div><div class='ctx'> #~ "MandrakeStore"</div><div class='ctx'> </div><div class='del'>-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with &lt;b&gt;MandrakeMove&lt;/b&gt;"</div><div class='add'>+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with &lt;b&gt;Mandriva Move&lt;/b&gt;"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "\t* Alamin ang Mandrakelinux sa bootable na CD gamit ang &lt;b&gt;MandrakeMove&lt;/"</div><div class='add'>+#~ "\t* Alamin ang Mandrivalinux sa bootable na CD gamit ang &lt;b&gt;Mandriva Move&lt;/"</div><div class='ctx'> #~ "b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "Find all Mandrakesoft products at &lt;b&gt;MandrakeStore&lt;/b&gt; -- our full "</div><div class='add'>+#~ "Find all Mandriva products at &lt;b&gt;MandrakeStore&lt;/b&gt; -- our full "</div><div class='ctx'> #~ "service e-commerce platform."</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Hanapin lahat ng mga produkto ng Mandrakesoft sa &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='add'>+#~ "Hanapin lahat ng mga produkto ng Mandriva sa &lt;b&gt;MandrakeStore&lt;/b&gt; -- "</div><div class='ctx'> #~ "ang aming buong serbisyong plataporma ng e-commerce."</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;Become a MandrakeClub member!&lt;/b&gt;"</div><div class='ctx'> #~ msgstr "&lt;b&gt;Maging Kasapi ng MandrakeClub!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "</div><div class='add'>+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "</div><div class='ctx'> #~ "tasks:"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Sa Mandrakelinux menu makakakita kayo ng mga madaling gamitin na "</div><div class='add'>+#~ "Sa Mandrivalinux menu makakakita kayo ng mga madaling gamitin na "</div><div class='ctx'> #~ "application para sa lahat ng gawain:"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='hunk'>@@ -30251,8 +30251,8 @@ msgstr "Pag-i-install nabigo"</div><div class='ctx'> #~ "  --report          - ang program ay dapat isa sa mga mandrake tool\n"</div><div class='ctx'> #~ "  --incident        - ang program ay dapat isa sa mga mandrake tool"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "This interface has not been configured yet.\n"</div><div class='head'>diff --git a/perl-install/share/po/tr.po b/perl-install/share/po/tr.po<br/>index 723715630..2b8ca8137 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/tr.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/tr.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/tr.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/tr.po</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> # translation of DrakX-tr.po to Turkish</div><div class='ctx'> # Copyright (C) 2000,2003 Free Software Foundation, Inc.</div><div class='del'>-# Copyright (c) 2000 Mandrakesoft</div><div class='add'>+# Copyright (c) 2000 Mandriva</div><div class='ctx'> # ############################################</div><div class='ctx'> #</div><div class='ctx'> # Ömer Fadıl USTA &lt;omer_fad@hotmail.com&gt; , 1999-2003.</div><div class='hunk'>@@ -68,7 +68,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -87,7 +87,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -95,7 +95,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -103,7 +103,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -231,7 +231,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1262,11 +1262,11 @@ msgstr "Elle seçim"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux çoklu dil desteğine sahiptir.\n"</div><div class='add'>+"Mandrivalinux çoklu dil desteğine sahiptir.\n"</div><div class='ctx'> "Kurulumdan sonra kullanmak isteyebileceğiniz diğer dilleri de seçebilirsiniz"</div><div class='ctx'> </div><div class='ctx'> #: any.pm:752 any.pm:773 help.pm:647</div><div class='hunk'>@@ -3620,12 +3620,12 @@ msgstr "radyo desteğini etkinleştir"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Devam etmeden önce lisans koşullarını dikkatle okumalısınız. Lisans tüm\n"</div><div class='del'>-"Mandrakelinux dağıtımını kapsar, bu koşullarını tamamını kabul ediyorsanız,\n"</div><div class='add'>+"Mandrivalinux dağıtımını kapsar, bu koşullarını tamamını kabul ediyorsanız,\n"</div><div class='ctx'> "\"%s\" kutusunu işaretleyiniz aksi halde \"%s\" tuşuna tıklayarak\n"</div><div class='ctx'> "makinenizi yeniden başlatabilirsiniz."</div><div class='ctx'> </div><div class='hunk'>@@ -3804,13 +3804,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux kurulum CD'leri bir kaç CD'den oluşur. DrakX seçilen paketin\n"</div><div class='add'>+"Mandrivalinux kurulum CD'leri bir kaç CD'den oluşur. DrakX seçilen paketin\n"</div><div class='ctx'> "hangi CD'de olduğunu bilir ve o CD'yi yerleştirmeniz için CD yuvasını açar\n"</div><div class='ctx'> "ve size gerekli CD'yi yerleştirmeniz için uyarır."</div><div class='ctx'> </div><div class='hunk'>@@ -3818,11 +3818,11 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3874,7 +3874,7 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bundan sonra sisteminize hangi uygulamaları kuracağınızı belirteceksiniz.\n"</div><div class='del'>-"Mandrakelinux sisteminde kullanılabilecek binlerce paket vardır ve onları "</div><div class='add'>+"Mandrivalinux sisteminde kullanılabilecek binlerce paket vardır ve onları "</div><div class='ctx'> "hep aklınızda tutamazsınız.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "CD'den kurulum yapıyorsanız önce elinizde hangi CD'lerin bulunduğunu\n"</div><div class='hunk'>@@ -3974,10 +3974,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4011,8 +4011,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "&lt;ÖNEMLİ&gt; İster bilerek ister belli bir grubun parçası olarak, sunucu\n"</div><div class='ctx'> "bölümünden seçtiğiniz hizmetleri gerçekten kullanıp kullanmak istemediğiniz\n"</div><div class='del'>-"ayrıca sorulacaktır. Mandrakelinux başlatıldığında kurulu olan hizmetlerin\n"</div><div class='del'>-"herbiri öntanımlı olarak başlatılır. Onlar Mandrakelinux dağıtıma girerken\n"</div><div class='add'>+"ayrıca sorulacaktır. Mandrivalinux başlatıldığında kurulu olan hizmetlerin\n"</div><div class='add'>+"herbiri öntanımlı olarak başlatılır. Onlar Mandrivalinux dağıtıma girerken\n"</div><div class='ctx'> "kılavuzlarından güvenli oldukları anlaşılarak seçilmiş bile olsalar,\n"</div><div class='ctx'> "dağıtımdan sonra bir takım güvenlik açıkları keşfedilmiş olabilir.\n"</div><div class='ctx'> "Bir hizmetin ne sunduğu hakkında bir fikriniz yoksa ya da neden kurmak\n"</div><div class='hunk'>@@ -4153,7 +4153,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4257,12 +4257,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4289,7 +4289,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4298,7 +4298,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4318,17 +4318,17 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Bu noktada, Mandrakelinux işletim sisteminizi sabit diskinizde\n"</div><div class='add'>+"Bu noktada, Mandrivalinux işletim sisteminizi sabit diskinizde\n"</div><div class='ctx'> "nereye kuracağınızı seçmeniz gerekiyor. Diskiniz boşsa, ya da\n"</div><div class='ctx'> "halihazırda bir işletim sistemi diskin tamamını kullanıyorsa\n"</div><div class='ctx'> "diski bölümlendirmeniz gerekmektedir. Temel olarak, bir diski\n"</div><div class='del'>-"bölümlendirmek, Mandrakelinux sistemini kurabilmek için onu\n"</div><div class='add'>+"bölümlendirmek, Mandrivalinux sistemini kurabilmek için onu\n"</div><div class='ctx'> "mantıksal olarak bölmek ve böylece boş alan oluşturmak anlamına\n"</div><div class='ctx'> "gelir.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Bölümlendirme işlemi gerellikle geri alınamaz ve zaten kurulu bir\n"</div><div class='ctx'> "işletim sisteminiz var ise bilgi kaybına yol açabilir. Bu işlem, eğer\n"</div><div class='del'>-"tecrübesizseniz, korkutucu ve stresli bir iş olabilir. Mandrakelinux,\n"</div><div class='add'>+"tecrübesizseniz, korkutucu ve stresli bir iş olabilir. Mandrivalinux,\n"</div><div class='ctx'> "bu işlemi oldukça kolaylaştıran bir sihirbaz sunmaktadır.Başlamadan\n"</div><div class='ctx'> "önce lütfen aşağıdaki okumak için zaman ayrın.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4355,7 +4355,7 @@ msgstr ""</div><div class='ctx'> "işlem sırasında eğer Windows bölümünüzü birleştirmiş ve biçimi FAT ise\n"</div><div class='ctx'> "herhangi bir veri kaybı yaşamazsınız. Verilerinizi yedeklemeniz şiddetle "</div><div class='ctx'> "önerilir.\n"</div><div class='del'>-"Eğer aynı bilgisayarda hem Mandrakelinux hem de Windows kullanamk\n"</div><div class='add'>+"Eğer aynı bilgisayarda hem Mandrivalinux hem de Windows kullanamk\n"</div><div class='ctx'> "istiyorsanız bu seçeneği seçmeniz önerilir.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Bu seçeneği seçmeden önce unutmayın ki işlem tamamlandığında Microsoft\n"</div><div class='hunk'>@@ -4365,7 +4365,7 @@ msgstr ""</div><div class='ctx'> "olacak.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Sabit diskinizde bulunan tüm bilgileri silmek ve yeni bir "</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "kurulumu yapmak için bu seçeneği seçin. Lütfen bu seçeneği kullanırken "</div><div class='ctx'> "dikkatli\n"</div><div class='ctx'> "olun, çünkü onayladıktan sonra geri alma şansınız bulunmuyor.\n"</div><div class='hunk'>@@ -4539,7 +4539,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4564,7 +4564,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Bölümleri biçemlendirmeye hazır olduğunuzda \"Tamam\"'a tıklayın.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sisteminizi kurmak isteyeceğiniz başka bölümler de seçmek\n"</div><div class='add'>+"Mandrivalinux sisteminizi kurmak isteyeceğiniz başka bölümler de seçmek\n"</div><div class='ctx'> "isterseniz \"İptal\"'e basın.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\"Gelişmiş\" düğmesine tıkladıktan sonra isterseniz, sabit diskinizindeki\n"</div><div class='hunk'>@@ -4582,7 +4582,7 @@ msgstr "Önceki"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4594,7 +4594,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux kurulumunuz sırasında dağıtımdan sonra güncellenmiş bazı "</div><div class='add'>+"Mandrivalinux kurulumunuz sırasında dağıtımdan sonra güncellenmiş bazı "</div><div class='ctx'> "paketler, düzeltmeler ve çözümlenmiş güvenlik unsurlarının olup olmadığını "</div><div class='ctx'> "internet bağlantınız üzerinden kontrol edip varsa indirip kurabilir. Çalışan "</div><div class='ctx'> "bir internet bağlantınız varsa \"Evet\" seçebilir, yoksa \"Hayır\" seçerek "</div><div class='hunk'>@@ -4621,7 +4621,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4646,7 +4646,7 @@ msgstr "Güvenlik Yöneticisi"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4716,7 +4716,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Bu noktada, Mandrakelinux işletim sisteminizi sabit diskinizde nereye\n"</div><div class='add'>+"Bu noktada, Mandrivalinux işletim sisteminizi sabit diskinizde nereye\n"</div><div class='ctx'> "kuracağınızı seçmeniz gerekiyor. Bölümler önceki bir kurulumda ya da bir\n"</div><div class='ctx'> "başka bölümlendirme aracıyla önceden tanımlanmışsa eski bölümlerinizi\n"</div><div class='ctx'> "kullanabilirsiniz. Aksi takdirde, sabit disk bölümlerinin tanımlanması\n"</div><div class='hunk'>@@ -4811,7 +4811,7 @@ msgstr "Normal/Uzman kipleri arasında geçiş yap"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4839,7 +4839,7 @@ msgid ""</div><div class='ctx'> "\"Windows name\" is the letter of your hard drive under Windows (the first\n"</div><div class='ctx'> "disk or partition is called \"C:\")."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Sabit diskinizde birden fazla Windows bölümü bulundu. Yeni Mandrakelinux\n"</div><div class='add'>+"Sabit diskinizde birden fazla Windows bölümü bulundu. Yeni Mandrivalinux\n"</div><div class='ctx'> "işletim sisteminizi kurmak için hangi bölümün boyutunu değiştirmek\n"</div><div class='ctx'> "istiyorsunuz?\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4891,7 +4891,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4900,13 +4900,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4957,7 +4957,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5212,7 +5212,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5233,11 +5233,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Burada kullanacağınız yazdırma sistemini seçeceksiniz. Diğer işletim\n"</div><div class='del'>-"sistemleri bir seçenek sunarken, Mandrakelinux size iki ayrı seçenek\n"</div><div class='add'>+"sistemleri bir seçenek sunarken, Mandrivalinux size iki ayrı seçenek\n"</div><div class='ctx'> "sunmaktadır. İki tip yazdırma sistemide özel yapılandırma türü için en "</div><div class='ctx'> "iyidir.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5369,7 +5369,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5386,7 +5386,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5448,10 +5448,10 @@ msgstr "Hizmetler"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Lütfen yeni Mandrakelinux disk bölümünüzü kurmak için silmek istediğiniz\n"</div><div class='add'>+"Lütfen yeni Mandrivalinux disk bölümünüzü kurmak için silmek istediğiniz\n"</div><div class='ctx'> "sabit diski seçin. Üzerindeki tüm verilerin yok olacağını ve geriye dönüşün\n"</div><div class='ctx'> "mümkün olmayacağını unutmayın!"</div><div class='ctx'> </div><div class='hunk'>@@ -5803,7 +5803,7 @@ msgstr "Windows bölümünün boyutu hesaplanıyor"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Windows bölümünüz çok dağınık, lütfen önce \"defrag\" ile diskinizdeki "</div><div class='hunk'>@@ -5921,19 +5921,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5955,7 +5955,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5963,14 +5963,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5980,7 +5980,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6000,10 +6000,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6014,11 +6014,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6034,11 +6034,11 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Giriş\n"</div><div class='ctx'> "\n"</div><div class='del'>-"İşletim sistemi, ve Mandrakelinux dağıtımında bulunan farklı parçalar\n"</div><div class='add'>+"İşletim sistemi, ve Mandrivalinux dağıtımında bulunan farklı parçalar\n"</div><div class='ctx'> "buradan itibaren \"Yazılım Ürünleri\" olarak adlandırılacaktır. Yazılım\n"</div><div class='ctx'> "ürünleri işletim sistemiyle ilgili program kümeleri, yötemleri, kuralları\n"</div><div class='ctx'> "ve dokümanları, Linux-Mandrake'nin farklı parçalarını içermektedir, fakat\n"</div><div class='hunk'>@@ -6048,7 +6048,7 @@ msgstr ""</div><div class='ctx'> "1. Lisans Anlaşması\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Lütfen bu dokümanı dikkatle okuyun. Bu doküman yazılım ürünlerini uygulayan\n"</div><div class='del'>-"Mandrakesoft S.A. ile sizin aranızdaki lisans anlaşmasıdır. Yazılım\n"</div><div class='add'>+"Mandriva S.A. ile sizin aranızdaki lisans anlaşmasıdır. Yazılım\n"</div><div class='ctx'> "ürünlerini, kurulum yaparak, çoğaltarak, ya da herhangi bir amaçla "</div><div class='ctx'> "kullanarak\n"</div><div class='ctx'> "bu Lisans'ın şartlarına uyacağınızı açık ve tam olarak kabul etmiş\n"</div><div class='hunk'>@@ -6065,11 +6065,11 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Yazılım Ürünleri ve yanlarında gelen dokümanlar \"oldukları gibi\"dirler, "</div><div class='ctx'> "ve\n"</div><div class='del'>-"kanunların izin verdiği açılımda garantisizdirler. Mandrakesoft S.A.,\n"</div><div class='add'>+"kanunların izin verdiği açılımda garantisizdirler. Mandriva S.A.,\n"</div><div class='ctx'> "kullanıcının yazılım ürünlerini kullanmak konusunda yetkin olmaması "</div><div class='ctx'> "nedeniyle\n"</div><div class='ctx'> "oluşan (iş kaybı, işin aksaması, maddi kayıp, hukuki cezalara çarptırılma\n"</div><div class='del'>-"vb. neden olacak) doğrudan ya da dolaylı (Mandrakesoft S.A. bu tür "</div><div class='add'>+"vb. neden olacak) doğrudan ya da dolaylı (Mandriva S.A. bu tür "</div><div class='ctx'> "zararların\n"</div><div class='ctx'> "oluşabileceğini duyursa bile) hiçbir zarar nedeniyle sorumluluk taşımaz.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6077,12 +6077,12 @@ msgstr ""</div><div class='ctx'> "BAZI ÜLKELERDE YASAKLANMIŞ YAZILIMA SAHİP OLMAYA YA DA ONU KULLANMAYA BAĞLI\n"</div><div class='ctx'> "SINIRLI SORUMLULUK\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Kanunların verdiği yetkilere göre, Mandrakesoft S.A. ya da dağıtımcıları\n"</div><div class='add'>+"Kanunların verdiği yetkilere göre, Mandriva S.A. ya da dağıtımcıları\n"</div><div class='ctx'> "kullanıcının, bulunduğu ülkede yasak olduğu halde, yazılım ürünlerini\n"</div><div class='del'>-"kullanması, onlara sahip olması, onları Mandrakelinux sitelerinden "</div><div class='add'>+"kullanması, onlara sahip olması, onları Mandrivalinux sitelerinden "</div><div class='ctx'> "indirmesi\n"</div><div class='ctx'> "nedeniyle oluşan (iş kaybı, işin aksaması, maddi kayıp, hukuki cezalara \n"</div><div class='del'>-"çarptırılma vb. neden olacak) doğrudan ya da dolaylı (Mandrakesoft S.A. bu\n"</div><div class='add'>+"çarptırılma vb. neden olacak) doğrudan ya da dolaylı (Mandriva S.A. bu\n"</div><div class='ctx'> "tür zararların oluşabileceğini duyursa bile) hiçbir zarar nedeniyle\n"</div><div class='ctx'> "sorumluluk taşımaz. Bu sınırlı sorumluluk, yazılım ürünleri içindeki güçlü\n"</div><div class='ctx'> "kriptografi araçlarını kapsar, fakat bunlarla sınırlı değildir.\n"</div><div class='hunk'>@@ -6096,10 +6096,10 @@ msgstr ""</div><div class='ctx'> "çoğaltılmasına, değiştirilmesine ya da tekrar dağıtımının yapılmasına izin\n"</div><div class='ctx'> "vermektedir. Lütfen kullanımdan önce her bir yazılım ürünü için, onu\n"</div><div class='ctx'> "ilgilendiren lisans(lar)ın tüm şartlarını okuyunuz. Bir yazılım ürünü\n"</div><div class='del'>-"hakkındaki herhangi bir soru, Mandrakesoft'a değil, o ürünün "</div><div class='add'>+"hakkındaki herhangi bir soru, Mandriva'a değil, o ürünün "</div><div class='ctx'> "geliştiricisine\n"</div><div class='del'>-"yöneltilmelidir. Mandrakesoft tarafından geliştirilmiş yazılımlar GPL\n"</div><div class='del'>-"lisansıyla korunmaktadır. Mandrakesoft tarafından hazırlanan dokümanlar da\n"</div><div class='add'>+"yöneltilmelidir. Mandriva tarafından geliştirilmiş yazılımlar GPL\n"</div><div class='add'>+"lisansıyla korunmaktadır. Mandriva tarafından hazırlanan dokümanlar da\n"</div><div class='ctx'> "özel bir lisansa tabidir. Daha fazla bilgi için lütfen dokümanlara\n"</div><div class='ctx'> "göz atınız.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6108,10 +6108,10 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Yazılım ürünleri üzerindeki tüm haklar bu yazılımın geliştiricisine aittir;\n"</div><div class='ctx'> " yazılıma uygulanan entellektüel özellik ve kopyalama kanunlarıyla\n"</div><div class='del'>-"korunmaktadırlar. Mandrakesoft, yazılım ürünlerinin, bütün olarak ya da\n"</div><div class='add'>+"korunmaktadırlar. Mandriva, yazılım ürünlerinin, bütün olarak ya da\n"</div><div class='ctx'> "parça parça, herhangi bir amaç için değiştirilme ya da adapte edilme\n"</div><div class='del'>-"haklarını saklamaktadır. \"Mandrake\", ve \"Mandrakelinux\" ve ilgili\n"</div><div class='del'>-"logolar Mandrakesoft S.A.'ya ait tescilli markalardır.\n"</div><div class='add'>+"haklarını saklamaktadır. \"Mandriva\", ve \"Mandrivalinux\" ve ilgili\n"</div><div class='add'>+"logolar Mandriva S.A.'ya ait tescilli markalardır.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Yönetim Kanunları\n"</div><div class='hunk'>@@ -6121,7 +6121,7 @@ msgstr ""</div><div class='ctx'> "Diğer kısımların sınırlamaları devam edecektir. Bu lisansın şartları Fransa\n"</div><div class='ctx'> "Kanunları altındadır. Bu lisansın şartlarına her türlü itiraz\n"</div><div class='ctx'> "Paris Mahkemesi tarafından görüşülecektir. Bu doküman hakkında herhangi bir\n"</div><div class='del'>-"soru için lütfen Mandrakesoft S.A'ya başvurun.\n"</div><div class='add'>+"soru için lütfen Mandriva S.A'ya başvurun.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6206,7 +6206,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6214,13 +6214,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tebrikler, kurulum tamamlandı.\n"</div><div class='ctx'> "Cdrom ve/veya disketi çıkartın ve Enter'a basarak bilgisayarınızı\n"</div><div class='ctx'> "yeniden başlatın.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux'nin bu sürümündeki güncellemeler hakkında bilgi\n"</div><div class='add'>+"Mandrivalinux'nin bu sürümündeki güncellemeler hakkında bilgi\n"</div><div class='ctx'> "almak için: \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6228,7 +6228,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "adresine bakabilirsiniz. Sisteminizin ayarları hakkında daha geniş\n"</div><div class='del'>-"bilgiyi Mandrakelinux Kullanıcı Kılavuzunda bulabilirsiniz."</div><div class='add'>+"bilgiyi Mandrivalinux Kullanıcı Kılavuzunda bulabilirsiniz."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6263,11 +6263,11 @@ msgstr "`%s' adımına başlanıyor\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Sistem kaynaklarınız kısıtlı. Mandrakelinux'yi kurarken sorunlarınız\n"</div><div class='add'>+"Sistem kaynaklarınız kısıtlı. Mandrivalinux'yi kurarken sorunlarınız\n"</div><div class='ctx'> "olabilir. Bu durum oluşursa, metin tabanlı kurulumu deneyebilirsiniz.\n"</div><div class='ctx'> "Bunun için CDROM'dan açtıktan sonra `F1'e basın, ve komut satırına\n"</div><div class='ctx'> "`text' yazın."</div><div class='hunk'>@@ -6804,9 +6804,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Yansı adreslerini almak için Mandrakelinux web sayfasına bağlantı kuruluyor"</div><div class='add'>+"Yansı adreslerini almak için Mandrivalinux web sayfasına bağlantı kuruluyor"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7028,8 +7028,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux Kurulum %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux Kurulum %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9611,13 +9611,13 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall yapılandırma aracı\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Bu araç Mandrakelinux makinanız için kişisel bir ateş duvarı yapılandırır.\n"</div><div class='add'>+"Bu araç Mandrivalinux makinanız için kişisel bir ateş duvarı yapılandırır.\n"</div><div class='ctx'> "Güçlü bir ateş duvarı çözümü için özelleştirilmiş Mandrake Security "</div><div class='ctx'> "Firewall\n"</div><div class='ctx'> "dağıtımına bakın."</div><div class='hunk'>@@ -13535,7 +13535,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15368,18 +15368,18 @@ msgstr "Durdur"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Nedir?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Nedir?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux&lt;/b&gt; dağıtımına Hoşgeldiniz!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux&lt;/b&gt; dağıtımına Hoşgeldiniz!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -15388,7 +15388,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15405,9 +15405,9 @@ msgstr "Açık Kaynak Kodu Dünyasına Hoş Geldiniz!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15427,7 +15427,7 @@ msgstr "&lt;b&gt;PowerPack&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15453,10 +15453,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15470,13 +15470,13 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:15</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Download Version&lt;/b&gt;"</div><div class='del'>-msgstr "Bu Mandrakelinux dağıtımının &lt;b&gt;İndirilebilinir sürümüdür&lt;/b&gt;."</div><div class='add'>+msgstr "Bu Mandrivalinux dağıtımının &lt;b&gt;İndirilebilinir sürümüdür&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15503,7 +15503,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15513,7 +15513,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15532,13 +15532,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15550,7 +15550,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15564,20 +15564,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux Güncelleme Uygulamacığı"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux Güncelleme Uygulamacığı"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15597,61 +15597,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15689,7 +15689,7 @@ msgstr "Dosya sisteminizin parolasını seçiniz"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15710,7 +15710,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15827,7 +15827,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16062,14 +16062,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux Kontrol Merkezi&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux Kontrol Merkezi&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16091,9 +16091,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16105,7 +16105,7 @@ msgstr "&lt;b&gt;MandrakeStore&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16128,20 +16128,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16160,33 +16160,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16209,32 +16209,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -16532,8 +16532,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, fuzzy, c-format</div><div class='hunk'>@@ -16647,7 +16647,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16695,7 +16695,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdp]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -19281,13 +19281,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='ctx'> msgstr "Mandrake Hata Bildirme Aracı"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux Kontrol Merkezi"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux Kontrol Merkezi"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19307,8 +19307,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19352,7 +19352,7 @@ msgstr "Yapılandırma Sihirbazı"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -19768,7 +19768,7 @@ msgstr "Önyüklemede başlatılan"</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bu bağdaştırıcı henüz yapılandırılmamış.\n"</div><div class='ctx'> "Ana penceredeki yapılandırma sihirbazını çalıştırın"</div><div class='hunk'>@@ -19777,7 +19777,7 @@ msgstr ""</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bu bağdaştırıcı henüz yapılandırılmamış.\n"</div><div class='ctx'> "Ana penceredeki yapılandırma sihirbazını çalıştırın"</div><div class='hunk'>@@ -19830,7 +19830,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -20124,7 +20124,7 @@ msgstr "Al"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20641,14 +20641,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Telif Hakkı (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Telif Hakkı (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Bu bir serbest yazılımdır ve GNU GPL lisansı altında tekrar "</div><div class='ctx'> "dağıtılabilinir.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -20674,7 +20674,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Mandrake Kontrol Merkezi"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -23730,7 +23730,7 @@ msgstr "Değişklik bitti, fakat etkinleşmesi için sistemden çıkmalısınız</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='ctx'> msgstr "Mandrake Araç Kayıtları"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='hunk'>@@ -24245,10 +24245,10 @@ msgstr "Bağlantı tamamlandı."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bağlantı başarısız.\n"</div><div class='del'>-"Yapılandırmanızı Mandrakelinux Kontrol Merkezinden kontrol ediniz."</div><div class='add'>+"Yapılandırmanızı Mandrivalinux Kontrol Merkezinden kontrol ediniz."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25099,8 +25099,8 @@ msgstr "Kurulum başarısız!"</div><div class='ctx'> #~ msgstr "Hiç yazı tipi seçmemişsiniz"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "&lt;b&gt;Mandrakestore&lt;/b&gt;"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "&lt;b&gt;Mandriva Store&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Hiç bir web tarayıcısı kurulu değil! Lütfen bir tane kurun."</div><div class='hunk'>@@ -25223,13 +25223,13 @@ msgstr "Kurulum başarısız!"</div><div class='ctx'> #~ msgstr "%s yazmak için açılırken hata: %s"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='del'>-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"</div><div class='add'>+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Version:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Author:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> #~ "\n"</div><div class='ctx'> #~ msgstr ""</div><div class='del'>-#~ "Harddrake, Mandrakelinux'nin donanım yapılandırma aracı.\n"</div><div class='add'>+#~ "Harddrake, Mandrivalinux'nin donanım yapılandırma aracı.\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Sürüm:&lt;/span&gt; %s\n"</div><div class='ctx'> #~ "&lt;span foreground=\"royalblue3\"&gt;Yazan:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> #~ "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -25588,8 +25588,8 @@ msgstr "Kurulum başarısız!"</div><div class='ctx'> #~ "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."</div><div class='ctx'> #~ msgstr "Yazıcı \"%s\" Star Office/OpenOffice.org/GIMP'den kaldırılamadı."</div><div class='ctx'> </div><div class='del'>-#~ msgid "&lt;b&gt;Congratulations for choosing Mandrakelinux!&lt;/b&gt;"</div><div class='del'>-#~ msgstr "&lt;b&gt;Mandrakelinux'u seçtiğiniz için tebrikler!&lt;/b&gt;"</div><div class='add'>+#~ msgid "&lt;b&gt;Congratulations for choosing Mandrivalinux!&lt;/b&gt;"</div><div class='add'>+#~ msgstr "&lt;b&gt;Mandrivalinux'u seçtiğiniz için tebrikler!&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "&lt;b&gt;OpenOffice.org&lt;/b&gt;: The complete Linux office suite."</div><div class='ctx'> #~ msgstr "&lt;b&gt;OpenOffice.org&lt;/b&gt;:·Tam bir ofis uygulama seti."</div><div class='hunk'>@@ -25609,8 +25609,8 @@ msgstr "Kurulum başarısız!"</div><div class='ctx'> #~ msgid "\t* create your own Web site"</div><div class='ctx'> #~ msgstr "\t-·kendi web sitenizi yapabilirsiniz"</div><div class='ctx'> </div><div class='del'>-#~ msgid "This is the Mandrakelinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='del'>-#~ msgstr "Bu Mandrakelinux dağıtımının &lt;b&gt;İndirilebilinir sürümüdür&lt;/b&gt;."</div><div class='add'>+#~ msgid "This is the Mandrivalinux &lt;b&gt;Download version&lt;/b&gt;."</div><div class='add'>+#~ msgstr "Bu Mandrivalinux dağıtımının &lt;b&gt;İndirilebilinir sürümüdür&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "The free download version does not include commercial software, and "</div><div class='hunk'>@@ -25647,13 +25647,13 @@ msgstr "Kurulum başarısız!"</div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Before continuing, you should carefully read the terms of the license. "</div><div class='ctx'> #~ "It\n"</div><div class='del'>-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "</div><div class='add'>+#~ "covers the entire Mandrivalinux distribution. If you do agree with all "</div><div class='ctx'> #~ "the\n"</div><div class='ctx'> #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"</div><div class='ctx'> #~ "will reboot your computer."</div><div class='ctx'> #~ msgstr ""</div><div class='ctx'> #~ "Devam etmeden önce lisans koşullarını dikkatle okumalısınız. Lisans tüm\n"</div><div class='del'>-#~ "Mandrakelinux dağıtımını kapsar, bu koşullarını tamamını kabul "</div><div class='add'>+#~ "Mandrivalinux dağıtımını kapsar, bu koşullarını tamamını kabul "</div><div class='ctx'> #~ "ediyorsanız,\n"</div><div class='ctx'> #~ "\"%s\" kutusunu işaretleyiniz aksi halde \"%s\" tuşuna tıklayarak\n"</div><div class='ctx'> #~ "makinenizi yeniden başlatabilirsiniz."</div><div class='hunk'>@@ -25763,8 +25763,8 @@ msgstr "Kurulum başarısız!"</div><div class='ctx'> #~ "  --report          - program mandrake'nin araçlarından olmalı\n"</div><div class='ctx'> #~ "  --incident        - program mandrake'nin araçlarından olmalı"</div><div class='ctx'> </div><div class='del'>-#~ msgid "Mandrake Online"</div><div class='del'>-#~ msgstr "Mandrake Online"</div><div class='add'>+#~ msgid "Mandriva Online"</div><div class='add'>+#~ msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #~ msgid ""</div><div class='ctx'> #~ "Connection failed.\n"</div><div class='head'>diff --git a/perl-install/share/po/uk.po b/perl-install/share/po/uk.po<br/>index f3d37a455..5c5830c4e 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/uk.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/uk.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/uk.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/uk.po</a></div><div class='hunk'>@@ -73,7 +73,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Здається, що USB ключ має увімкнений захист від запису, але ми\n"</div><div class='ctx'> "можемо безпечно відімкнути його зараз.\n"</div><div class='hunk'>@@ -81,7 +81,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Клацніть кнопку для перезавантаження комп'ютера, від'єднайте \n"</div><div class='ctx'> "його, зніміть захист від запису, під'єднайте ключ, і запустіть\n"</div><div class='del'>-"Mandrake Move знову."</div><div class='add'>+"Mandriva Move знову."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -99,7 +99,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ваш USB ключ не має жодного розділу Windows (FAT).\n"</div><div class='hunk'>@@ -111,14 +111,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ви також можете продовжувати без USB ключа - Ви\n"</div><div class='del'>-"все одно зможете використовувати Mandrake Move як\n"</div><div class='add'>+"все одно зможете використовувати Mandriva Move як\n"</div><div class='ctx'> "звичайну операційну систему Mandrake."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -126,11 +126,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "На вашій системі не знайдено USB ключ. Якщо Ви\n"</div><div class='del'>-"під'єднаєте USB ключ зараз, то Mandrake Move зможе\n"</div><div class='add'>+"під'єднаєте USB ключ зараз, то Mandriva Move зможе\n"</div><div class='ctx'> "прозоро зберігати дані з Вашої домашньої теки і\n"</div><div class='ctx'> "системну конфігурацію для наступного завантаження\n"</div><div class='ctx'> "цього або іншого комп'ютера. Майте на увазі, що якщо\n"</div><div class='hunk'>@@ -139,7 +139,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Ви також можете продовжити без USB ключа - Ви все\n"</div><div class='del'>-"одно зможете використовувати Mandrake Move як\n"</div><div class='add'>+"одно зможете використовувати Mandriva Move як\n"</div><div class='ctx'> "звичайну операційну систему Mandrake."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -268,7 +268,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -284,7 +284,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Це можливо через пошкоджені конфігураційні файли\n"</div><div class='ctx'> "на USB ключі, в цьому випадку їх видалення і наступне\n"</div><div class='del'>-"перезавантаження Mandrake Move виправить проблему.\n"</div><div class='add'>+"перезавантаження Mandriva Move виправить проблему.\n"</div><div class='ctx'> "Для цього клацніть на відповідній кнопці.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1335,7 +1335,7 @@ msgstr "Вибір мови"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3761,7 +3761,7 @@ msgstr "увімкнути підтримку радіо"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3946,7 +3946,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3962,11 +3962,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4128,10 +4128,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4315,7 +4315,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4489,12 +4489,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4521,7 +4521,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4530,7 +4530,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4757,7 +4757,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4798,7 +4798,7 @@ msgstr "Попередній"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4838,7 +4838,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4867,7 +4867,7 @@ msgstr "Адміністратор з безпеки"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -5027,7 +5027,7 @@ msgstr "Перемикнути між режимами Експерт/Звича</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5107,7 +5107,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5116,13 +5116,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Цей крок виконується тільки у випадку, якщо на Вашій машині було\n"</div><div class='ctx'> "знайдено старий розділ GNU/Linux.\n"</div><div class='hunk'>@@ -5201,7 +5201,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5488,7 +5488,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5509,7 +5509,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Зараз настав час вибрати систему друку на Вашому комп'ютері. Інші\n"</div><div class='hunk'>@@ -5653,7 +5653,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5670,7 +5670,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5796,7 +5796,7 @@ msgstr "Сервіси"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Виберіть твердий диск, який Ви хочете відформатувати для\n"</div><div class='hunk'>@@ -6160,7 +6160,7 @@ msgstr "Розраховується розмір розділу Віндовс"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Розділ з Windows на Вашому комп'ютері занадто фраґментований. Будь ласка, "</div><div class='hunk'>@@ -6280,19 +6280,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6314,7 +6314,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6322,14 +6322,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6339,7 +6339,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6359,10 +6359,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6373,11 +6373,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6393,7 +6393,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Вступ\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6407,7 +6407,7 @@ msgstr ""</div><div class='ctx'> "1. Ліцензійна угода\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Будь ласка, прочитайте цю угоду уважно. Цей документ є ліцензійною\n"</div><div class='del'>-"угодою між Вами та Mandrakesoft S.A., яка стосується програмних\n"</div><div class='add'>+"угодою між Вами та Mandriva S.A., яка стосується програмних\n"</div><div class='ctx'> "продуктів. Встановленням, дублюванням чи використанням Програмних\n"</div><div class='ctx'> "продуктів будь-яким чином, Ви явно приймаєте та повністю\n"</div><div class='ctx'> "погоджуєтесь з умовами даної Ліцензії. Якщо Ви не погоджуєтесь з\n"</div><div class='hunk'>@@ -6423,20 +6423,20 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Програмні продукти та доповнююча документація поставляються \"як є\",\n"</div><div class='ctx'> "без гарантії, в межах встановлених законодавством. Ні за яких умов\n"</div><div class='del'>-"Mandrakesoft S.A. не буде нести відповідальності, в межах встановлених\n"</div><div class='add'>+"Mandriva S.A. не буде нести відповідальності, в межах встановлених\n"</div><div class='ctx'> "законодавством, за випадкові, прямі чи опосередковані (включаючи, але\n"</div><div class='ctx'> "не обмежуючись втратами чи перепинами бізнесу, фінансовими втратами,\n"</div><div class='ctx'> "адвокатськими витратами чи штрафами як результат присуду судової\n"</div><div class='ctx'> "інстанції, чи будь-які інші втрати), що походять від використання,\n"</div><div class='ctx'> "або, навпаки, від неможливості використання Програмного продукту, навіть\n"</div><div class='del'>-"у випадку, якщо Mandrakesoft S.A. повідомляло про можливості таких\n"</div><div class='add'>+"у випадку, якщо Mandriva S.A. повідомляло про можливості таких\n"</div><div class='ctx'> "втрат.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "ОБМЕЖЕННЯ ВІДПОВІДАЛЬНОСТІ, ЗАЛЕЖНОЇ ВІД ОБЛАДНАННЯ АБО\n"</div><div class='ctx'> "ВИКОРИСТАННЯ ЗАБОРОНЕНИХ ПРОГРАМНИХ ПРОДУКТІВ В ДЕЯКИХ\n"</div><div class='ctx'> "КРАЇНАХ\n"</div><div class='ctx'> "\n"</div><div class='del'>-"В межах, встановлених законодавством, Mandrakesoft S.A. чи його\n"</div><div class='add'>+"В межах, встановлених законодавством, Mandriva S.A. чи його\n"</div><div class='ctx'> "дистриб'ютори ні за яких умов не несуть відповідальності за жодне\n"</div><div class='ctx'> "навмисне, випадкове, пряме чи опосередковане пошкодження, (включаючи\n"</div><div class='ctx'> "але не обмежуючись перешкодами для бізнесу, припиненням бізнесу,\n"</div><div class='hunk'>@@ -6462,8 +6462,8 @@ msgstr ""</div><div class='ctx'> "складової частини, перш ніж використовувати будь-яку з\n"</div><div class='ctx'> "частин. Будь-які запитання стосовно ліцензії на окрему складову\n"</div><div class='ctx'> "частину мають адресуватися автору цієї складової частини, а не до\n"</div><div class='del'>-"Mandrakesoft. Програми, розроблені Mandrakesoft S.A., керуються\n"</div><div class='del'>-"ліцензією GPL. Документація, розроблена Mandrakesoft S.A,. керується\n"</div><div class='add'>+"Mandriva. Програми, розроблені Mandrakesoft S.A., керуються\n"</div><div class='add'>+"ліцензією GPL. Документація, розроблена Mandriva S.A,. керується\n"</div><div class='ctx'> "спеціальною ліцензією. Зверніться, будь ласка, до документації за\n"</div><div class='ctx'> "подробицями.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6472,9 +6472,9 @@ msgstr ""</div><div class='ctx'> "Всі права на складові компоненти Програмних продуктів належать\n"</div><div class='ctx'> "відповідним авторам і захищені законами про інтелектуальну власність\n"</div><div class='ctx'> "на програмне забезпечення.\n"</div><div class='del'>-"Mandrakesoft S.A. залишає за собою право змінювати чи\n"</div><div class='add'>+"Mandriva S.A. залишає за собою право змінювати чи\n"</div><div class='ctx'> "адаптувати Програмні продукти як в цілому, так і окремими частинами з\n"</div><div class='del'>-"будь-якою метою і для будь-яких цілей. \"Mandrake\", \"Mandrakelinux\" та\n"</div><div class='add'>+"будь-якою метою і для будь-яких цілей. \"Mandriva\", \"Mandrivalinux\" та\n"</div><div class='ctx'> "відповідні логотипи є торгівельними марками MandarakeSoft S.A.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Законодавство\n"</div><div class='hunk'>@@ -6488,7 +6488,7 @@ msgstr ""</div><div class='ctx'> "можливості поза межами судових установ. В крайніх випадках спірні\n"</div><div class='ctx'> "питання будуть вирішуватися відповідним Судом Парижа - Франція.\n"</div><div class='ctx'> "З будь-якими питаннями щодо цього документа звертайтеся, будь ласка,\n"</div><div class='del'>-"до Mandrakesoft S.A.\n"</div><div class='add'>+"до Mandriva S.A.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6578,7 +6578,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6586,7 +6586,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Вітання, встановлення завершено. Вийміть з дисководів завантажувальні\n"</div><div class='ctx'> "носії і потім натисніть Return для перезавантаження системи.\n"</div><div class='hunk'>@@ -6635,7 +6635,7 @@ msgstr "Починається крок `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -7186,9 +7186,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Зв'язуюсь з веб-сайтом Mandrakelinux, щоб отримати список наявних джерел..."</div><div class='add'>+"Зв'язуюсь з веб-сайтом Mandrivalinux, щоб отримати список наявних джерел..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7412,7 +7412,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='ctx'> msgstr "Встановлення Мандрейклінакс %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='hunk'>@@ -10000,7 +10000,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14075,7 +14075,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -16034,18 +16034,18 @@ msgstr "Зупинити"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Що таке Мандрейклінакс?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> msgstr "Ласкаво просимо до &lt;b&gt;Мандрейклінакс&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -16058,7 +16058,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "На сьогодні Мандрейклінакс є найбільш &lt;b&gt;наближеним до користувача&lt;/b&gt; "</div><div class='hunk'>@@ -16078,13 +16078,13 @@ msgstr "Ласкаво просимо у світ &lt;b&gt;програм з відк�</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Мандрейклінакс є проектом з відкритим кодом. Це означає, що ця нова збірка є "</div><div class='del'>-"результатом &lt;b&gt;співпраці&lt;/b&gt; команди &lt;b&gt;розробників Mandrakesoft&lt;/b&gt; і "</div><div class='add'>+"результатом &lt;b&gt;співпраці&lt;/b&gt; команди &lt;b&gt;розробників Mandriva&lt;/b&gt; і "</div><div class='ctx'> "&lt;b&gt;світової спільноти&lt;/b&gt; помічників Мандрейклінакса."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='hunk'>@@ -16104,7 +16104,7 @@ msgstr "&lt;b&gt;Загальна публічна ліцензія&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Більша частина програм, включених у це поширення, і всі інструменти "</div><div class='ctx'> "Мандрейклінакса підтримуються &lt;b&gt;Загальною публічною ліцензією&lt;/b&gt;."</div><div class='hunk'>@@ -16138,10 +16138,10 @@ msgstr "&lt;b&gt;Приєднуйтеся до Спільноти!&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Мандрейклінакс має одну з &lt;b&gt;найбільших Спільнот&lt;/b&gt; користувачів і "</div><div class='ctx'> "розробників. Коло діяльності такої спільноти дуже велике, від виявлення "</div><div class='hunk'>@@ -16167,11 +16167,11 @@ msgstr "&lt;b&gt;Версія для звантаження&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Зараз Ви встановлюєте &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Це безкоштовна версія, "</div><div class='del'>-"яку Mandrakesoft зробив &lt;b&gt;доступною для всіх&lt;/b&gt;."</div><div class='add'>+"Зараз Ви встановлюєте &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Це безкоштовна версія, "</div><div class='add'>+"яку Mandriva зробив &lt;b&gt;доступною для всіх&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16201,10 +16201,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Також Ви не будете мати доступу до &lt;b&gt;послуг&lt;/b&gt;, що входять в інші продукти "</div><div class='del'>-"Mandrakesoft."</div><div class='add'>+"Mandriva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16213,8 +16213,8 @@ msgstr "&lt;b&gt;Discovery, Ваша перша настільна система Linu</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Зараз Ви встановлюєте &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Зараз Ви встановлюєте &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16236,17 +16236,17 @@ msgstr "&lt;b&gt;PowerPack, Довершена настільна система Linux</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Зараз Ви встановлюєте &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Зараз Ви встановлюєте &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack - &lt;b&gt;головний продукт&lt;/b&gt; Mandrakesoft для настільних комп'ютерів. "</div><div class='add'>+"PowerPack - &lt;b&gt;головний продукт&lt;/b&gt; Mandriva для настільних комп'ютерів. "</div><div class='ctx'> "В додаток до простоти і дружності до користувача він містить &lt;b&gt;тисячі "</div><div class='ctx'> "програм&lt;/b&gt; - все від найпопулярнішого до найбільш професійного."</div><div class='ctx'> </div><div class='hunk'>@@ -16258,8 +16258,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Зараз Ви встановлюєте &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Зараз Ви встановлюєте &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16275,22 +16275,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Продукти Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Продукти Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; розробив різноманітні програми для &lt;b&gt;Мандрейклінакса&lt;/"</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; розробив різноманітні програми для &lt;b&gt;Мандрейклінакса&lt;/"</div><div class='ctx'> "b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Продуктами Mandrakelinux є:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Продуктами Mandrivalinux є:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16311,31 +16311,31 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux для x86-64&lt;/b&gt;, розробка Mandrakelinux для отримання "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux для x86-64&lt;/b&gt;, розробка Mandrivalinux для отримання "</div><div class='ctx'> "найкращого результату від 64-бітних процесорів."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Програми Mandrakesoft (Загальні продукти)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Програми Mandriva (Загальні продукти)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft розробив два продукти, які дають можливість користуватися "</div><div class='add'>+"Mandriva розробив два продукти, які дають можливість користуватися "</div><div class='ctx'> "Мандрейклінаксом &lt;b&gt;на будь-якому комп'ютері&lt;/b&gt; без необхідності його "</div><div class='ctx'> "встановлення:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Move&lt;/b&gt;, поширення Мандрейклінакса, яке виконується безпосередньо з "</div><div class='hunk'>@@ -16344,7 +16344,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, поширення Мандрейклінакса, попередньо встановлене "</div><div class='hunk'>@@ -16352,32 +16352,32 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Продукти Mandrakesoft (Професійні рішення)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Продукти Mandriva (Професійні рішення)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Нижче приведені продукти Mandrakesoft, розроблені для &lt;b&gt;професійних потреб&lt;/"</div><div class='add'>+"Нижче приведені продукти Mandriva, розроблені для &lt;b&gt;професійних потреб&lt;/"</div><div class='ctx'> "b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Корпоративна станція&lt;/b&gt;, Робоча станція Мандрейклінакс для бізнесу."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr "\t* &lt;b&gt;Корпоративний сервер&lt;/b&gt;, версія Мандрейклінакса для сервера."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Міжмережевий захисний шлюз&lt;/b&gt;, версія Мандрейклінакса з підвищеними "</div><div class='ctx'> "вимогами безпеки."</div><div class='hunk'>@@ -16423,10 +16423,10 @@ msgstr "&lt;b&gt;Виберіть для себе графічну стільницю!</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "З допомогою PowerPack Ви отримаєте можливість вибрати &lt;b&gt;графічну стільницю&lt;/"</div><div class='del'>-"b&gt;. Типово Mandrakesoft вибрав &lt;b&gt;KDE&lt;/b&gt;."</div><div class='add'>+"b&gt;. Типово Mandriva вибрав &lt;b&gt;KDE&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16450,10 +16450,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "З допомогою PowerPack+ Ви отримаєте можливість вибрати &lt;b&gt;графічну "</div><div class='del'>-"стільницю&lt;/b&gt;. Типово Mandrakesoft вибрав &lt;b&gt;KDE&lt;/b&gt;."</div><div class='add'>+"стільницю&lt;/b&gt;. Типово Mandriva вибрав &lt;b&gt;KDE&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16576,7 +16576,7 @@ msgstr "&lt;b&gt;Отримайте задоволення від різноманіт</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "В меню Мандрейклінакса Ви знайдете набір &lt;b&gt;простих у використанні&lt;/b&gt; "</div><div class='hunk'>@@ -16849,14 +16849,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='ctx'> msgstr "&lt;b&gt;Центр керування Мандрейк&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "&lt;b&gt;Центр Керування Мандрейк&lt;/b&gt; є особливою колекцією специфічних для "</div><div class='hunk'>@@ -16885,14 +16885,14 @@ msgstr "&lt;b&gt;Модель Open Source&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Як і все комп'ютерне програмування, програми з відкритим кодом &lt;b&gt;вимагають "</div><div class='ctx'> "часу і людей &lt;/b&gt; для розробки. В дусі філософії програмування з відкритим "</div><div class='del'>-"кодом Mandrakesoft продає додаткові продукти і послуги з метою &lt;b&gt;подальшого "</div><div class='add'>+"кодом Mandriva продає додаткові продукти і послуги з метою &lt;b&gt;подальшого "</div><div class='ctx'> "розвитку Мандрейклінакса&lt;/b&gt;. Якщо Ви бажаєте &lt;b&gt;підтримувати філософію "</div><div class='ctx'> "програмування з відкритим кодом&lt;/b&gt; і розвиток Мандрейклінакса, &lt;b&gt;будь "</div><div class='ctx'> "ласка&lt;/b&gt;, розгляньте можливість придбання одного з наших продуктів чи "</div><div class='hunk'>@@ -16906,10 +16906,10 @@ msgstr "&lt;b&gt;Інтернет-магазин&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Щоб дізнатися більше про продукти і послуги Mandrakesoft, завітайте на нашу "</div><div class='add'>+"Щоб дізнатися більше про продукти і послуги Mandriva, завітайте на нашу "</div><div class='ctx'> "&lt;b&gt;платформу інтернет-комерції&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16935,24 +16935,24 @@ msgstr "Зупиніться сьогодні на &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; є &lt;b&gt;чудовим товаришем&lt;/b&gt; для Вашого продукту "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; є &lt;b&gt;чудовим товаришем&lt;/b&gt; для Вашого продукту "</div><div class='ctx'> "Мандрейклінакс."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Приєднуйтеся до Mandrakeclub і отримайте переваги від &lt;b&gt;численних корисних "</div><div class='add'>+"Приєднуйтеся до Mandriva Club і отримайте переваги від &lt;b&gt;численних корисних "</div><div class='ctx'> "речей&lt;/b&gt;, таких як:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -16974,39 +16974,39 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr "\t* Беріть участь в &lt;b&gt;форумах користувачів&lt;/b&gt; Мандрейклінакса."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Легкий спеціальний доступ&lt;/b&gt; до &lt;b&gt;ISO-образів&lt;/b&gt; Мандрейклінакса "</div><div class='ctx'> "до появи версій для загального звантаження."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; є новою додатковою послугою, яку Mandrakesoft "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; є новою додатковою послугою, яку Mandriva "</div><div class='ctx'> "безкоштовно надає своїм покупцям!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline надає широкий набір послуг для &lt;b&gt;легкого поновлення&lt;/b&gt; "</div><div class='add'>+"Mandriva Online надає широкий набір послуг для &lt;b&gt;легкого поновлення&lt;/b&gt; "</div><div class='ctx'> "системи Мандрейклінакс:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -17032,28 +17032,28 @@ msgstr "\t* Гнучкі &lt;b&gt;розклади&lt;/b&gt; поновлень."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* Керування &lt;b&gt;всіма системами Мандрейклінакс&lt;/b&gt; з однієї реєстрації."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Потрібна &lt;b&gt;допомога&lt;/b&gt;? Зверніться до технічних експертів Mandrakesoft на "</div><div class='add'>+"Потрібна &lt;b&gt;допомога&lt;/b&gt;? Зверніться до технічних експертів Mandriva на "</div><div class='ctx'> "нашій &lt;b&gt;платформі підтримки&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Дякуємо за допомогу &lt;b&gt;кваліфікованим експертам&lt;/b&gt;, Ви можете зекономити "</div><div class='hunk'>@@ -17062,7 +17062,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "З будь-яких питань щодо Мандрейклінакса можна отримати підтримку в &lt;b&gt;store."</div><div class='hunk'>@@ -17365,8 +17365,8 @@ msgstr "Інструменти для слідкування, облік про�</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Помічники Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Помічники Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17517,7 +17517,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17531,7 +17531,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[ПАРАМЕТРИ]...\n"</div><div class='del'>-"Конфігуратор Mandrakelinux Terminal Server\n"</div><div class='add'>+"Конфігуратор Mandrivalinux Terminal Server\n"</div><div class='ctx'> "--enable         : увімкнути MTS\n"</div><div class='ctx'> "--disable        : вимкнути MTS\n"</div><div class='ctx'> "--start          : запустити MTS\n"</div><div class='hunk'>@@ -17589,7 +17589,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17597,7 +17597,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[ПАРАМЕТР]...\n"</div><div class='ctx'> "  --no-confirmation      не запитувати першого підтвердження в режимі "</div><div class='del'>-"MandrakeUpdate\n"</div><div class='add'>+"Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        не перевіряти підписи пакунків\n"</div><div class='ctx'> "  --changelog-first      показувати журнал змін перед списком файлів у вікні "</div><div class='ctx'> "опису\n"</div><div class='hunk'>@@ -20390,12 +20390,12 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Програма створення звітів про помилки Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Програма створення звітів про помилки Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='ctx'> msgstr "Центр керування Мандрейклінакс"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='hunk'>@@ -20416,8 +20416,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20461,8 +20461,8 @@ msgstr "Помічники налаштування"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Виберіть інструмент Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Виберіть інструмент Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20888,7 +20888,7 @@ msgstr "Стартувати при завантаженні"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Цей інтерфейс ще не було сконфігуровано.\n"</div><div class='ctx'> "Запустіть Помічник \"Додати інтерфейс\" Центрі Керування Мандрейк"</div><div class='hunk'>@@ -20897,7 +20897,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "З'єднання з Інтернетом ще не було сконфігуровано.\n"</div><div class='ctx'> "Запустіть Помічника \"%s\" Центрі Керування Мандрейк"</div><div class='hunk'>@@ -20950,7 +20950,7 @@ msgstr "KDM (менеджер дисплею KDE)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr "MdkKDM (Менеджер дисплею Мандрейклінакс)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -21250,7 +21250,7 @@ msgstr "Імпортувати"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21259,7 +21259,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Всі права застережено (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Всі права застережено (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (оригінальна версія)\n"</div><div class='hunk'>@@ -21806,14 +21806,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003 Mandriva.\n"</div><div class='ctx'> "Ця програма безкоштовна і може розповсюджуватися згідно умов Загальної "</div><div class='ctx'> "публічної ліцензії GNU\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21843,7 +21843,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='ctx'> msgstr "Центр довідки Мандрейклінакса"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='hunk'>@@ -25363,8 +25363,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Журнал Mandrakelinux Tools"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Журнал Mandrivalinux Tools"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25879,7 +25879,7 @@ msgstr "З'єднання завершене."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "З'єднання завершилося невдало.\n"</div><div class='ctx'> "Перевірте налаштування в Центрі керування Мандрейк."</div><div class='head'>diff --git a/perl-install/share/po/uz.po b/perl-install/share/po/uz.po<br/>index 1d70c7d90..200e015c9 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/uz.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/uz.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/uz.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/uz.po</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> # translation of DrakX-uz.po to Uzbek</div><div class='ctx'> # Copyright (C) 2003, 2004 Free Software Foundation, Inc.</div><div class='del'>-# Copyright (C) 2003 Mandrakesoft.</div><div class='add'>+# Copyright (C) 2003 Mandriva.</div><div class='ctx'> # Mashrab Kuvatov &lt;kmashrab@uni-bremen.de&gt;, 2003, 2004.</div><div class='ctx'> #</div><div class='ctx'> msgid ""</div><div class='hunk'>@@ -60,7 +60,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -79,7 +79,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -87,7 +87,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -219,7 +219,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1223,7 +1223,7 @@ msgstr "Тилни танлаш"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3509,12 +3509,12 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Давом этишдан олдин лицензиянинг шартларини эътибор билан ўқиб\n"</div><div class='del'>-"чиқинг. Лицензия бутун Mandrakelinux'га тегишли. Агар унинг барча\n"</div><div class='add'>+"чиқинг. Лицензия бутун Mandrivalinux'га тегишли. Агар унинг барча\n"</div><div class='ctx'> "шартларига рози бўлсангиз, \"%s\"ни танланг. Агар рози бўлмасангиз,\n"</div><div class='ctx'> "компьютерни ўчириб-ёқиш учун \"%s\" тугмасини босинг."</div><div class='ctx'> </div><div class='hunk'>@@ -3623,13 +3623,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux бир нечта компакт-дискларда тарқатилади. Агар танланган пакет\n"</div><div class='add'>+"Mandrivalinux бир нечта компакт-дискларда тарқатилади. Агар танланган пакет\n"</div><div class='ctx'> "бошқа компакт-дискда жойлашган бўлса, DrakX жорий компакт-дискни\n"</div><div class='ctx'> "чиқаради ва тегишлисини қўйишни сўрайди. Агар сўралган компакт-диск сизда\n"</div><div class='ctx'> "бўлмаса, \"%s\" тугмасини босинг. Бу ҳолда, тегишли пакетлар ўрнатилмайди."</div><div class='hunk'>@@ -3638,11 +3638,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3749,10 +3749,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3866,7 +3866,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -3969,12 +3969,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4001,7 +4001,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4010,7 +4010,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4139,7 +4139,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4157,7 +4157,7 @@ msgstr "Олдинги"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4186,7 +4186,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4202,7 +4202,7 @@ msgstr "Хавфсизлик бошқарувчиси"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4288,7 +4288,7 @@ msgstr "Одий/эксперт усулига ўтиш"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4333,7 +4333,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4342,13 +4342,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4389,7 +4389,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4548,7 +4548,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4569,7 +4569,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4672,7 +4672,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4689,7 +4689,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4751,7 +4751,7 @@ msgstr "Хизматлар"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5084,7 +5084,7 @@ msgstr "Дискнинг Windows қисмининг ҳажми ҳисоблан�</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5193,19 +5193,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5227,7 +5227,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5235,14 +5235,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5252,7 +5252,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5272,10 +5272,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5286,11 +5286,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5306,14 +5306,14 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Кириш\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux дистрибутивида мавжуд бўлган операцион тизим ва унинг турли "</div><div class='add'>+"Mandrivalinux дистрибутивида мавжуд бўлган операцион тизим ва унинг турли "</div><div class='ctx'> "қисмлари \n"</div><div class='ctx'> "бундан буён \"Дастурий Маҳсулотлар\" деб юритилади. Дастурий маҳсулотлар \n"</div><div class='del'>-"Mandrakelinux дистрибутивнинг қисмлари ва операцион тизим билан боғлиқ "</div><div class='add'>+"Mandrivalinux дистрибутивнинг қисмлари ва операцион тизим билан боғлиқ "</div><div class='ctx'> "бўлган\n"</div><div class='ctx'> "дастурлар тўплами, усуллар, қоидалар ва қўлланмаларни ўз ичига олади, аммо "</div><div class='ctx'> "бу билан чекланмайди.\n"</div><div class='hunk'>@@ -5322,7 +5322,7 @@ msgstr ""</div><div class='ctx'> "1. Лицензия келишуви\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Илтимос, ушбу ҳужжатни диққат билан ўқиб чиқинг. Бу ҳужжат Сиз билан "</div><div class='del'>-"Mandrakesoft S.A. \n"</div><div class='add'>+"Mandriva S.A. \n"</div><div class='ctx'> "ўртасида Дастурий Маҳсулотлари бўйича имзоланадиган лицензия келишувидир.\n"</div><div class='ctx'> "Дастурий Маҳсулотларни ҳар қандай мақсад билан ўрнатиб, кўпайтириб ёки \n"</div><div class='ctx'> "улардан фойдаланиб Сиз мазкур Лицензиянинг шартлари ва қоидаларини тўлиқ "</div><div class='hunk'>@@ -5344,7 +5344,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Дастурий Маҳсулотлар ва уларга илова қилинган қўлланмалар \"ўз ҳолича\", "</div><div class='ctx'> "қонунда йўл қўйилган\n"</div><div class='del'>-"даражада ҳеч қандай кафолатларсиз тақдим қилинади. Mandrakesoft S.A. қонунда "</div><div class='add'>+"даражада ҳеч қандай кафолатларсиз тақдим қилинади. Mandriva S.A. қонунда "</div><div class='ctx'> "йўл қўйилган\n"</div><div class='ctx'> "даражада ҳеч қандай ҳолатда Дастурий Маҳсулотлардан фойдаланиш ёки "</div><div class='ctx'> "фойдаланмаслик оқибатида\n"</div><div class='hunk'>@@ -5353,19 +5353,19 @@ msgstr ""</div><div class='ctx'> "касод бўлиши, тижорат фаолиятидаги узилишлар, молиявий зарарлар, суд "</div><div class='ctx'> "маҳкамалари натижасидаги\n"</div><div class='ctx'> "суд харажатлари ёки жарималар ёки бошқа ҳар қандай билвосита йўқотишлар) "</div><div class='del'>-"учун, ҳатто Mandrakesoft S.A.'га\n"</div><div class='add'>+"учун, ҳатто Mandriva S.A.'га\n"</div><div class='ctx'> "шундай зарар кўриш имконияти ёки ҳолатлари маълум бўлган тақдирда ҳам,\n"</div><div class='ctx'> "жавобгар бўлмайди.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "БАЪЗИ МАМЛАКАТЛАРДА МАН ҚИЛИНГАН ДАСТУРИЙ МАҲСУЛОТЛАРГА ЭГАЛИК ҚИЛИШ\n"</div><div class='ctx'> "ЁКИ УЛАРДАН ФОЙДАЛАНИШ БИЛАН БОҒЛИҚ ЧЕКЛАНГАН МАСЪУЛИЯТ\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakesoft S.A. ёки унинг тарқатувчилари қонунда йўл қўйилган даражада ҳеч "</div><div class='add'>+"Mandriva S.A. ёки унинг тарқатувчилари қонунда йўл қўйилган даражада ҳеч "</div><div class='ctx'> "қандай ҳолатда\n"</div><div class='ctx'> "баъзи мамлакатларнинг маҳаллий қонунлари билан чекланган ёки ман қилинган "</div><div class='ctx'> "дастурий\n"</div><div class='ctx'> "маҳсулотларнинг қисмларига эгалик қилиш ва улардан фойдаланиш, ёки "</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "сайтларининг биридан дастурий маҳсулотнинг қисмларини кўчириб олиш оқибатида "</div><div class='ctx'> "тасодифий,\n"</div><div class='ctx'> "тўғридан-тўғри, бевосита ёки билвосита етказилган зарарлар (шу жумладан "</div><div class='hunk'>@@ -5393,11 +5393,11 @@ msgstr ""</div><div class='ctx'> "ҳар бири\n"</div><div class='ctx'> "учун лицензия келишувининг шартлари ва қоидаларини диққат билан ўқиб чиқинг. "</div><div class='ctx'> "Қисмнинг\n"</div><div class='del'>-"лицензиясига оид ҳар қандай саволлар Mandrakesoft'га эмас, балки қисмнинг "</div><div class='add'>+"лицензиясига оид ҳар қандай саволлар Mandriva'га эмас, балки қисмнинг "</div><div class='ctx'> "муаллифига юборилиши\n"</div><div class='del'>-"лозим. Mandrakesoft S.A. томонидан ишлаб чиқилган дастурлар GPL лицензияси "</div><div class='add'>+"лозим. Mandriva S.A. томонидан ишлаб чиқилган дастурлар GPL лицензияси "</div><div class='ctx'> "таъсири\n"</div><div class='del'>-"остидадир. Mandrakesoft S.A. томонидан ёзилган қўлланмалар эса махсус "</div><div class='add'>+"остидадир. Mandriva S.A. томонидан ёзилган қўлланмалар эса махсус "</div><div class='ctx'> "лицензия таъсири\n"</div><div class='ctx'> "остидадир. Илтимос, қўшимча маълумот учун қўлланмаларга мурожаат қилинг.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5408,12 +5408,12 @@ msgstr ""</div><div class='ctx'> "муаллифларига\n"</div><div class='ctx'> "тегишли бўлиб, интеллектуал мулк ва дастурий маҳсулотларга оид муаллифлик "</div><div class='ctx'> "ҳуқуқи\n"</div><div class='del'>-"тўғрисидаги қонунлар билан ҳимояланади. Mandrakesoft S.A. Дастурий "</div><div class='add'>+"тўғрисидаги қонунлар билан ҳимояланади. Mandriva S.A. Дастурий "</div><div class='ctx'> "Маҳсулотларни тўлиқ\n"</div><div class='ctx'> "ёки қисман, ҳар қандай йўл билан ва исталган мақсадларда ўзгартириш ёки "</div><div class='ctx'> "мослаштириш ҳуқуқини\n"</div><div class='del'>-"ўзида сақлаб қолади. \"Mandrake\", \"Mandrakelinux\" ва тегишли белгилар "</div><div class='del'>-"Mandrakesoft S.A.'га\n"</div><div class='add'>+"ўзида сақлаб қолади. \"Mandriva\", \"Mandrivalinux\" ва тегишли белгилар "</div><div class='add'>+"Mandriva S.A.'га\n"</div><div class='ctx'> "тегишли савдо белгиларидир.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5431,7 +5431,7 @@ msgstr ""</div><div class='ctx'> "судда муҳокама қилинади.\n"</div><div class='ctx'> "Сўнгги навбатда масаланинг кўрилиши тегишли Париж (Франция) Қонунчилик "</div><div class='ctx'> "судига ҳавола қилинади.\n"</div><div class='del'>-"Илтимос, мазкур ҳужжатга оид ҳар қандай саволлар бўйича Mandrakesoft S.A. "</div><div class='add'>+"Илтимос, мазкур ҳужжатга оид ҳар қандай саволлар бўйича Mandriva S.A. "</div><div class='ctx'> "билан боғланинг.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5488,7 +5488,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5496,21 +5496,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Табриклаймиз! Ўрнатиш тугади.\n"</div><div class='ctx'> "Юкловчи манбани олиб ташланг ва компьютерни\n"</div><div class='ctx'> "ўчириб-ёқиш учун ENTER тугмасини босинг.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux'ниниг бу версияси учун янгиланишлар ҳақида\n"</div><div class='add'>+"Mandrivalinux'ниниг бу версияси учун янгиланишлар ҳақида\n"</div><div class='ctx'> "маълумот қуйидаги Errata веб-саҳифасида мавжуд:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Тизимни мослаш ҳақида маълумот Mandrakelinux\n"</div><div class='add'>+"Тизимни мослаш ҳақида маълумот Mandrivalinux\n"</div><div class='ctx'> "фойдаланувчилари учун расмий қўлланмасида мавжуд."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5546,7 +5546,7 @@ msgstr "%s босқичга ўтилмоқда\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -6069,7 +6069,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6283,8 +6283,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux'ни ўрнатиш %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux'ни ўрнатиш %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -8857,7 +8857,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12623,7 +12623,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14328,18 +14328,18 @@ msgstr "Тўхтатиш"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux нима?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux нима?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux&lt;/b&gt; тизимига марҳамат!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux&lt;/b&gt; тизимига марҳамат!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14348,7 +14348,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14365,12 +14365,12 @@ msgstr "&lt;b&gt;Open Source&lt;/b&gt; оламига марҳамат!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux операцион тизими ва унинг кўплаб дастурлари Mandrakesoft "</div><div class='add'>+"Mandrivalinux операцион тизими ва унинг кўплаб дастурлари Mandriva "</div><div class='ctx'> "тузувчилари ва бутун олам бўйлаб ҳисса қўшувчилар ҳамкорликда бажарган иш "</div><div class='ctx'> "натижасидир."</div><div class='ctx'> </div><div class='hunk'>@@ -14392,7 +14392,7 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14418,10 +14418,10 @@ msgstr "&lt;b&gt;Бирлашмага қўшилинг&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14440,8 +14440,8 @@ msgstr "&lt;b&gt;Download&lt;/b&gt; версия"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14468,7 +14468,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14478,7 +14478,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14497,13 +14497,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14515,7 +14515,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14529,19 +14529,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft маҳсулотлари&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva маҳсулотлари&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14562,61 +14562,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14654,7 +14654,7 @@ msgstr "&lt;b&gt;Сизга мос келган график иш столини та�</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14675,7 +14675,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14793,10 +14793,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux менюсидан &lt;b&gt;барча вазифалар&lt;/b&gt; учун &lt;b&gt;қулай дастурларни&lt;/b&gt; "</div><div class='add'>+"Mandrivalinux менюсидан &lt;b&gt;барча вазифалар&lt;/b&gt; учун &lt;b&gt;қулай дастурларни&lt;/b&gt; "</div><div class='ctx'> "топса бўлади:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -15039,14 +15039,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux бошқарув маркази&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux бошқарув маркази&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15068,9 +15068,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15082,7 +15082,7 @@ msgstr "&lt;b&gt;Интернет дўкон&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15105,20 +15105,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15137,33 +15137,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr "\t* Онлайн сухбатда &lt;b&gt;Kopete&lt;/b&gt; ёрдамида қатнашинг"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -15186,32 +15186,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15510,8 +15510,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft ёрдамчилари"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva ёрдамчилари"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15606,7 +15606,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15654,7 +15654,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -18156,13 +18156,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux учун хато ҳақида хабар қилувчи восита"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux учун хато ҳақида хабар қилувчи восита"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux бошқарув маркази"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux бошқарув маркази"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18182,8 +18182,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18227,7 +18227,7 @@ msgstr "Мослаш ёрдамчилари"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18644,20 +18644,20 @@ msgstr "Тизим юкланганда ишга туширилган"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Бу интерфейс ҳали мослангани йўқ.\n"</div><div class='del'>-"Mandrakelinux бошқарув марказидан \"Интерфейсни қўшиш\" ёрдамчини ишга "</div><div class='add'>+"Mandrivalinux бошқарув марказидан \"Интерфейсни қўшиш\" ёрдамчини ишга "</div><div class='ctx'> "туширинг"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Интернет билан алоқа мосланмаган.\n"</div><div class='del'>-"Mandrakelinux бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"</div><div class='add'>+"Mandrivalinux бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -18707,7 +18707,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -18992,7 +18992,7 @@ msgstr "Импорт қилиш"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19460,14 +19460,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Фойдаланиш:\n"</div><div class='hunk'>@@ -19492,8 +19492,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux ёрдам маркази"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux ёрдам маркази"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -22391,7 +22391,7 @@ msgid ""</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"HardDrake - Mandrakelinux учун асбоб-ускуналарни мословчи восита.\n"</div><div class='add'>+"HardDrake - Mandrivalinux учун асбоб-ускуналарни мословчи восита.\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Версия:&lt;/span&gt; %s\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Муаллиф:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -22506,8 +22506,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux бошқарув маркази"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux бошқарув маркази"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -23016,10 +23016,10 @@ msgstr "Алоқа ўрнатилди."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Алоқа ўрнатиш муваффақиятсиз тугади.\n"</div><div class='del'>-"Мосламани Mandrakelinux бошқарув марказида текширинг."</div><div class='add'>+"Мосламани Mandrivalinux бошқарув марказида текширинг."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -23870,8 +23870,8 @@ msgstr "Ўрнатиш муваффақиятсиз тугади"</div><div class='ctx'> #~ msgstr "Сиз ҳеч қандай шрифтни танламадингиз"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Mandrakesoft ёрдамчилари"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Mandriva ёрдамчилари"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Ҳеч қандай браузер мавжуд эмас! Илтимос бирортасини ўрнатинг"</div><div class='head'>diff --git a/perl-install/share/po/uz@Latn.po b/perl-install/share/po/uz@Latn.po<br/>index 1a567c028..e0e46522e 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/uz@Latn.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/uz@Latn.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/uz@Latn.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/uz@Latn.po</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> # translation of DrakX-uz.po to Uzbek</div><div class='ctx'> # Copyright (C) 2003, 2004 Free Software Foundation, Inc.</div><div class='del'>-# Copyright (C) 2003 Mandrakesoft.</div><div class='add'>+# Copyright (C) 2003 Mandriva.</div><div class='ctx'> # Mashrab Kuvatov &lt;kmashrab@uni-bremen.de&gt;, 2003, 2004.</div><div class='ctx'> #</div><div class='ctx'> msgid ""</div><div class='hunk'>@@ -60,7 +60,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='hunk'>@@ -79,7 +79,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -87,7 +87,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -95,7 +95,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -219,7 +219,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1223,7 +1223,7 @@ msgstr "Tilni tanlash"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3516,12 +3516,12 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Davom etishdan oldin litsenziyaning shartlarini e'tibor bilan o'qib\n"</div><div class='del'>-"chiqing. Litsenziya butun Mandrakelinux'ga tegishli. Agar uning barcha\n"</div><div class='add'>+"chiqing. Litsenziya butun Mandrivalinux'ga tegishli. Agar uning barcha\n"</div><div class='ctx'> "shartlariga rozi bo'lsangiz, \"%s\"ni tanlang. Agar rozi bo'lmasangiz,\n"</div><div class='ctx'> "kompyuterni o'chirib-yoqish uchun \"%s\" tugmasini bosing."</div><div class='ctx'> </div><div class='hunk'>@@ -3630,13 +3630,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux bir nechta kompakt-disklarda tarqatiladi. Agar tanlangan "</div><div class='add'>+"Mandrivalinux bir nechta kompakt-disklarda tarqatiladi. Agar tanlangan "</div><div class='ctx'> "paket\n"</div><div class='ctx'> "boshqa kompakt-diskda joylashgan bo'lsa, DrakX joriy kompakt-diskni\n"</div><div class='ctx'> "chiqaradi va tegishlisini qo'yishni so'raydi. Agar so'ralgan kompakt-disk "</div><div class='hunk'>@@ -3647,11 +3647,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3758,10 +3758,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -3875,7 +3875,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -3978,12 +3978,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4010,7 +4010,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4019,7 +4019,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4148,7 +4148,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4166,7 +4166,7 @@ msgstr "Oldingi"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4195,7 +4195,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4211,7 +4211,7 @@ msgstr "Xavfsizlik boshqaruvchisi"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4297,7 +4297,7 @@ msgstr "Odiy/ekspert usuliga o'tish"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4342,7 +4342,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4351,13 +4351,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4398,7 +4398,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4557,7 +4557,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -4578,7 +4578,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -4681,7 +4681,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -4698,7 +4698,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -4760,7 +4760,7 @@ msgstr "Xizmatlar"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5093,7 +5093,7 @@ msgstr "Diskning Windows qismining hajmi hisoblanmoqda"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -5202,19 +5202,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5236,7 +5236,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5244,14 +5244,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5261,7 +5261,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5281,10 +5281,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5295,11 +5295,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5315,14 +5315,14 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Kirish\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux distributivida mavjud bo'lgan operatsion tizim va uning turli "</div><div class='add'>+"Mandrivalinux distributivida mavjud bo'lgan operatsion tizim va uning turli "</div><div class='ctx'> "qismlari \n"</div><div class='ctx'> "bundan buyon \"Dasturiy Mahsulotlar\" deb yuritiladi. Dasturiy mahsulotlar \n"</div><div class='del'>-"Mandrakelinux distributivning qismlari va operatsion tizim bilan bog'liq "</div><div class='add'>+"Mandrivalinux distributivning qismlari va operatsion tizim bilan bog'liq "</div><div class='ctx'> "bo'lgan\n"</div><div class='ctx'> "dasturlar to'plami, usullar, qoidalar va qo'llanmalarni o'z ichiga oladi, "</div><div class='ctx'> "ammo bu bilan cheklanmaydi.\n"</div><div class='hunk'>@@ -5331,7 +5331,7 @@ msgstr ""</div><div class='ctx'> "1. Litsenziya kelishuvi\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Iltimos, ushbu hujjatni diqqat bilan o'qib chiqing. Bu hujjat Siz bilan "</div><div class='del'>-"Mandrakesoft S.A. \n"</div><div class='add'>+"Mandriva S.A. \n"</div><div class='ctx'> "o'rtasida Dasturiy Mahsulotlari bo'yicha imzolanadigan litsenziya "</div><div class='ctx'> "kelishuvidir.\n"</div><div class='ctx'> "Dasturiy Mahsulotlarni har qanday maqsad bilan o'rnatib, ko'paytirib yoki \n"</div><div class='hunk'>@@ -5355,7 +5355,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Dasturiy Mahsulotlar va ularga ilova qilingan qo'llanmalar \"o'z holicha\", "</div><div class='ctx'> "qonunda yo'l qo'yilgan\n"</div><div class='del'>-"darajada hech qanday kafolatlarsiz taqdim qilinadi. Mandrakesoft S.A. "</div><div class='add'>+"darajada hech qanday kafolatlarsiz taqdim qilinadi. Mandriva S.A. "</div><div class='ctx'> "qonunda yo'l qo'yilgan\n"</div><div class='ctx'> "darajada hech qanday holatda Dasturiy Mahsulotlardan foydalanish yoki "</div><div class='ctx'> "foydalanmaslik oqibatida\n"</div><div class='hunk'>@@ -5364,7 +5364,7 @@ msgstr ""</div><div class='ctx'> "kasod bo'lishi, tijorat faoliyatidagi uzilishlar, moliyaviy zararlar, sud "</div><div class='ctx'> "mahkamalari natijasidagi\n"</div><div class='ctx'> "sud xarajatlari yoki jarimalar yoki boshqa har qanday bilvosita "</div><div class='del'>-"yo'qotishlar) uchun, hatto Mandrakesoft S.A.'ga\n"</div><div class='add'>+"yo'qotishlar) uchun, hatto Mandriva S.A.'ga\n"</div><div class='ctx'> "shunday zarar ko'rish imkoniyati yoki holatlari ma'lum bo'lgan taqdirda "</div><div class='ctx'> "ham,\n"</div><div class='ctx'> "javobgar bo'lmaydi.\n"</div><div class='hunk'>@@ -5372,12 +5372,12 @@ msgstr ""</div><div class='ctx'> "BA'ZI MAMLAKATLARDA MAN QILINGAN DASTURIY MAHSULOTLARGA EGALIK QILISh\n"</div><div class='ctx'> "YoKI ULARDAN FOYDALANISh BILAN BOG'LIQ ChEKLANGAN MAS'ULIYaT\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakesoft S.A. yoki uning tarqatuvchilari qonunda yo'l qo'yilgan darajada "</div><div class='add'>+"Mandriva S.A. yoki uning tarqatuvchilari qonunda yo'l qo'yilgan darajada "</div><div class='ctx'> "hech qanday holatda\n"</div><div class='ctx'> "ba'zi mamlakatlarning mahalliy qonunlari bilan cheklangan yoki man qilingan "</div><div class='ctx'> "dasturiy\n"</div><div class='ctx'> "mahsulotlarning qismlariga egalik qilish va ulardan foydalanish, yoki "</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "saytlarining biridan dasturiy mahsulotning qismlarini ko'chirib olish "</div><div class='ctx'> "oqibatida tasodifiy,\n"</div><div class='ctx'> "to'g'ridan-to'g'ri, bevosita yoki bilvosita etkazilgan zararlar (shu "</div><div class='hunk'>@@ -5405,11 +5405,11 @@ msgstr ""</div><div class='ctx'> "qismlarning har biri\n"</div><div class='ctx'> "uchun litsenziya kelishuvining shartlari va qoidalarini diqqat bilan o'qib "</div><div class='ctx'> "chiqing. Qismning\n"</div><div class='del'>-"litsenziyasiga oid har qanday savollar Mandrakesoft'ga emas, balki qismning "</div><div class='add'>+"litsenziyasiga oid har qanday savollar Mandriva'ga emas, balki qismning "</div><div class='ctx'> "muallifiga yuborilishi\n"</div><div class='del'>-"lozim. Mandrakesoft S.A. tomonidan ishlab chiqilgan dasturlar GPL "</div><div class='add'>+"lozim. Mandriva S.A. tomonidan ishlab chiqilgan dasturlar GPL "</div><div class='ctx'> "litsenziyasi ta'siri\n"</div><div class='del'>-"ostidadir. Mandrakesoft S.A. tomonidan yozilgan qo'llanmalar esa maxsus "</div><div class='add'>+"ostidadir. Mandriva S.A. tomonidan yozilgan qo'llanmalar esa maxsus "</div><div class='ctx'> "litsenziya ta'siri\n"</div><div class='ctx'> "ostidadir. Iltimos, qo'shimcha ma'lumot uchun qo'llanmalarga murojaat "</div><div class='ctx'> "qiling.\n"</div><div class='hunk'>@@ -5421,12 +5421,12 @@ msgstr ""</div><div class='ctx'> "mualliflariga\n"</div><div class='ctx'> "tegishli bo'lib, intellektual mulk va dasturiy mahsulotlarga oid mualliflik "</div><div class='ctx'> "huquqi\n"</div><div class='del'>-"to'g'risidagi qonunlar bilan himoyalanadi. Mandrakesoft S.A. Dasturiy "</div><div class='add'>+"to'g'risidagi qonunlar bilan himoyalanadi. Mandriva S.A. Dasturiy "</div><div class='ctx'> "Mahsulotlarni to'liq\n"</div><div class='ctx'> "yoki qisman, har qanday yo'l bilan va istalgan maqsadlarda o'zgartirish yoki "</div><div class='ctx'> "moslashtirish huquqini\n"</div><div class='del'>-"o'zida saqlab qoladi. \"Mandrake\", \"Mandrakelinux\" va tegishli belgilar "</div><div class='del'>-"Mandrakesoft S.A.'ga\n"</div><div class='add'>+"o'zida saqlab qoladi. \"Mandriva\", \"Mandrivalinux\" va tegishli belgilar "</div><div class='add'>+"Mandriva S.A.'ga\n"</div><div class='ctx'> "tegishli savdo belgilaridir.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5444,7 +5444,7 @@ msgstr ""</div><div class='ctx'> "sudda muhokama qilinadi.\n"</div><div class='ctx'> "So'nggi navbatda masalaning ko'rilishi tegishli Parij (Frantsiya) "</div><div class='ctx'> "Qonunchilik sudiga havola qilinadi.\n"</div><div class='del'>-"Iltimos, mazkur hujjatga oid har qanday savollar bo'yicha Mandrakesoft S.A. "</div><div class='add'>+"Iltimos, mazkur hujjatga oid har qanday savollar bo'yicha Mandriva S.A. "</div><div class='ctx'> "bilan bog'laning.\n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5501,7 +5501,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5509,21 +5509,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tabriklaymiz! O'rnatish tugadi.\n"</div><div class='ctx'> "Yuklovchi manbani olib tashlang va kompyuterni\n"</div><div class='ctx'> "o'chirib-yoqish uchun ENTER tugmasini bosing.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux'ninig bu versiyasi uchun yangilanishlar haqida\n"</div><div class='add'>+"Mandrivalinux'ninig bu versiyasi uchun yangilanishlar haqida\n"</div><div class='ctx'> "ma'lumot quyidagi Errata veb-sahifasida mavjud:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Tizimni moslash haqida ma'lumot Mandrakelinux\n"</div><div class='add'>+"Tizimni moslash haqida ma'lumot Mandrivalinux\n"</div><div class='ctx'> "foydalanuvchilari uchun rasmiy qo'llanmasida mavjud."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5559,7 +5559,7 @@ msgstr "%s bosqichga o'tilmoqda\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -6083,7 +6083,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6297,8 +6297,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux'ni o'rnatish %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux'ni o'rnatish %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -8872,7 +8872,7 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -12649,7 +12649,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14360,18 +14360,18 @@ msgstr "To'xtatish"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux nima?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux nima?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux&lt;/b&gt; tizimiga marhamat!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux&lt;/b&gt; tizimiga marhamat!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14380,7 +14380,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14397,12 +14397,12 @@ msgstr "&lt;b&gt;Open Source&lt;/b&gt; olamiga marhamat!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux operatsion tizimi va uning ko'plab dasturlari Mandrakesoft "</div><div class='add'>+"Mandrivalinux operatsion tizimi va uning ko'plab dasturlari Mandriva "</div><div class='ctx'> "tuzuvchilari va butun olam bo'ylab hissa qo'shuvchilar hamkorlikda bajargan "</div><div class='ctx'> "ish natijasidir."</div><div class='ctx'> </div><div class='hunk'>@@ -14424,7 +14424,7 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -14450,10 +14450,10 @@ msgstr "&lt;b&gt;Birlashmaga qo'shiling&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -14472,8 +14472,8 @@ msgstr "&lt;b&gt;Download&lt;/b&gt; versiya"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -14500,7 +14500,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -14510,7 +14510,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -14529,13 +14529,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14547,7 +14547,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -14561,19 +14561,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft mahsulotlari&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva mahsulotlari&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -14594,61 +14594,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -14686,7 +14686,7 @@ msgstr "&lt;b&gt;Sizga mos kelgan grafik ish stolini tanlang&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -14707,7 +14707,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -14825,10 +14825,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux menyusidan &lt;b&gt;barcha vazifalar&lt;/b&gt; uchun &lt;b&gt;qulay dasturlarni&lt;/"</div><div class='add'>+"Mandrivalinux menyusidan &lt;b&gt;barcha vazifalar&lt;/b&gt; uchun &lt;b&gt;qulay dasturlarni&lt;/"</div><div class='ctx'> "b&gt; topsa bo'ladi:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -15072,14 +15072,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux boshqaruv markazi&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux boshqaruv markazi&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15101,9 +15101,9 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15115,7 +15115,7 @@ msgstr "&lt;b&gt;Internet do'kon&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15138,20 +15138,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15170,33 +15170,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr "\t* Onlayn suxbatda &lt;b&gt;Kopete&lt;/b&gt; yordamida qatnashing"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -15219,32 +15219,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15543,8 +15543,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft yordamchilari"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva yordamchilari"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15639,7 +15639,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -15687,7 +15687,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -18193,13 +18193,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux uchun xato haqida xabar qiluvchi vosita"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux uchun xato haqida xabar qiluvchi vosita"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux boshqaruv markazi"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux boshqaruv markazi"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18219,8 +18219,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -18264,7 +18264,7 @@ msgstr "Moslash yordamchilari"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='hunk'>@@ -18681,20 +18681,20 @@ msgstr "Tizim yuklanganda ishga tushirilgan"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bu interfeys hali moslangani yo'q.\n"</div><div class='del'>-"Mandrakelinux boshqaruv markazidan \"Interfeysni qo'shish\" yordamchini "</div><div class='add'>+"Mandrivalinux boshqaruv markazidan \"Interfeysni qo'shish\" yordamchini "</div><div class='ctx'> "ishga tushiring"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Internet bilan aloqa moslanmagan.\n"</div><div class='del'>-"Mandrakelinux boshqaruv markazidan \"%s\" yordamchini ishga tushiring"</div><div class='add'>+"Mandrivalinux boshqaruv markazidan \"%s\" yordamchini ishga tushiring"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -18744,7 +18744,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='hunk'>@@ -19030,7 +19030,7 @@ msgstr "Import qilish"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -19501,14 +19501,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Foydalanish:\n"</div><div class='hunk'>@@ -19533,8 +19533,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux yordam markazi"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux yordam markazi"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -22433,7 +22433,7 @@ msgid ""</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"HardDrake - Mandrakelinux uchun asbob-uskunalarni moslovchi vosita.\n"</div><div class='add'>+"HardDrake - Mandrivalinux uchun asbob-uskunalarni moslovchi vosita.\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Versiya:&lt;/span&gt; %s\n"</div><div class='ctx'> "&lt;span foreground=\"royalblue3\"&gt;Muallif:&lt;/span&gt; Thierry Vignaud &amp;lt;"</div><div class='ctx'> "tvignaud@mandrakesoft.com&amp;gt;\n"</div><div class='hunk'>@@ -22548,8 +22548,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux boshqaruv markazi"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux boshqaruv markazi"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -23058,10 +23058,10 @@ msgstr "Aloqa o'rnatildi."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Aloqa o'rnatish muvaffaqiyatsiz tugadi.\n"</div><div class='del'>-"Moslamani Mandrakelinux boshqaruv markazida tekshiring."</div><div class='add'>+"Moslamani Mandrivalinux boshqaruv markazida tekshiring."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -23914,8 +23914,8 @@ msgstr "O'rnatish muvaffaqiyatsiz tugadi"</div><div class='ctx'> #~ msgstr "Siz hech qanday shriftni tanlamadingiz"</div><div class='ctx'> </div><div class='ctx'> #, fuzzy</div><div class='del'>-#~ msgid "MandrakeSoft Wizards"</div><div class='del'>-#~ msgstr "Mandrakesoft yordamchilari"</div><div class='add'>+#~ msgid "Mandriva Wizards"</div><div class='add'>+#~ msgstr "Mandriva yordamchilari"</div><div class='ctx'> </div><div class='ctx'> #~ msgid "No browser available! Please install one"</div><div class='ctx'> #~ msgstr "Hech qanday brauzer mavjud emas! Iltimos birortasini o'rnating"</div><div class='head'>diff --git a/perl-install/share/po/vi.po b/perl-install/share/po/vi.po<br/>index 1e5188fb5..bf6b6b998 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/vi.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/vi.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/vi.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/vi.po</a></div><div class='hunk'>@@ -66,14 +66,14 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Có vẻ như USB key bị khoá chế độ ghi nhưng vẫn không thể rút ra\n"</div><div class='ctx'> "nó một cách an toàn.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Hãy khởi động lại máy tính, rút USB key ra, mở khoá chống ghi,\n"</div><div class='del'>-"cắm lại USB key vào máy và chạy lại Mandrake Move."</div><div class='add'>+"cắm lại USB key vào máy và chạy lại Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -91,7 +91,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB key của bạn không có phân vùng FAT hợp lệ nào.\n"</div><div class='hunk'>@@ -101,14 +101,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Bạn cũng có thể hoạt động mà không cần USB key - bạn còn\n"</div><div class='del'>-"có thể dùng Mandrake Move như một Hệ Điều Hành Mandrake\n"</div><div class='add'>+"có thể dùng Mandriva Move như một Hệ Điều Hành Mandrake\n"</div><div class='ctx'> "thực thụ."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -116,11 +116,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Không dò tìm được USB key nào trong hệ thống. Nếu bạn\n"</div><div class='del'>-"nối một USB key bây giờ, Mandrake Move sẽ có thể\n"</div><div class='add'>+"nối một USB key bây giờ, Mandriva Move sẽ có thể\n"</div><div class='ctx'> "sao chép toàn bộ dữ liệu vào thư mục home của bạn và\n"</div><div class='ctx'> "cấu hình toàn bộ hệ thống, phục vụ cho lần khởi động lại tiếp theo trên máy "</div><div class='ctx'> "tính này\n"</div><div class='hunk'>@@ -129,7 +129,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Bạn cũng có thể tiếp tục mà không cần USB key - bạn vẫn\n"</div><div class='del'>-"có thể dùng Mandrake Move như một Hệ Điều Hành Mandrake\n"</div><div class='add'>+"có thể dùng Mandriva Move như một Hệ Điều Hành Mandrake\n"</div><div class='ctx'> "thực thụ."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -256,7 +256,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -272,7 +272,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Lỗi này có thể do tập tin cấu hình hệ thống trên USB key hỏng.\n"</div><div class='ctx'> "Trong trường hợp này, hãy xoá bỏ chúng rồi sau đó khởi động lại\n"</div><div class='del'>-"Mandrake Move có thể giải quyết được vấn đề. Để làm vậy, hãy\n"</div><div class='add'>+"Mandriva Move có thể giải quyết được vấn đề. Để làm vậy, hãy\n"</div><div class='ctx'> "nhấn nút tương ứng.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1303,11 +1303,11 @@ msgstr "Chọn ngôn ngữ"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux có khả năng hỗ trợ đa ngôn ngữ. Hãy chọn\n"</div><div class='add'>+"Mandrivalinux có khả năng hỗ trợ đa ngôn ngữ. Hãy chọn\n"</div><div class='ctx'> "các ngôn ngữ mà bạn muốn cài đặt. Chúng sẽ sẵn có để dùng\n"</div><div class='ctx'> "khi hoàn thành cài đặt và khởi động lại hệ thống."</div><div class='ctx'> </div><div class='hunk'>@@ -3711,12 +3711,12 @@ msgstr "bật hỗ trợ radio"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Trước khi tiếp tục, hãy đọc kỹ các điều khoản ghi trong bản quyền.\n"</div><div class='del'>-"Nó bao xuyên suốt toàn bộ phân phối Mandrakelinux. Nếu đồng ý với\n"</div><div class='add'>+"Nó bao xuyên suốt toàn bộ phân phối Mandrivalinux. Nếu đồng ý với\n"</div><div class='ctx'> "mọi điều khoản trong đó, nhấn vào hộp kiểm \"%s\". Nếu không, hãy\n"</div><div class='ctx'> "nhấn nút \"%s\" để khởi động lại máy tính."</div><div class='ctx'> </div><div class='hunk'>@@ -3888,7 +3888,7 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='hunk'>@@ -3903,11 +3903,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3959,11 +3959,11 @@ msgid ""</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bây giờ là lúc chỉ ra chương trình nào mà bạn muốn cài đặt vào hệ thống.\n"</div><div class='del'>-"Hiện có hàng nghìn gói tin dùng cho Mandrakelinux và được tổ chức theo\n"</div><div class='add'>+"Hiện có hàng nghìn gói tin dùng cho Mandrivalinux và được tổ chức theo\n"</div><div class='ctx'> "nhóm các ứng dụng giống nhau để dễ dàng quản lý.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Các gói phần mềm được xếp loại theo các nhóm tương ứng với việc sử dụng\n"</div><div class='del'>-"cụ thể cho máy tính. Mandrakelinux có 4 kiểu cài đặt sẵn với nhiều loại gói "</div><div class='add'>+"cụ thể cho máy tính. Mandrivalinux có 4 kiểu cài đặt sẵn với nhiều loại gói "</div><div class='ctx'> "tin.\n"</div><div class='ctx'> "Bạn có thể chọn dùng các ứng dụng pha trộn của các kiểu cài đặt này, ví dụ\n"</div><div class='ctx'> "như cài đặt kiểu ``Máy trạm'' cùng với việc cài các ứng dụng của kiểu cài\n"</div><div class='hunk'>@@ -4069,10 +4069,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4102,7 +4102,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Nếu các gói tin cho server được chọn cố tình hoặc do nó là thành\n"</div><div class='ctx'> "phần của một nhóm, bạn sẽ được hỏi để khẳng định là bạn thật sự\n"</div><div class='del'>-"muốn những server này được cài đặt. Trong Mandrakelinux, bất kỳ\n"</div><div class='add'>+"muốn những server này được cài đặt. Trong Mandrivalinux, bất kỳ\n"</div><div class='ctx'> "server đã được cài đặt nào đều chạy vào lúc khởi động theo mặc định.\n"</div><div class='ctx'> "Thậm chí được coi là an toàn tại thời điểm phát hành, nó vẫn có thể\n"</div><div class='ctx'> "có lỗ hổng bảo mật được phát hiện sau khi phát hành phiên bản Linux\n"</div><div class='hunk'>@@ -4253,7 +4253,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4309,7 +4309,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (cho hệ thống cửa sổ X) là trái tim của giao diện đồ họa GNU/Linux\n"</div><div class='ctx'> "mà trên đó mọi môi trường đồ họa (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) được kết hợp trong Mandrakelinux.\n"</div><div class='add'>+"WindowMaker, etc.) được kết hợp trong Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Bạn sẽ được xem danh sách các tham số khác nhau để thay đổi sao\n"</div><div class='ctx'> "cho việc hiển thị đồ họa được tối ưu.\n"</div><div class='hunk'>@@ -4424,12 +4424,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4456,7 +4456,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4465,7 +4465,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4486,10 +4486,10 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Lúc này bạn cần chọn nơi nào trên đĩa cứng sẽ cài đặt hệ điều hành\n"</div><div class='del'>-"Mandrakelinux. Nếu như đĩa cứng chưa có gì hoặc nếu đã có một hệ\n"</div><div class='add'>+"Mandrivalinux. Nếu như đĩa cứng chưa có gì hoặc nếu đã có một hệ\n"</div><div class='ctx'> "điều hành đang sử dụng toàn bộ không gian đĩa, bạn cần thực hiện việc\n"</div><div class='ctx'> "phân vùng đĩa. Về cơ bản, việc phân vùng một ổ đĩa cứng là phân chia\n"</div><div class='del'>-"các ổ lý luận, tạo không gian để cài đặt hệ thống Mandrakelinux mới.\n"</div><div class='add'>+"các ổ lý luận, tạo không gian để cài đặt hệ thống Mandrivalinux mới.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Do kết quả của quá trình phân vùng thường không thay đổi lại được nữa,\n"</div><div class='ctx'> "nên việc phân vùng có thể gây sợ hãi và căng thẳng nếu bạn không phải\n"</div><div class='hunk'>@@ -4516,7 +4516,7 @@ msgstr ""</div><div class='ctx'> "lập lại kích thước phân vùng của MS Windows mà có thể không bị mất bất\n"</div><div class='ctx'> "kỳ dữ liệu nào. Tuy nhiên bạn rất nên thực hiện việc sao lưu dữ liệu trước "</div><div class='ctx'> "đã.\n"</div><div class='del'>-"Nên chọn giải pháp này nếu muốn dùng cả Mandrakelinux và Windows trên\n"</div><div class='add'>+"Nên chọn giải pháp này nếu muốn dùng cả Mandrivalinux và Windows trên\n"</div><div class='ctx'> "cùng một máy tính.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Trước khi chọn tùy chọn này, hãy hiểu là sau khi thực hiện cách này,\n"</div><div class='hunk'>@@ -4525,7 +4525,7 @@ msgstr ""</div><div class='ctx'> "liệu và cài đặt phần mềm mới.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": nếu muốn xoá toàn bộ dữ liệu và các phân vùng\n"</div><div class='del'>-"hiện có trên ổ cứng và thay thế bằng hệ thống Mandrakelinux mới,\n"</div><div class='add'>+"hiện có trên ổ cứng và thay thế bằng hệ thống Mandrivalinux mới,\n"</div><div class='ctx'> "hãy dùng tùy chọn này. Hãy thận trọng với tùy chọn này vì sẽ không\n"</div><div class='ctx'> "thể thay đổi lựa chọn sau khi đã khẳng định.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4680,7 +4680,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4702,7 +4702,7 @@ msgstr ""</div><div class='ctx'> "Nhấn lên \"%s\" khi bạn sẵn sàng format các phân vùng.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Nhấn lên \"%s\" nếu muốn chọn một phân vùng khác cho việc\n"</div><div class='del'>-"cài đặt hệ điều hành Mandrakelinux mới.\n"</div><div class='add'>+"cài đặt hệ điều hành Mandrivalinux mới.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Nhấn lên \"%s\" nếu muốn chọn các phân vùng sẽ được kiểm\n"</div><div class='ctx'> "tra các khối bị hỏng trên bề mặt đĩa."</div><div class='hunk'>@@ -4719,7 +4719,7 @@ msgstr "Về trước"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4731,7 +4731,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Vào lúc bạn đang cài đặt Mandrakelinux, có thể đã có một số gói tin\n"</div><div class='add'>+"Vào lúc bạn đang cài đặt Mandrivalinux, có thể đã có một số gói tin\n"</div><div class='ctx'> "đã được cập nhật kể từ lúc phát hành phiên bản này. Một số lỗi chương\n"</div><div class='ctx'> "trình đã được sửa, các vấn đề bảo mật được giải quyết. Để cho bạn\n"</div><div class='ctx'> "được hưởng lợi từ các cập nhật này, bây giờ bạn có thể để tải chúng về\n"</div><div class='hunk'>@@ -4759,7 +4759,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4787,7 +4787,7 @@ msgstr "Người Quản Trị Bảo Mật:"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4858,7 +4858,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vào lúc này, bạn cần chọn những phân vùng nào sẽ được dùng để cài đặt\n"</div><div class='del'>-"hệ thống Mandrakelinux. Nếu các phân vùng đã được xác lập từ lần cài\n"</div><div class='add'>+"hệ thống Mandrivalinux. Nếu các phân vùng đã được xác lập từ lần cài\n"</div><div class='ctx'> "đặt GNU/Linux trước đó hay được tạo bằng một công cụ phân vùng khác,\n"</div><div class='ctx'> "bạn có thể dùng chúng. Nếu chưa có, bạn sẽ sẽ phải thực hiện việc hoạch\n"</div><div class='ctx'> "định các phân vùng.\n"</div><div class='hunk'>@@ -4943,7 +4943,7 @@ msgstr "Chuyển đổi giữa chế độ bình thường và chuyên gia"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4973,7 +4973,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Phát hiện ra có hơn một phân vùng Microsoft Windows trên đĩa cứng.\n"</div><div class='ctx'> "Hãy chọn một phân vùng cần lập lại kích thước để cài đặt hệ điều\n"</div><div class='del'>-"hành Mandrakelinux mới.\n"</div><div class='add'>+"hành Mandrivalinux mới.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Mỗi phân vùng được liệt kê như sau: \"Tên Linux\", \"Tên Windows\"\n"</div><div class='ctx'> "\"Dung lượng\".\n"</div><div class='hunk'>@@ -5021,7 +5021,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5030,19 +5030,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bước này chỉ được kích hoạt khi phát hiện thấy một phân vùng GNU/Linux\n"</div><div class='ctx'> "đang có sẵn trên máy của bạn.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX cần được biết là bạn muốn thực hiện cài đặt mới hay là nâng cấp\n"</div><div class='del'>-"hệ thống Mandrakelinux hiện có:\n"</div><div class='add'>+"hệ thống Mandrivalinux hiện có:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": hầu hết các trường hợp, việc này sẽ xóa sạch hệ thống\n"</div><div class='ctx'> "cũ. Nếu bạn muốn thay đổi các phân vùng của đĩa cứng, hoặc thay đổi\n"</div><div class='hunk'>@@ -5051,13 +5051,13 @@ msgstr ""</div><div class='ctx'> "lên ví dụ như thư mục \"home\".\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": loại cài đặt này cho phép bạn nâng cấp các gói hiện thời\n"</div><div class='del'>-"đã cài trên hệ thống Mandrakelinux của bạn. Việc sắp xếp phân vùng\n"</div><div class='add'>+"đã cài trên hệ thống Mandrivalinux của bạn. Việc sắp xếp phân vùng\n"</div><div class='ctx'> "hiện thời và dữ liệu không bị thay đổi. Hầu hết các bước cấu hình khác\n"</div><div class='ctx'> "vẫn sẵn có để dùng, giống như việc cài đặt chuẩn.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Tùy chọn ``Nâng cấp'' sẽ hoạt động tốt trên hệ thống Mandrakelinux\n"</div><div class='add'>+"Tùy chọn ``Nâng cấp'' sẽ hoạt động tốt trên hệ thống Mandrivalinux\n"</div><div class='ctx'> "phiên bản \"8.1\" hay mới hơn. Không nên thực hiện nâng cấp cho các\n"</div><div class='del'>-"phiên bản cũ hơn Mandrakelinux \"8.1\" ."</div><div class='add'>+"phiên bản cũ hơn Mandrivalinux \"8.1\" ."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5114,7 +5114,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5375,7 +5375,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5396,7 +5396,7 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Đây là lúc chọn hệ thống in ấn dùng cho máy tính này. Các hệ điều\n"</div><div class='hunk'>@@ -5421,7 +5421,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Nếu bây giờ bạn chọn nhưng sau này lại muốn đổi hệ thống in, bạn có thể\n"</div><div class='ctx'> "thực hiện bằng việc chạy PrinterDrake từ Trung Tâm Điều Khiển của\n"</div><div class='del'>-"Mandrakelinux và nhấn nút \"%s\"."</div><div class='add'>+"Mandrivalinux và nhấn nút \"%s\"."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5538,7 +5538,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5555,7 +5555,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5602,7 +5602,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": Nếu muốn cấu hình truy cập mạng cục bộ hay truy cập\n"</div><div class='ctx'> "internet. Tham khảo tài liệu hoặc dùng Trung Tâm Điều Khiển \n"</div><div class='del'>-"Mandrakelinux để thực hiện sau khi cài đặt xong để có được sự trợ\n"</div><div class='add'>+"Mandrivalinux để thực hiện sau khi cài đặt xong để có được sự trợ\n"</div><div class='ctx'> "giúp hoàn chỉnh.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": cho phép cấu hình địa chỉ proxy HTTP và FTP nếu máy tính\n"</div><div class='hunk'>@@ -5618,7 +5618,7 @@ msgstr ""</div><div class='ctx'> " * \"%s\": nếu muốn thay đổi cấu hình của trình nạp khởi động, hãy\n"</div><div class='ctx'> "nhấn nút này. Nên dùng chỉ khi bạn là người dùng thành thạo. Hãy tham\n"</div><div class='ctx'> "khảo tài liệu đi kèm hoặc trợ giúp trực tuyến về cấu hình trình nạp khởi\n"</div><div class='del'>-"động trong Trung Tâm Cấu Hình Mandrakelinux.\n"</div><div class='add'>+"động trong Trung Tâm Cấu Hình Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": bạn có thể điều khiển dịch vụ nào sẽ được chạy trên máy\n"</div><div class='ctx'> "này. Nếu bạn có kế hoạch dùng máy này làm máy chủ, hãy xem lại\n"</div><div class='hunk'>@@ -5679,10 +5679,10 @@ msgstr "Dịch vụ"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Hãy chọn ổ cứng mà bạn muốn xoá để cài đặt phân vùng Mandrakelinux\n"</div><div class='add'>+"Hãy chọn ổ cứng mà bạn muốn xoá để cài đặt phân vùng Mandrivalinux\n"</div><div class='ctx'> "mới. Hãy thận trọng, mọi dữ liệu có trên đó sẽ bị mất và không thể khôi\n"</div><div class='ctx'> "phục lại được !"</div><div class='ctx'> </div><div class='hunk'>@@ -6036,12 +6036,12 @@ msgstr "Đang tính toán kích thước của phân vùng Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Phân vùng Windows bị phân mảnh quá nhiều. Hãy khởi động lại máy\n"</div><div class='ctx'> "vào Windows, chạy ``defrag'' trước, rồi sau đó mới bắt đầu cài đặt\n"</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6160,19 +6160,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6194,7 +6194,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6202,14 +6202,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6219,7 +6219,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6239,10 +6239,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6253,11 +6253,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6273,7 +6273,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Giới Thiệu\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6283,13 +6283,13 @@ msgstr ""</div><div class='ctx'> "không \n"</div><div class='ctx'> "bị giới hạn, một bộ các chương trình, phương pháp, quy tắc và tài liệu liên "</div><div class='ctx'> "quan đến hệ điều hành \n"</div><div class='del'>-"và các thành phần khác có trong sản phẩm phân phối Mandrakelinux.\n"</div><div class='add'>+"và các thành phần khác có trong sản phẩm phân phối Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. Chấp Thuận Giấy Phép\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Hãy đọc cẩn thận tài liệu này. Nó là sự chấp thuận giấy phép giữa bạn và  \n"</div><div class='del'>-"Mandrakesoft S.A. được áp dụng cho các Sản Phẩm Phần Mềm.\n"</div><div class='add'>+"Mandriva S.A. được áp dụng cho các Sản Phẩm Phần Mềm.\n"</div><div class='ctx'> "Bằng việc cài đặt, sao chép hay sử dụng Sản Phẩm Phần Mềm theo cách \n"</div><div class='ctx'> "nào đó thì hiển nhiên bạn đồng ý và chấp thuận toàn bộ các điều khoản và "</div><div class='ctx'> "điều kiện của giấy phép này. \n"</div><div class='hunk'>@@ -6309,7 +6309,7 @@ msgstr ""</div><div class='ctx'> "Các sản phẩm phần mềm và tài liệu đi kèm được cung cấp \"như là\", không có "</div><div class='ctx'> "sự bảo đảm, theo\n"</div><div class='ctx'> "phạm vi cho phép của luật pháp.\n"</div><div class='del'>-"Mandrakesoft S.A. sẽ tự có trách nhiệm pháp lý ở một mức độ nào đó về các hư "</div><div class='add'>+"Mandriva S.A. sẽ tự có trách nhiệm pháp lý ở một mức độ nào đó về các hư "</div><div class='ctx'> "hỏng ảnh hưởng tới công việc làm ăn.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "3. Giấy phép GPL và các giấy phép liên quan\n"</div><div class='hunk'>@@ -6325,10 +6325,10 @@ msgstr ""</div><div class='ctx'> "và các điều kiện trong giấy phép của từng thành phần trước khi sử dụng "</div><div class='ctx'> "chúng. Mọi câu hỏi \n"</div><div class='ctx'> "về giấy phép của các thành phần nên được gửi tới tác giả mà không gửi tới "</div><div class='del'>-"Mandrakesoft.\n"</div><div class='del'>-"Các chương trình do Mandrakesoft S.A.phát triển được quản lý theo giấy phép "</div><div class='add'>+"Mandriva.\n"</div><div class='add'>+"Các chương trình do Mandriva S.A.phát triển được quản lý theo giấy phép "</div><div class='ctx'> "GPL. Tài liệu do\n"</div><div class='del'>-"Mandrakesoft S.A. viết được quản lý bởi một giấy phép đặc biệt. Hãy tham "</div><div class='add'>+"Mandriva S.A. viết được quản lý bởi một giấy phép đặc biệt. Hãy tham "</div><div class='ctx'> "khảo tài liệu để \n"</div><div class='ctx'> "biết thêm chi tiết.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6339,11 +6339,11 @@ msgstr ""</div><div class='ctx'> "tác giả của chúng và\n"</div><div class='ctx'> "được bảo vệ bởi luật sở hữu trí tuệ và luật bản quyền áp dụng cho các chương "</div><div class='ctx'> "trình phần mềm.\n"</div><div class='del'>-"Mandrakesoft S.A. giữ quyền thay đổi hoặc chỉnh sửa các Sản Phẩm Phần Mềm "</div><div class='add'>+"Mandriva S.A. giữ quyền thay đổi hoặc chỉnh sửa các Sản Phẩm Phần Mềm "</div><div class='ctx'> "toàn bộ hay một\n"</div><div class='ctx'> "phần.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" và các logo của nó là nhãn đăng ký của "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" và các logo của nó là nhãn đăng ký của "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6359,7 +6359,7 @@ msgstr ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6449,7 +6449,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6457,12 +6457,12 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Xin chúc mừng, quá trình cài đặt đã hoàn thành.\n"</div><div class='ctx'> "Hãy đĩa khởi động ra và nhấn Enter để khởi động lại.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Về thông tin sửa lỗi hiện có cho các phiên bản Mandrakelinux,\n"</div><div class='add'>+"Về thông tin sửa lỗi hiện có cho các phiên bản Mandrivalinux,\n"</div><div class='ctx'> "hãy xem Errata tại:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6470,7 +6470,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Chi tiết về cấu hình hệ thống nằm trong chương Sau Cài Đặt của\n"</div><div class='del'>-"bản Hướng dẫn Sử dụng Chính thức (Official Mandrakelinux User's Guide)."</div><div class='add'>+"bản Hướng dẫn Sử dụng Chính thức (Official Mandrivalinux User's Guide)."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6504,12 +6504,12 @@ msgstr "Bắt đầu bước `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Hệ thống của bạn có cấu hình thấp. Bạn có thể gặp một số trục trặc khi\n"</div><div class='del'>-"cài đặt Mandrakelinux. Nếu xảy ra lỗi, bạn có thể thay thế bằng kiểu cài đặt "</div><div class='add'>+"cài đặt Mandrivalinux. Nếu xảy ra lỗi, bạn có thể thay thế bằng kiểu cài đặt "</div><div class='ctx'> "trong\n"</div><div class='ctx'> "chế độ văn bản bằng cách nhấn phím `F1' khi khởi động từ CDROM, rồi nhập "</div><div class='ctx'> "`text'."</div><div class='hunk'>@@ -7047,9 +7047,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Đang kết nối với website của Mandrakelinux để lấy danh sách các mirrors "</div><div class='add'>+"Đang kết nối với website của Mandrivalinux để lấy danh sách các mirrors "</div><div class='ctx'> "hiệncó..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7273,8 +7273,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Cài đặt Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Cài đặt Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9884,13 +9884,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Chương trình cấu hình Drakfirewall\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Chương trình này cấu hình một tường lửa cá nhân cho máy Mandrakelinux.\n"</div><div class='add'>+"Chương trình này cấu hình một tường lửa cá nhân cho máy Mandrivalinux.\n"</div><div class='ctx'> "Về giải pháp tường lửa mạnh và chuyên dụng, hãy tìm xem phân phối\n"</div><div class='ctx'> "tường lửa bảo mật chuyên dụng của Mandrake."</div><div class='ctx'> </div><div class='hunk'>@@ -13912,12 +13912,12 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Chạy Scannerdrake (Phần cứng/Máy quét trong Trung Tâm Điều Khiển "</div><div class='del'>-"Mandrakelinux) để chia sẻ máy quét trong mạng.\n"</div><div class='add'>+"Mandrivalinux) để chia sẻ máy quét trong mạng.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='ctx'> #: printer/printerdrake.pm:3933</div><div class='hunk'>@@ -15840,33 +15840,33 @@ msgstr "Dừng"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux là gì?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux là gì?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Chào mừng &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Chào mừng &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux là &lt;b&gt;phân phối Linux&lt;/b&gt; gồm có lõi (core) hệ thống gọi là   "</div><div class='add'>+"Mandrivalinux là &lt;b&gt;phân phối Linux&lt;/b&gt; gồm có lõi (core) hệ thống gọi là   "</div><div class='ctx'> "&lt;b&gt;hệ điều hành&lt;/b&gt; (dựa trên Linux kernel) cùng với &lt;b&gt;rất nhiều ứng dụng&lt;/"</div><div class='ctx'> "b&gt; thỏa mãn mọi nhu cầu của bạn."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux là phân phối Linux &lt;b&gt;thân thiện người dùng&lt;/b&gt; nhất. Nó cũng "</div><div class='add'>+"Mandrivalinux là phân phối Linux &lt;b&gt;thân thiện người dùng&lt;/b&gt; nhất. Nó cũng "</div><div class='ctx'> "là một bản Linux &lt;b&gt;được dùng nhiều nhất&lt;/b&gt; trên thế giới!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -15882,14 +15882,14 @@ msgstr "Chào Mừng &lt;b&gt;Thế Giới Nguồn Mở&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux trung thành với mô hình nguồn mở. Điều này có nghĩa là phát "</div><div class='add'>+"Mandrivalinux trung thành với mô hình nguồn mở. Điều này có nghĩa là phát "</div><div class='ctx'> "hành mới này là kết quả  của &lt;b&gt;sự cộng tác&lt;/b&gt; giữa &lt;b&gt;đội ngũ phát triển "</div><div class='del'>-"của Mandrakesoft&lt;/b&gt; với &lt;b&gt;cộng đồng từ khắp nơi trên thế giới&lt;/b&gt;."</div><div class='add'>+"của Mandriva&lt;/b&gt; với &lt;b&gt;cộng đồng từ khắp nơi trên thế giới&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15909,9 +15909,9 @@ msgstr "&lt;b&gt;The GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Toàn bộ phần mềm và các công cụ của Mandrakelinux được phát hành theo giấy "</div><div class='add'>+"Toàn bộ phần mềm và các công cụ của Mandrivalinux được phát hành theo giấy "</div><div class='ctx'> "phép của &lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15941,15 +15941,15 @@ msgstr "&lt;b&gt;Gia nhập cộng đồng&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux có một &lt;b&gt;cộng đồng lớn&lt;/b&gt; người dùng và nhà phát triển. Vai "</div><div class='add'>+"Mandrivalinux có một &lt;b&gt;cộng đồng lớn&lt;/b&gt; người dùng và nhà phát triển. Vai "</div><div class='ctx'> "trò của cộng đồng này rất lớn, từ việc báo cáo lỗi cho đến việc phát triển "</div><div class='ctx'> "các chương trình mới. Cộng đồng đóng &lt;b&gt;vai trò chủ đạo&lt;/b&gt; trong thế giới "</div><div class='del'>-"Mandrakelinux."</div><div class='add'>+"Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15970,11 +15970,11 @@ msgstr "&lt;b&gt;Phiên Bản Tải Xuống&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Bạn đang cài đặt &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. Đây là bản miễn phí mà  "</div><div class='del'>-"Mandrakesoft muốn dành cho &lt;b&gt;mọi người dùng&lt;/b&gt;."</div><div class='add'>+"Bạn đang cài đặt &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. Đây là bản miễn phí mà  "</div><div class='add'>+"Mandriva muốn dành cho &lt;b&gt;mọi người dùng&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16005,10 +16005,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bạn cũng sẽ không truy cập được vào các &lt;b&gt;dịch vụ&lt;/b&gt; có trong các sản phẩm "</div><div class='del'>-"khác của Mandrakesoft."</div><div class='add'>+"khác của Mandriva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16017,8 +16017,8 @@ msgstr "&lt;b&gt;Discovery, Linux Desktop đầu tiên của bạn&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Bây giờ bạn đang cài đặt &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Bây giờ bạn đang cài đặt &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16040,17 +16040,17 @@ msgstr "&lt;b&gt;PowerPack, Linux Desktop tốt nhất&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Bây giờ bạn cài đặt &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Bây giờ bạn cài đặt &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"PowerPack là một sản phẩm &lt;b&gt;Linux desktop tốt&lt;/b&gt; của Mandrakesoft. "</div><div class='add'>+"PowerPack là một sản phẩm &lt;b&gt;Linux desktop tốt&lt;/b&gt; của Mandriva. "</div><div class='ctx'> "PowerPack  bao gồm &lt;b&gt;hàng ngàn ứng dụng&lt;/b&gt; - mọi thứ đều là phổ biến và "</div><div class='ctx'> "tân tiến nhất."</div><div class='ctx'> </div><div class='hunk'>@@ -16061,8 +16061,8 @@ msgstr "&lt;b&gt;PowerPack+, giải pháp Linux cho Desktop và Server&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Bây giờ bạn cài đặt &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Bây giờ bạn cài đặt &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16078,21 +16078,21 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Sản Phẩm Của Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Sản Phẩm Của Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; phát triển hàng loạt sản phẩm cho &lt;b&gt;Mandrakelinux&lt;/b&gt;."</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; phát triển hàng loạt sản phẩm cho &lt;b&gt;Mandrivalinux&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Sản phẩm Mandrakelinux là:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Sản phẩm Mandrivalinux là:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16112,39 +16112,39 @@ msgstr "\t* &lt;b&gt;PowerPack+&lt;/b&gt;, giải pháp cho Desktop và Server."</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux cho x86-64&lt;/b&gt;, giải pháp cho hầu hết các bộ vi xử lý "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux cho x86-64&lt;/b&gt;, giải pháp cho hầu hết các bộ vi xử lý "</div><div class='ctx'> "64-bit"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Sản phẩm của Mandrakesoft (di động)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Sản phẩm của Mandriva (di động)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft phát triển hai sản phẩm cho phép bạn sửdụng Mandrakelinux trên "</div><div class='add'>+"Mandriva phát triển hai sản phẩm cho phép bạn sửdụng Mandrivalinux trên "</div><div class='ctx'> "&lt;b&gt;bất kỳ máy tính nào&lt;/b&gt; mà không cần phải cài đặt:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, phiên bản Mandrakelinux chạy hoàn toàn trên đĩa CD khởi "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, phiên bản Mandrivalinux chạy hoàn toàn trên đĩa CD khởi "</div><div class='ctx'> "động được."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, một phân phối cài đặt sẵn trên ultra-compact “LaCie "</div><div class='hunk'>@@ -16152,33 +16152,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Sản phẩm của Mandrakesoft (chuyên nghiệp)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Sản phẩm của Mandriva (chuyên nghiệp)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Dưới đây là các sản phẩm của Mandrakesoft được thiết kế cho nhu cầu "</div><div class='add'>+"Dưới đây là các sản phẩm của Mandriva được thiết kế cho nhu cầu "</div><div class='ctx'> "&lt;b&gt;chuyên nghiệp&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrakelinux Desktop cho doanh nghiệp."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, Mandrivalinux Desktop cho doanh nghiệp."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Giải pháp máy chủ của Mandrakelinux."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, Giải pháp máy chủ của Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, giải pháp bảo mật của Mandrakelinux."</div><div class='add'>+"\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, giải pháp bảo mật của Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16221,10 +16221,10 @@ msgstr "&lt;b&gt;Chọn môi trường desktop ưa thích cho bạn!&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Với PowerPack, bạn có nhiều lựa chọn cho &lt;b&gt;môi trường desktop đồ họa&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft chọn &lt;b&gt;KDE&lt;/b&gt; làm mặc định."</div><div class='add'>+"Mandriva chọn &lt;b&gt;KDE&lt;/b&gt; làm mặc định."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16248,10 +16248,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Với PowerPack+, bạn sẽ có lựa chọn cho &lt;b&gt;môi trường desktop đồ họa&lt;/b&gt;. "</div><div class='del'>-"Mandrakesoft đã chọn &lt;b&gt;KDE&lt;/b&gt; làm mặc định."</div><div class='add'>+"Mandriva đã chọn &lt;b&gt;KDE&lt;/b&gt; làm mặc định."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16376,10 +16376,10 @@ msgstr "&lt;b&gt;Thưởng thức nhiều ứng dụng&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Trên menu của Mandrakelinux, bạn sẽ thấy các ứng dụng &lt;b&gt;dễ dùng&lt;/b&gt; cho "</div><div class='add'>+"Trên menu của Mandrivalinux, bạn sẽ thấy các ứng dụng &lt;b&gt;dễ dùng&lt;/b&gt; cho "</div><div class='ctx'> "&lt;b&gt;mọi tác vụ&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16645,18 +16645,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Trung tâm Điều khiển Mandrakelinuxlinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Trung tâm Điều khiển Mandrivalinuxlinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Trung Tâm Điều Khiển Mandrakelinux&lt;/b&gt; là một tập hợp các tiện ích riêng "</div><div class='del'>-"của Mandrakelinux-được thiết kế nhằm đơn giản hoá việc cấu hình máy tính của "</div><div class='add'>+"&lt;b&gt;Trung Tâm Điều Khiển Mandrivalinux&lt;/b&gt; là một tập hợp các tiện ích riêng "</div><div class='add'>+"của Mandrivalinux-được thiết kế nhằm đơn giản hoá việc cấu hình máy tính của "</div><div class='ctx'> "bạn."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16680,16 +16680,16 @@ msgstr "&lt;b&gt;The Open Source Model&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Giống như mọi chương trình điện toán khác, phần mềm nguồn mở &lt;b&gt;cần có thời "</div><div class='ctx'> "gian và con người&lt;/b&gt; để phát triển. Tuân thủ triết lý nguồn mở, "</div><div class='del'>-"Mandrakesoft bán các sản phẩm và dịch vụ giá trị gia tăng &lt;b&gt;để phất triển "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. Nếu bạn muốn &lt;b&gt;hỗ trợ triết lý nguồn mở&lt;/b&gt; và phát "</div><div class='del'>-"triển Mandrakelinux, &lt;b&gt;hãy mua&lt;/b&gt; một sản phẩm hay dịch vụ của hãng!"</div><div class='add'>+"Mandriva bán các sản phẩm và dịch vụ giá trị gia tăng &lt;b&gt;để phất triển "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. Nếu bạn muốn &lt;b&gt;hỗ trợ triết lý nguồn mở&lt;/b&gt; và phát "</div><div class='add'>+"triển Mandrivalinux, &lt;b&gt;hãy mua&lt;/b&gt; một sản phẩm hay dịch vụ của hãng!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16699,10 +16699,10 @@ msgstr "&lt;b&gt;Online Store&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Để biết thêm về sản phẩm và dịch vụ của Mandrakesoft, bạn có thể thăm &lt;b&gt;e-"</div><div class='add'>+"Để biết thêm về sản phẩm và dịch vụ của Mandriva, bạn có thể thăm &lt;b&gt;e-"</div><div class='ctx'> "commerce platform&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16728,25 +16728,25 @@ msgstr "Hãy tới thăm &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; là một &lt;b&gt;nơi tuyệt vời&lt;/b&gt; cho bạn sử dụng "</div><div class='del'>-"Mandrakelinux..."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; là một &lt;b&gt;nơi tuyệt vời&lt;/b&gt; cho bạn sử dụng "</div><div class='add'>+"Mandrivalinux..."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Hãy nắm lợi thế từ &lt;b&gt;các lợi ích có giá trị&lt;/b&gt; bằng việc tham gia "</div><div class='del'>-"Mandrakeclub, như:"</div><div class='add'>+"Mandriva Club, như:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16768,40 +16768,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Tham gia Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Tham gia Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Truy cập đặc quyền và sớm&lt;/b&gt;, trước khi phát hành công cộng, đến các "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO image&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO image&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; là một dịch vụ mới cao cấp mà Mandrakesoft tự hào giới "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; là một dịch vụ mới cao cấp mà Mandriva tự hào giới "</div><div class='ctx'> "thiệu cho người dùng của hãng!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline cung cấp hàng loạt các dịch vụ giá trị để &lt;b&gt;dễ dàng cập nhật "</div><div class='del'>-"&lt;/b&gt; hệ thống Mandrakelinux của bạn:"</div><div class='add'>+"Mandriva Online cung cấp hàng loạt các dịch vụ giá trị để &lt;b&gt;dễ dàng cập nhật "</div><div class='add'>+"&lt;/b&gt; hệ thống Mandrivalinux của bạn:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16824,40 +16824,40 @@ msgstr "\t* Cập nhật &lt;b&gt;theo lịch&lt;/b&gt; mềm dẻo."</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='del'>-msgstr "\t* Quản lý toàn bộ&lt;b&gt;hệ thống Mandrakelinux&lt;/b&gt; bằng một tài khoản."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='add'>+msgstr "\t* Quản lý toàn bộ&lt;b&gt;hệ thống Mandrivalinux&lt;/b&gt; bằng một tài khoản."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bạn yêu cầu sự &lt;b&gt;trợ giúp?&lt;/b&gt; Gặp gỡ các chuyên gia kỹ thuật của "</div><div class='del'>-"Mandrakesoft trên &lt;b&gt;site hỗ trợ kỹ thuật của chúng tôi:&lt;/b&gt; www."</div><div class='add'>+"Mandriva trên &lt;b&gt;site hỗ trợ kỹ thuật của chúng tôi:&lt;/b&gt; www."</div><div class='ctx'> "mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Nhờ sự trợ giúp của &lt;b&gt;các chuyên gia Mandrakelinux&lt;/b&gt;, bạn sẽ tiết kiệm "</div><div class='add'>+"Nhờ sự trợ giúp của &lt;b&gt;các chuyên gia Mandrivalinux&lt;/b&gt;, bạn sẽ tiết kiệm "</div><div class='ctx'> "được rất nhiều thời gian."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Để nhận mọi trả lời về Mandrakelinux, bạn có khả năng mua phí hỗ trợ tại  "</div><div class='add'>+"Để nhận mọi trả lời về Mandrivalinux, bạn có khả năng mua phí hỗ trợ tại  "</div><div class='ctx'> "&lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17154,8 +17154,8 @@ msgstr "Các công cụ theo dõi, quản lý tiến trình, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Đồ thuật Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Đồ thuật Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17248,8 +17248,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Tùy Chọn:\n"</div><div class='ctx'> "  --help            - in thông điệp trợ giúp này.\n"</div><div class='del'>-"  --report          - Chương trình nên là loại công cụ của Mandrakelinux\n"</div><div class='del'>-"  --incident        - Chương trình nên là loại công cụ của Mandrakelinux"</div><div class='add'>+"  --report          - Chương trình nên là loại công cụ của Mandrivalinux\n"</div><div class='add'>+"  --incident        - Chương trình nên là loại công cụ của Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17304,7 +17304,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17318,7 +17318,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[Tùy Chọn]...\n"</div><div class='del'>-"Chương Trình Cấu Hình Mandrake Terminal Server\n"</div><div class='add'>+"Chương Trình Cấu Hình Mandriva Terminal Server\n"</div><div class='ctx'> "--enable         : bật chạy MTS\n"</div><div class='ctx'> "--disable        : tắt MTS\n"</div><div class='ctx'> "--start          : chạy MTS\n"</div><div class='hunk'>@@ -17374,7 +17374,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17382,7 +17382,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[Tùy Chọn]...\n"</div><div class='ctx'> "  --no-confirmation      không hỏi câu khẳng định trước trong chế độ "</div><div class='del'>-"MandrakeUpdate\n"</div><div class='add'>+"Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        không kiểm tra chữ ký các gói\n"</div><div class='ctx'> "  --changelog-first      hiển thị bản ghi thay đổi trước danh sách tập tin "</div><div class='ctx'> "trong cửa sổ mô tả\n"</div><div class='hunk'>@@ -20136,13 +20136,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Công cụ báo cáo lỗi của Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Công cụ báo cáo lỗi của Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Trung tâm Điều khiển Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Trung tâm Điều khiển Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20162,8 +20162,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20207,8 +20207,8 @@ msgstr "Đồ Thuật Cấu Hình"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Hãy chọn công cụ Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Hãy chọn công cụ Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20632,20 +20632,20 @@ msgstr "Được chạy lúc khởi động "</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Giao diện này vẫn còn chưa được cấu hình.\n"</div><div class='del'>-"Hãy chạy \"Bổ sung giao diện\" trong Trung Tâm Điều Khiển Mandrakelinuxlinux"</div><div class='add'>+"Hãy chạy \"Bổ sung giao diện\" trong Trung Tâm Điều Khiển Mandrivalinuxlinux"</div><div class='ctx'> </div><div class='ctx'> #  -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bạn chưa cấu hình kết nối internet.\n"</div><div class='del'>-"Hãy chạy \"%s\" từ Trung Tâm Điều Khiển Mandrakelinuxlinux"</div><div class='add'>+"Hãy chạy \"%s\" từ Trung Tâm Điều Khiển Mandrivalinuxlinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20695,8 +20695,8 @@ msgstr "KDM (Trình quản lý hiển thị KDE)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Trình quản lý hiển thị Mandrakelinux)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Trình quản lý hiển thị Mandrivalinux)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20995,7 +20995,7 @@ msgstr "Nhập"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21004,7 +21004,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Bản quyền (C) 2001-2002 của Mandrakesoft \n"</div><div class='add'>+"Bản quyền (C) 2001-2002 của Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (phiên bản gốc)\n"</div><div class='hunk'>@@ -21544,14 +21544,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Bản Drakhelp 0.1\n"</div><div class='del'>-"Bản quyền (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Bản quyền (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "Đây là phần mềm tự do và có thể phân phối lại theo các điều khoản của GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21581,8 +21581,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Trung tâm trợ giúp Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Trung tâm trợ giúp Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25112,8 +25112,8 @@ msgstr "Thay đổi đã xong, nhưng để có hiệu lực bạn phải thoát</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Bản ghi công cụ của Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Bản ghi công cụ của Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25636,10 +25636,10 @@ msgstr "Hoàn thành kết nối."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Không kết nối được.\n"</div><div class='del'>-"Hãy kiểm tra cấu hình trong Trung Tâm Điều Khiển Mandrakelinux."</div><div class='add'>+"Hãy kiểm tra cấu hình trong Trung Tâm Điều Khiển Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/wa.po b/perl-install/share/po/wa.po<br/>index 43c036073..0a2db8d7b 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/wa.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/wa.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/wa.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/wa.po</a></div><div class='hunk'>@@ -71,7 +71,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "I shonne kel sere USB åye li proteccion siconte do scrijhaedje di metowe,\n"</div><div class='ctx'> "mins on nel pout nén fé rexhe sins risses asteure.\n"</div><div class='hunk'>@@ -79,7 +79,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Clitchîz sol boton po renonder l' éndjole, prindoz l' sere foû, dismetoz\n"</div><div class='ctx'> "li proteccion siconte do scrijhaedje, ritchôkîz l' sere, eyet renondez\n"</div><div class='del'>-"Mandrake Move."</div><div class='add'>+"Mandriva Move."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -97,7 +97,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Li sere USB n' a nole pårticion Windows (FAT) di valide.\n"</div><div class='hunk'>@@ -107,14 +107,14 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Vos ploz eto continouwer sins sere USB - vos pôroz co eployî\n"</div><div class='del'>-"Mandrake Move come on sistinme d' operance Mandrakelinux normå,\n"</div><div class='add'>+"Mandriva Move come on sistinme d' operance Mandrivalinux normå,\n"</div><div class='ctx'> "mins vos piedroz a l' enondaedje ki vént çou k' vos åroz candjî."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -122,11 +122,11 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Nole sere USB n' a stî detectêye sol sistinme. Si vos tchôkîz ene\n"</div><div class='del'>-"sere USB asteure, Mandrake Move pôrè schaper di manire transparinte\n"</div><div class='add'>+"sere USB asteure, Mandriva Move pôrè schaper di manire transparinte\n"</div><div class='ctx'> "les dnêyes di vosse ridant måjhon eyet l' apontiaedje do sistinme,\n"</div><div class='ctx'> "po ls eployî a l' enondaedje ki vént, so cisse copiutrece chal ou\n"</div><div class='ctx'> "so ene ôte. Note: si vos tchôkîz ene sere asteure, ratindoz sacwantès\n"</div><div class='hunk'>@@ -134,7 +134,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Vos ploz eto continouwer sins sere USB - vos pôroz co eployî\n"</div><div class='del'>-"Mandrake Move come on sistinme d' operance Mandrakelinux normå,\n"</div><div class='add'>+"Mandriva Move come on sistinme d' operance Mandrivalinux normå,\n"</div><div class='ctx'> "mins vos piedroz a l' enondaedje ki vént çou k' vos åroz candjî."</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='hunk'>@@ -263,7 +263,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -279,7 +279,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Çoula pout vni di crons fitchîs d' apontiaedje do sistinme\n"</div><div class='ctx'> "sol sere USB, dins ç' cas disfacîz les fitchîs et s' renondez\n"</div><div class='del'>-" Mandrake Move po coridjî l' problinme. Po fé çoula, clitchîz\n"</div><div class='add'>+" Mandriva Move po coridjî l' problinme. Po fé çoula, clitchîz\n"</div><div class='ctx'> "sol boton corespondant.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1324,7 +1324,7 @@ msgstr "Tchoezi l' lingaedje"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -3766,12 +3766,12 @@ msgstr "mete en alaedje li sopoirt pol radio"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Divant d' aler pus avant, vos dvrîz lére atintivmint l' licince.\n"</div><div class='del'>-"Ele covere li distribucion Mandrakelinux, si vos estoz d' acoird\n"</div><div class='add'>+"Ele covere li distribucion Mandrivalinux, si vos estoz d' acoird\n"</div><div class='ctx'> "avou les termes del licince, clitchîz sol boesse «%s».\n"</div><div class='ctx'> "Ôtrumint, clitchîz sol boton «%s» po renonder l' copiutrece."</div><div class='ctx'> </div><div class='hunk'>@@ -3956,13 +3956,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"L' astalaedje del distribucion Mandrakelinux si fwait a pårti di\n"</div><div class='add'>+"L' astalaedje del distribucion Mandrivalinux si fwait a pårti di\n"</div><div class='ctx'> "sacwantès plakes lazer diferinnes. Si on pacaedje k' a stî tchoezi\n"</div><div class='ctx'> "est so ene ôte plake lazer, DrakX frè rexhe li plake k' est el lijheu\n"</div><div class='ctx'> "d' plakes lazer eyet vos dmander d' î mete li cene k' i fåt.\n"</div><div class='hunk'>@@ -3973,11 +3973,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -4030,7 +4030,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Asteure c' est l' moumint di specifyî kés programes ki vos vloz astaler so\n"</div><div class='ctx'> "voste éndjole. I gn a des meyes et des meyes di pacaedjes pol "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "po rinde li tchoezixhaedje pus simpe il ont stî metous dins des groupes\n"</div><div class='ctx'> "di programes sorlon les bouyes k' i permetèt d' fé.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4145,10 +4145,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4178,12 +4178,12 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!! Si on pacaedje di sierveu a stî tchoezi, soeye-t i en esprès, ou k' i\n"</div><div class='ctx'> "fwait pårteye d' on groupe, on vos dmandrè d' acertiner ki vos vloz\n"</div><div class='del'>-"vormint astaler ces sierveus la. Avou Mandrakelinux tot l' minme ké\n"</div><div class='add'>+"vormint astaler ces sierveus la. Avou Mandrivalinux tot l' minme ké\n"</div><div class='ctx'> "sierveu k' a stî astalé est, avou les prémetowès tchuzes, metou en\n"</div><div class='ctx'> "alaedje tins di l' enondaedje di l' éndjole. Minme s' i sont seurs\n"</div><div class='ctx'> "et k' i gn a nou cnoxhou problinme å moumint ki l' distribucion a stî\n"</div><div class='ctx'> "fwaite, i s' pout k' des trôs di såvrité soeyexhe discovrous après ki\n"</div><div class='del'>-"cisse modêye chal di Mandrakelinux fouxhe fineye. Si vos n' savoz nén çou\n"</div><div class='add'>+"cisse modêye chal di Mandrivalinux fouxhe fineye. Si vos n' savoz nén çou\n"</div><div class='ctx'> "k' on siervice dné est supôzé di fé, ou pocwè k' il est astalé, adon\n"</div><div class='ctx'> "clitchîz so «%s». Si vos clitchîz so «%s» les siervices mostrés sront\n"</div><div class='ctx'> "astalés eyet enondés otomaticmint. !!\n"</div><div class='hunk'>@@ -4341,7 +4341,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4397,7 +4397,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "X (po Sistinme di Purneas X) est l' miercour di l' eterface grafike di\n"</div><div class='ctx'> "GNU/Linux, ki tos les evironmints grafikes (KDE, Gnome, AfterStep,\n"</div><div class='del'>-"WindowsMaker, evnd.) ki vnèt avou Mandrakelinux end ont mezåjhe.\n"</div><div class='add'>+"WindowsMaker, evnd.) ki vnèt avou Mandrivalinux end ont mezåjhe.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Vos åroz ene djivêye des diferins parametes a candjî po-z aveur\n"</div><div class='ctx'> "voste eterface grafike a l' idêye:\n"</div><div class='hunk'>@@ -4517,12 +4517,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4549,7 +4549,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4558,7 +4558,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4579,11 +4579,11 @@ msgid ""</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Asteure, vos dvoz tchoezi wice ki vos vloz astaler vosse sistinme\n"</div><div class='del'>-"d' operance Mandrakelinux so vosse deure plake. Si l' plake est vude,\n"</div><div class='add'>+"d' operance Mandrivalinux so vosse deure plake. Si l' plake est vude,\n"</div><div class='ctx'> "ou si les sistinmes d' operance k' i gn a ddja prindèt tote li plaece,\n"</div><div class='ctx'> "vos avoz mezåjhe del pårti. Fé on pårtixhaedje d' ene deure plake çoula\n"</div><div class='ctx'> "vout dire del pårti lodjicmint po fé del plaece po-z astaler vosse novea\n"</div><div class='del'>-"sistinme Mandrakelinux.\n"</div><div class='add'>+"sistinme Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Come, on côp ki li pårtixhaedje est fwait, on n' sait rivni en erî\n"</div><div class='ctx'> "(normålmint), les apurdisses ont sovint sogne ou peu di s' enonder.\n"</div><div class='hunk'>@@ -4614,7 +4614,7 @@ msgstr ""</div><div class='ctx'> "Li candjmint d' grandeu des pårticions si pout fé sins piede des dnêyes,\n"</div><div class='ctx'> "a condicion del disfragminter d' aprume, eyet kel pårticion soeye ene\n"</div><div class='ctx'> "pårticion FAT. C' est hôtmint ricmandé di fé ene copeye di såvrité.\n"</div><div class='del'>-"Cisse solucions est ricmandêye si vos vloz eployî Mandrakelinux et\n"</div><div class='add'>+"Cisse solucions est ricmandêye si vos vloz eployî Mandrivalinux et\n"</div><div class='ctx'> "Microsoft Windows sol minme copiutrece.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Divant di tchoezi cisse solucion, i vos fåt comprinde kel grandeu di vosse\n"</div><div class='hunk'>@@ -4623,7 +4623,7 @@ msgstr ""</div><div class='ctx'> "les dnêyes da vosse ou astaler des noveas programes.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * «%s»: si vos vloz disfacer totes les dnêyes k' i gn a\n"</div><div class='del'>-"so vosse deure plake po mete el plaece li sistinme Mandrakelinux,\n"</div><div class='add'>+"so vosse deure plake po mete el plaece li sistinme Mandrivalinux,\n"</div><div class='ctx'> "vos ploz tchoezi cisse tchuze chal.\n"</div><div class='ctx'> "Prindoz asteme k' avou cisse solucion chal vos n' pôroz nén rivni en erî\n"</div><div class='ctx'> "on côp ki vos avoz acertiné vosse tchuze.\n"</div><div class='hunk'>@@ -4790,7 +4790,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4815,7 +4815,7 @@ msgstr ""</div><div class='ctx'> "pårticions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Clitchîz so «%s» si vos vloz tchoezi ene ôte pårticion po-z astaler\n"</div><div class='del'>-"vosse novea sistinme d' operance Mandrakelinux.\n"</div><div class='add'>+"vosse novea sistinme d' operance Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Clitchîz so «%s» si vos vloz tchoezi les pårticions ki sront\n"</div><div class='ctx'> "verifieyes po vey s' i gn a des måvas bloks sol deure plake."</div><div class='hunk'>@@ -4832,7 +4832,7 @@ msgstr "Di dvant"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4844,7 +4844,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Å moumint ki vos astalez Mandrakelinux, i s' pout bén k' i gn åye\n"</div><div class='add'>+"Å moumint ki vos astalez Mandrivalinux, i s' pout bén k' i gn åye\n"</div><div class='ctx'> "des pacaedjes k' ont stî metous a djoû dispoy li moumint do fijhaedje\n"</div><div class='ctx'> "del distribucion. Motoit k' des bugs ont stî coridjîs, ou des problinmes\n"</div><div class='ctx'> "di såvrité. Por vos profiter di ces metaedjes a djoû, on vs propôze\n"</div><div class='hunk'>@@ -4875,7 +4875,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4889,7 +4889,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Si vos n' savoz cwè tchoezi, leyîz li prémetou livea. Vos l' pôroz candjî\n"</div><div class='ctx'> "pus tård avou l' usteye draksec a pårti do cinte di contrôle di "</div><div class='del'>-"Mandrakelinux.\n"</div><div class='add'>+"Mandrivalinux.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Li tchamp «%s» c' est po dner l' adresse emile d' ene sakî responsåve del\n"</div><div class='ctx'> "såvrité po ciste éndjole ci. Les messaedjes sol såvrité lyi sront evoyîs."</div><div class='hunk'>@@ -4903,7 +4903,7 @@ msgstr "Manaedjeu pol såvrité"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4974,7 +4974,7 @@ msgid ""</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Chal, vos dvoz tchoezi so kéne/kénès pårticion(s) ki vos voloz astaler\n"</div><div class='del'>-"vosse sistinme Mandrakelinux. Si vos pårticions ont ddja stî fwaites\n"</div><div class='add'>+"vosse sistinme Mandrivalinux. Si vos pårticions ont ddja stî fwaites\n"</div><div class='ctx'> "(p. egz. li dierin côp ki vos avoz astalé GNU/Linux ou bén avou ene ôte\n"</div><div class='ctx'> "usteye di pårtixhaedje), vos les ploz eployî. Ôtrumint, des pårticions dvèt\n"</div><div class='ctx'> "esse defineyes so vosse deure plake. Ça vout dire ki vos alez dispårti\n"</div><div class='hunk'>@@ -5068,7 +5068,7 @@ msgstr "Candjî pol môde normå/spepieus"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -5098,7 +5098,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Pus d' ene pårticion Windows a stî detectêye so vosse deure plake.\n"</div><div class='ctx'> "Tchoezixhoz li cene ki vos vloz candjî si grandeu, po-z astaler vosse\n"</div><div class='del'>-"novea sistinme d'&amp;nbsp;operance Mandrakelinux s' i vs plait.\n"</div><div class='add'>+"novea sistinme d'&amp;nbsp;operance Mandrivalinux s' i vs plait.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Po l' informåcion, tchaeke pårticion est mostrêye come çoula:\n"</div><div class='ctx'> "«no Linux», «no Windows», «grandeu».\n"</div><div class='hunk'>@@ -5148,7 +5148,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -5157,19 +5157,19 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ciste etape est enondêye seulmint si ene viye pårticion GNU/Linux a stî\n"</div><div class='ctx'> "trovêye so voste éndjole.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX asteure a mezåjhe di saveur si vos vloz fé ene novele astalåcion\n"</div><div class='del'>-"oudonbén fé on metaedje a djoû d' on sistinme Mandrakelinux k' i gn a\n"</div><div class='add'>+"oudonbén fé on metaedje a djoû d' on sistinme Mandrivalinux k' i gn a\n"</div><div class='ctx'> "ddja sol plake:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * «%s»: çouchal va spotchî ttafwait l' vî sistinme k' i gn\n"</div><div class='hunk'>@@ -5180,14 +5180,14 @@ msgstr ""</div><div class='ctx'> "ki n' seront nén spotcheyes.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * «%s»: cisse classe d' astalaedje chal vos permete di\n"</div><div class='del'>-"mete a djoû les pacaedjes k' i gn a so vosse sistinme Mandrakelinux.\n"</div><div class='add'>+"mete a djoû les pacaedjes k' i gn a so vosse sistinme Mandrivalinux.\n"</div><div class='ctx'> "Vosse pårtixhaedje est wårdé et les dnêyes des uzeus n' sont nén\n"</div><div class='ctx'> "candjeyes. Li plupårt des ôtès etapes d' apontiaedje dimorèt, come\n"</div><div class='ctx'> "pol cas d' èn astalaedje sitandård.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Eployî l' tchuze «Metaedje a djoû» rote comifåt po mete a djoû des\n"</div><div class='del'>-"sistinmes Mandrakelinux modêye «8.1» ou pus nouve. Mins l' fé po\n"</div><div class='del'>-"des modêyes di Mandrakelinux pus viyes kel «8.1» n' est nén ricmandé."</div><div class='add'>+"sistinmes Mandrivalinux modêye «8.1» ou pus nouve. Mins l' fé po\n"</div><div class='add'>+"des modêyes di Mandrivalinux pus viyes kel «8.1» n' est nén ricmandé."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5245,7 +5245,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5290,7 +5290,7 @@ msgstr ""</div><div class='ctx'> "Åd fwait do sopoirt UTF-8 (unicôde): Unicôde est on novea ecôdaedje\n"</div><div class='ctx'> "ki permete di scrire tos les lingaedjes del Daegn. Mins i gn a co des\n"</div><div class='ctx'> "sacwès a-z amidrer dins l' sopoirt UTF-8 so GNU/Linux. Vola pocwè\n"</div><div class='del'>-"Mandrakelinux eployrè UTF-8 ou nén sorlon les tchuzes ki vos djhoz:\n"</div><div class='add'>+"Mandrivalinux eployrè UTF-8 ou nén sorlon les tchuzes ki vos djhoz:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * Si vos tchoezixhoz on lingaedje avou ene foite eritance d' on dné\n"</div><div class='ctx'> "ecôdaedje (lingaedjes latin1, rûsse, djaponès, chinwès, corêyin, taylandès\n"</div><div class='hunk'>@@ -5541,7 +5541,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5562,12 +5562,12 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Chal, vos tchoezixhoz li ké sistinme d' imprimaedje vos vloz eployî\n"</div><div class='ctx'> "so vosse copiutrece. Des ôtes sistinmes d' operance k' i gn a\n"</div><div class='del'>-"vos dnèt onk, mins Mandrakelinux vos lait tchoezi inte deus, tchaeke onk\n"</div><div class='add'>+"vos dnèt onk, mins Mandrivalinux vos lait tchoezi inte deus, tchaeke onk\n"</div><div class='ctx'> "estant l' meyeu dins on cas dné.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * «%s» - ki vout dire «print, do not queue» (imprimer sins cawêye), est\n"</div><div class='hunk'>@@ -5591,7 +5591,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "Si vos tchoezixhoz asteure, et ki pus tård vos n' inmez nén vosse sistinme\n"</div><div class='ctx'> "d' imprimaedje, vos l' poloz åjheymint candjî avou l' usteye d' apontiaedje\n"</div><div class='del'>-"des scrireces, a-z enonder a pårti do cinte di contrôle di Mandrakelinux, "</div><div class='add'>+"des scrireces, a-z enonder a pårti do cinte di contrôle di Mandrivalinux, "</div><div class='ctx'> "tot\n"</div><div class='ctx'> "clitchant sol boton «%s»."</div><div class='ctx'> </div><div class='hunk'>@@ -5709,7 +5709,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5726,7 +5726,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5777,7 +5777,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * «%s»: Si vos vloz apontyî li rantoele (locåle ou daegnrece),\n"</div><div class='ctx'> "clitchîz so ç' boton chal. Lijhoz li documintåcion so papî oudonbén\n"</div><div class='del'>-"li cene håynåve a pårti do cinte di controle di Mandrakelinux\n"</div><div class='add'>+"li cene håynåve a pårti do cinte di controle di Mandrivalinux\n"</div><div class='ctx'> "après l' astalaedje po-z aveur pus di racsegnes.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * «%s»: vos permete d' apontyî les adresses des procsis HTTP eyet FTP\n"</div><div class='hunk'>@@ -5794,7 +5794,7 @@ msgstr ""</div><div class='ctx'> " * «%s»: si vos vloz candjî l' apontiaedje di l' enondrece\n"</div><div class='ctx'> "di l' éndjole. Vos nel duvrîz fé ki si vos estoz seur di vos.\n"</div><div class='ctx'> "Lijhoz li documintåcion so l' enondrece dins l' cinte di controle\n"</div><div class='del'>-"di Mandrakelinux po pus di racsegnes.\n"</div><div class='add'>+"di Mandrivalinux po pus di racsegnes.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * «%s»: vos pôroz controler finmint les kés siervices ki vos vloz\n"</div><div class='ctx'> "enonder so voste éndjole. Si vos l' vloz eployî po fé do sierveu c' est\n"</div><div class='hunk'>@@ -5855,11 +5855,11 @@ msgstr "Siervices"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Tchoezixhoz li deure plake ki vos vloz disfacer po-z î astaler vosse\n"</div><div class='del'>-"novele pårticion Mandrakelinux. Prindoz asteme, totes les dnêyes\n"</div><div class='add'>+"novele pårticion Mandrivalinux. Prindoz asteme, totes les dnêyes\n"</div><div class='ctx'> "k' i gn a sol deure plake vont esse pierdowes, et vos n' pôroz les rapexhî."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -5902,7 +5902,7 @@ msgstr ""</div><div class='ctx'> "Dji n' sai vey les modules po vosse nawea (i gn a pont d' fitchî %s), çoula "</div><div class='ctx'> "vout probåblumint dire ki vosse plakete d' enondaedje n' a nén stî fwait pol "</div><div class='ctx'> "sopoirt d' astalaedje ki vos vloz eployî. Vos dvrîz fé ene nouve plakete, a "</div><div class='del'>-"pårti des imådjes ki vnèt avou li modêye di Mandrakelinux ki vos vloz astaler"</div><div class='add'>+"pårti des imådjes ki vnèt avou li modêye di Mandrivalinux ki vos vloz astaler"</div><div class='ctx'> </div><div class='ctx'> #: install2.pm:172</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -6219,7 +6219,7 @@ msgstr "Carculant l' grandeu del pårticion Windows"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr "Vosse pårticion Windows est trop fragmintêye, i fåreut eployî «defrag»"</div><div class='ctx'> </div><div class='hunk'>@@ -6339,19 +6339,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6373,7 +6373,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6381,14 +6381,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6398,7 +6398,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6418,10 +6418,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6432,11 +6432,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6452,7 +6452,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -6515,7 +6515,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6523,13 +6523,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Felicitåcions, l' astalåcion a stî fwaite.\n"</div><div class='ctx'> "Bodjîz li sopoirt d' enondaedje et tapez so Return po renonder l' éndjole.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Po des informåcions so les coridjaedjes k' i gn a po cisse modêye di "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "loukîz al pådje des Errata sol waibe:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6537,7 +6537,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "vos trovroz di l' informåcion so l' apontiaedje do sistinme el tchaptrê\n"</div><div class='del'>-"sol post-astalåcion do Guide di l' Uzeu Mandrakelinux Oficir."</div><div class='add'>+"sol post-astalåcion do Guide di l' Uzeu Mandrivalinux Oficir."</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6573,12 +6573,12 @@ msgstr "Intrant e l' etape '%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vosse sistinme a po di rsources. Vos pôrîz aveur des rujhes po\n"</div><div class='del'>-"l' astalåcion di Mandrakelinux. Si çoula arive, vos ploz sayî ene\n"</div><div class='add'>+"l' astalåcion di Mandrivalinux. Si çoula arive, vos ploz sayî ene\n"</div><div class='ctx'> "astalåcion e môde tecse. Po çoula, tchoûkîz sol tape «F1» a l' enondaedje\n"</div><div class='ctx'> "et poy tapez «text»."</div><div class='ctx'> </div><div class='hunk'>@@ -7125,9 +7125,9 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Dj' atôche li waibe da Mandrakelinux po-z aveur li djivêye di muroes k' i gn "</div><div class='add'>+"Dj' atôche li waibe da Mandrivalinux po-z aveur li djivêye di muroes k' i gn "</div><div class='ctx'> "a"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -7353,8 +7353,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Astalåcion di Mandrakelinux %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Astalåcion di Mandrivalinux %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9941,14 +9941,14 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Apontiaedje do côpe feu drakefirewall\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Çouci apontieye on côpe feu personel (dj' ô bén, po esse eployî sor on\n"</div><div class='del'>-"posse éndjolrece) po ciste éndjole Mandrakelinux chal.\n"</div><div class='add'>+"posse éndjolrece) po ciste éndjole Mandrivalinux chal.\n"</div><div class='ctx'> "Po ene poûxhante solucion di côpe feu, loukîz purade do costé\n"</div><div class='ctx'> "del distribucion MandrakeSecurity avou on côpe feu di hôte såvrité."</div><div class='ctx'> </div><div class='hunk'>@@ -14025,12 +14025,12 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Enondez Scannerdrake («Éndjolreye/Sicanreces» e cinte di controle di "</div><div class='del'>-"Mandrakelinux) po pårtaedjî vosse sicanrece sol rantoele.\n"</div><div class='add'>+"Mandrivalinux) po pårtaedjî vosse sicanrece sol rantoele.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='ctx'> #: printer/printerdrake.pm:3933</div><div class='hunk'>@@ -16018,23 +16018,23 @@ msgstr "Arester"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux, k' est çki c' est d' ça?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux, k' est çki c' est d' ça?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "Bénvnowe a &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "Bénvnowe a &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux est ene &lt;b&gt;distribucion di GNU/Linux&lt;/b&gt; fwait do cour do "</div><div class='add'>+"Mandrivalinux est ene &lt;b&gt;distribucion di GNU/Linux&lt;/b&gt; fwait do cour do "</div><div class='ctx'> "sistinme, dj' ô bén li &lt;b&gt;nawea&lt;/b&gt; do sistinme d' operance (båzé sol nawea "</div><div class='ctx'> "Linux) eyet aconcoisté di &lt;b&gt;bråmint di programes&lt;/b&gt; po pleur fé ene miete "</div><div class='ctx'> "tot çki vos pôrîz tuzer d' fé."</div><div class='hunk'>@@ -16042,10 +16042,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux est li distribucion di GNU/Linux li pus &lt;b&gt;uzeu-amiståve&lt;/b&gt; "</div><div class='add'>+"Mandrivalinux est li distribucion di GNU/Linux li pus &lt;b&gt;uzeu-amiståve&lt;/b&gt; "</div><div class='ctx'> "d' enute.C' est eto ene des distribucions di Linux les &lt;b&gt;pus eployeyes sol "</div><div class='ctx'> "Daegn&lt;/b&gt;!"</div><div class='ctx'> </div><div class='hunk'>@@ -16062,15 +16062,15 @@ msgstr "Wilicome amon les &lt;b&gt;libes programes&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux shût l' modele des libès programes. Dj' ô bén ki cisse nouve "</div><div class='add'>+"Mandrivalinux shût l' modele des libès programes. Dj' ô bén ki cisse nouve "</div><div class='ctx'> "modêye est l' rizultat del &lt;b&gt;colaboråcion&lt;/b&gt; etur l' &lt;b&gt;ekipe di "</div><div class='del'>-"diswalpeus di Mandrakesoft&lt;/b&gt; eyet li &lt;b&gt;cminålté daegnrece&lt;/b&gt; des "</div><div class='del'>-"contribouweus a Mandrakelinux."</div><div class='add'>+"diswalpeus di Mandriva&lt;/b&gt; eyet li &lt;b&gt;cminålté daegnrece&lt;/b&gt; des "</div><div class='add'>+"contribouweus a Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16090,10 +16090,10 @@ msgstr "&lt;b&gt;Li licince GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Li plupårt des programes ki vnèt avou l' distribucion, eyet totes les "</div><div class='del'>-"usteyes di Mandrakelinux, sont dizo li &lt;b&gt;Licince Publike Djeneråle&lt;/b&gt; "</div><div class='add'>+"usteyes di Mandrivalinux, sont dizo li &lt;b&gt;Licince Publike Djeneråle&lt;/b&gt; "</div><div class='ctx'> "(GPL)."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -16126,15 +16126,15 @@ msgstr "&lt;b&gt;Ridjondoz li cminålté&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux a-st ene des &lt;b&gt;pus grandès cminåltés&lt;/b&gt; d' uzeus eyet "</div><div class='add'>+"Mandrivalinux a-st ene des &lt;b&gt;pus grandès cminåltés&lt;/b&gt; d' uzeus eyet "</div><div class='ctx'> "d' diswalpeus. Li role d' ene sifwaite kiminålté est foirt lådje, alant des "</div><div class='ctx'> "rapoirtaedjes di bugs å diswalpaedje di noveas programes. Li cminålté djouwe "</div><div class='del'>-"on &lt;b&gt;role-clé&lt;/b&gt; dins l' monde di Mandrakelinux."</div><div class='add'>+"on &lt;b&gt;role-clé&lt;/b&gt; dins l' monde di Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16156,11 +16156,11 @@ msgstr "&lt;b&gt;Modêye aberwetaedje («Download version»)&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Vos estoz k' astale li &lt;b&gt;Modêye aberwetaedje di Mandrakelinux&lt;/b&gt;. C' est "</div><div class='del'>-"ene modêye po rén ki Mandrakesoft rind &lt;b&gt;disponibe po tertos&lt;/b&gt;."</div><div class='add'>+"Vos estoz k' astale li &lt;b&gt;Modêye aberwetaedje di Mandrivalinux&lt;/b&gt;. C' est "</div><div class='add'>+"ene modêye po rén ki Mandriva rind &lt;b&gt;disponibe po tertos&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16193,10 +16193,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vos n' åroz nén accès nerén åzès &lt;b&gt;siervices&lt;/b&gt; ki vnèt avou les ôtes "</div><div class='del'>-"prodûts di Mandrakesoft."</div><div class='add'>+"prodûts di Mandriva."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16205,8 +16205,8 @@ msgstr "&lt;b&gt;«Discovery», li dischovraedje di vosse prumî scribanne Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "Vos estoz k' astale &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt; (dischovraedje)."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "Vos estoz k' astale &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt; (dischovraedje)."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16229,17 +16229,17 @@ msgstr "&lt;b&gt;Li PowerPack, li meyeu do scribanne Linux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "Vos estoz k' astale &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "Vos estoz k' astale &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Li PowerPack est li prodût Mandrakesoft avou on &lt;b&gt;scribanne Linux di "</div><div class='add'>+"Li PowerPack est li prodût Mandriva avou on &lt;b&gt;scribanne Linux di "</div><div class='ctx'> "prumire classe&lt;/b&gt;. Li PowerPack vént avou des &lt;b&gt;meyes di programes&lt;/b&gt; - "</div><div class='ctx'> "di ttafwait, des pus simpes disk' ås pus spepieus."</div><div class='ctx'> </div><div class='hunk'>@@ -16250,8 +16250,8 @@ msgstr "&lt;b&gt;PowerPack+, li solucion Linux po les scribannes et les sierveus&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "Vos estoz k' astale &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "Vos estoz k' astale &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16268,22 +16268,22 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Prodûts Mandrakesoft&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Prodûts Mandriva&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; a diswalpé ene lådje game di prodûts &lt;b&gt;Mandrakelinux&lt;/"</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; a diswalpé ene lådje game di prodûts &lt;b&gt;Mandrivalinux&lt;/"</div><div class='ctx'> "b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Les prodûts Mandrakelinux sont:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Les prodûts Mandrivalinux sont:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16305,40 +16305,40 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux pås x86-64&lt;/b&gt;, li solucion Mandrakelinux po-z eployî å "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux pås x86-64&lt;/b&gt;, li solucion Mandrivalinux po-z eployî å "</div><div class='ctx'> "mî li processeu 64-bits da vosse."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Prodûts Mandrakesoft (prodûts nomades)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Prodûts Mandriva (prodûts nomades)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft a diswalpé deus prodûts ki vs permetèt d' eployî Mandrakelinux "</div><div class='add'>+"Mandriva a diswalpé deus prodûts ki vs permetèt d' eployî Mandrivalinux "</div><div class='ctx'> "so &lt;b&gt;tot l' minme li kéne copiutrece&lt;/b&gt; eyet sins mezåjhe di l' astaler po "</div><div class='ctx'> "l' eployî:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt; (bodjî), ene distribucion Mandrakelinux ki s' enonde "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt; (bodjî), ene distribucion Mandrivalinux ki s' enonde "</div><div class='ctx'> "totafwaitmint a pårti d' ene plake lazer."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;GlobeTrotter&lt;/b&gt; (trote-Daegn), ene distribucion pré-astalêye sol "</div><div class='hunk'>@@ -16346,38 +16346,38 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Prodûts Mandrakesoft (solucions professioneles)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Prodûts Mandriva (solucions professioneles)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Chal pa dzo les prodûts Mandrakesoft fwait po les &lt;b&gt;mezåjhes professionels&lt;/"</div><div class='add'>+"Chal pa dzo les prodûts Mandriva fwait po les &lt;b&gt;mezåjhes professionels&lt;/"</div><div class='ctx'> "b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Sicribanne po eterprijhes («Corporate Desktop»)&lt;/b&gt;, li scribanne di "</div><div class='del'>-"Mandrakelinux po ls eterprijhes."</div><div class='add'>+"Mandrivalinux po ls eterprijhes."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Sierveu po eterprijhes («Corporate Server»)&lt;/b&gt;, li solucion sierveus "</div><div class='del'>-"di Mandrakelinux"</div><div class='add'>+"di Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Côpe-feu multi-rantoeles («Multi-Network Firewall» u «MNF»)&lt;/b&gt;, li "</div><div class='del'>-"solucion Mandrakelinux pol såvrité des rantoeles."</div><div class='add'>+"solucion Mandrivalinux pol såvrité des rantoeles."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16420,10 +16420,10 @@ msgstr "&lt;b&gt;Tchoezixhoz vosse evironmint di scribanne grafike&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Avou l' PowerPack, vos åroz l' tchuze di l' &lt;b&gt;evironmint di scribanne "</div><div class='del'>-"grafike&lt;/b&gt;. Mandrakesoft a fwait l' tchuze di &lt;b&gt;KDE&lt;/b&gt; po l' ci k' est "</div><div class='add'>+"grafike&lt;/b&gt;. Mandriva a fwait l' tchuze di &lt;b&gt;KDE&lt;/b&gt; po l' ci k' est "</div><div class='ctx'> "prémetou."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -16449,10 +16449,10 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Avou l' PowerPack+, vos åroz l' tchuze di l' &lt;b&gt;evironmint di scribanne "</div><div class='del'>-"grafike&lt;/b&gt;. Mandrakesoft a tchoezi &lt;b&gt;KDE&lt;/b&gt; come prémetou scribanne."</div><div class='add'>+"grafike&lt;/b&gt;. Mandriva a tchoezi &lt;b&gt;KDE&lt;/b&gt; come prémetou scribanne."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16581,10 +16581,10 @@ msgstr "&lt;b&gt;Mo do plaijhi avou l' lådje fortchete di programes&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"E menu Mandrakelinux vos trovroz des programes &lt;b&gt;åjheys a-z eployî&lt;/b&gt; po "</div><div class='add'>+"E menu Mandrivalinux vos trovroz des programes &lt;b&gt;åjheys a-z eployî&lt;/b&gt; po "</div><div class='ctx'> "&lt;b&gt;tot çki vos vôrîz fé&lt;/b&gt;:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16854,18 +16854,18 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Cinte di contrôle di Mandrakelinux&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Cinte di contrôle di Mandrivalinux&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Li &lt;b&gt;cinte di contrôle di Mandrakelinux&lt;/b&gt; est ene ramexhnêye d' usteyes "</div><div class='del'>-"essincieles di Mandrakelinux po vs simplifyî l' apontiaedje del copiutrece "</div><div class='add'>+"Li &lt;b&gt;cinte di contrôle di Mandrivalinux&lt;/b&gt; est ene ramexhnêye d' usteyes "</div><div class='add'>+"essincieles di Mandrivalinux po vs simplifyî l' apontiaedje del copiutrece "</div><div class='ctx'> "da vosse."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16891,17 +16891,17 @@ msgstr "&lt;b&gt;Li modele des libes programes&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Come tot programaedje po les copiutreces, les libes programes &lt;b&gt;ont mezåjhe "</div><div class='ctx'> "di tines et d' djins&lt;/b&gt; po-z esse diswalpés. Po shure li filozofeye des "</div><div class='del'>-"libes programes Mandrakesoft vind des prodûts avou del radjoutêye valixhance "</div><div class='del'>-"eyet des siervices po ki &lt;b&gt;Mandrakelinux continouwe a-z esse tofer "</div><div class='add'>+"libes programes Mandriva vind des prodûts avou del radjoutêye valixhance "</div><div class='add'>+"eyet des siervices po ki &lt;b&gt;Mandrivalinux continouwe a-z esse tofer "</div><div class='ctx'> "improuvé&lt;/b&gt;. Si vos vloz &lt;b&gt;sopoirter l' filozofeye des libes programes&lt;/b&gt; "</div><div class='del'>-"eyet l' diswalpaedje di Mandrakelinux, adon, &lt;b&gt;si vos vloz bén&lt;/b&gt;, tuzez a-"</div><div class='add'>+"eyet l' diswalpaedje di Mandrivalinux, adon, &lt;b&gt;si vos vloz bén&lt;/b&gt;, tuzez a-"</div><div class='ctx'> "z atchter onk di nos prodûts ou siervices!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16912,11 +16912,11 @@ msgstr "&lt;b&gt;Li botike so les fyis&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Vos trovroz tos les prodûts eyet siervices da Mandrakesoft sol Botike di "</div><div class='del'>-"Mandrakelinux -- nosse &lt;b&gt;tcherpinte di siervices eyet di comiece so les "</div><div class='add'>+"Vos trovroz tos les prodûts eyet siervices da Mandriva sol Botike di "</div><div class='add'>+"Mandrivalinux -- nosse &lt;b&gt;tcherpinte di siervices eyet di comiece so les "</div><div class='ctx'> "fyis&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16941,24 +16941,24 @@ msgstr "Passez ådjourdu minme pa &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; est li &lt;b&gt;cpagnon a l' idêye&lt;/b&gt; po vosse prodût "</div><div class='del'>-"Mandrakelinux.."</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; est li &lt;b&gt;cpagnon a l' idêye&lt;/b&gt; po vosse prodût "</div><div class='add'>+"Mandrivalinux.."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Profitez d' nos &lt;b&gt;advintaedjes&lt;/b&gt; tot radjondant l' Mandrakeclub; metans:"</div><div class='add'>+"Profitez d' nos &lt;b&gt;advintaedjes&lt;/b&gt; tot radjondant l' Mandriva Club; metans:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16980,40 +16980,40 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* Pårticiper åzès &lt;b&gt;foroms des uzeus&lt;/b&gt; di Mandrakelinux."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* Pårticiper åzès &lt;b&gt;foroms des uzeus&lt;/b&gt; di Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "\t* &lt;b&gt;Accès priviledjî eyet pus timpe&lt;/b&gt;, divant l' publik cossemaedje, "</div><div class='del'>-"åzès &lt;b&gt;imådjes ISO&lt;/b&gt; di Mandrakelinux."</div><div class='add'>+"åzès &lt;b&gt;imådjes ISO&lt;/b&gt; di Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; est on novea siervice di prumî livea ki Mandrakesoft "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; est on novea siervice di prumî livea ki Mandriva "</div><div class='ctx'> "est fir d' ofri a ses candes!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline dene ene lådje fortchete di clapants siervices po&lt;b&gt;mete "</div><div class='del'>-"åjheymint a djoû&lt;/b&gt; vos sistinmes Mandrakelinux:"</div><div class='add'>+"Mandriva Online dene ene lådje fortchete di clapants siervices po&lt;b&gt;mete "</div><div class='add'>+"åjheymint a djoû&lt;/b&gt; vos sistinmes Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17039,40 +17039,40 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='del'>-msgstr "\t* Manaedjî &lt;b&gt;tos vos sistinmes Mandrakelinux&lt;/b&gt; avou on seu conte."</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='add'>+msgstr "\t* Manaedjî &lt;b&gt;tos vos sistinmes Mandrivalinux&lt;/b&gt; avou on seu conte."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Avoz vs mezåjhe d' &lt;b&gt;aidance&lt;/b&gt;? Rescontrez les esperts tecnikes di "</div><div class='del'>-"Mandrakesoft dizo &lt;b&gt;nosse platfôme di sopoirt tecnike&lt;/b&gt; www."</div><div class='add'>+"Mandriva dizo &lt;b&gt;nosse platfôme di sopoirt tecnike&lt;/b&gt; www."</div><div class='ctx'> "mandrakeexpert.com."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Gråces a l' aidance des &lt;b&gt;esperts cwålifyîs Mandrakelinux&lt;/b&gt;, vos alez "</div><div class='add'>+"Gråces a l' aidance des &lt;b&gt;esperts cwålifyîs Mandrivalinux&lt;/b&gt;, vos alez "</div><div class='ctx'> "wangnî bråmint do tins."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Po tote kesse åd fwait di Mandrakelinux, vos ploz atchter do sopoirt po des "</div><div class='add'>+"Po tote kesse åd fwait di Mandrivalinux, vos ploz atchter do sopoirt po des "</div><div class='ctx'> "problinmes sol botike &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -17376,8 +17376,8 @@ msgstr "Usteyes di corwaitaedje, contaedje des process, tcpdump, nmap, ..."</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Macreas Mandrakesoft"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Macreas Mandriva"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17475,8 +17475,8 @@ msgstr ""</div><div class='ctx'> "TCHUZES:\n"</div><div class='ctx'> "  --help            - mostere ci messaedje d' aidance chal.\n"</div><div class='ctx'> "  --report          - li programe doet esse ene des usteyes di "</div><div class='del'>-"Mandrakelinux\n"</div><div class='del'>-"  --incident        - li programe doet esse ene des usteyes di Mandrakelinux"</div><div class='add'>+"Mandrivalinux\n"</div><div class='add'>+"  --incident        - li programe doet esse ene des usteyes di Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -17531,7 +17531,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -17589,7 +17589,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='hunk'>@@ -17597,7 +17597,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[TCHUZES]...\n"</div><div class='ctx'> "  --no-confirmation      èn nén dmander d' aveurixhaedje e môde "</div><div class='del'>-"MandrakeUpdate\n"</div><div class='add'>+"Mandriva Update\n"</div><div class='ctx'> "  --no-verify-rpm        èn nén verifyî les sinateures des pacaedjes rpm\n"</div><div class='ctx'> "  --changelog-first      håyner li djournå des candjmints divant l' djivêye "</div><div class='ctx'> "des fitchîs e purnea\n"</div><div class='hunk'>@@ -20268,13 +20268,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Usteye di rapoirtaedje di bugs di Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Usteye di rapoirtaedje di bugs di Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Cinte di contrôle di Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Cinte di contrôle di Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20294,8 +20294,8 @@ msgstr "HardDrake"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline (Mandrakesoft so fyis)"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online (Mandriva so fyis)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20339,8 +20339,8 @@ msgstr "Macreas d' apontiaedje"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "Tchoezixhoz l' usteye da Mandrakesoft:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "Tchoezixhoz l' usteye da Mandriva:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20766,7 +20766,7 @@ msgstr "En alaedje a l' enondaedje"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Ciste eterface n' a nén co stî apontieye.\n"</div><div class='ctx'> "Enondez li macrea «Radjouter ene eterface» a pårti do cinte di contrôle."</div><div class='hunk'>@@ -20775,7 +20775,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Vos n' avoz nou raloyaedje al daegntoele d' apontyî.\n"</div><div class='ctx'> "Enondez li macrea «%s» a pårti do cinte di contrôle."</div><div class='hunk'>@@ -20828,8 +20828,8 @@ msgstr "KDM (manaedjeu di håynaedje KDE)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM ((manaedjeu di håynaedje Mandrakelinux)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM ((manaedjeu di håynaedje Mandrivalinux)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -21131,7 +21131,7 @@ msgstr "Abagaedje"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -21140,7 +21140,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Copyright © 2001-2002 pa Mandrakesoft \n"</div><div class='add'>+"Copyright © 2001-2002 pa Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "        DUPONT Sébastien (prumire modêye)\n"</div><div class='hunk'>@@ -21690,14 +21690,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright © 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright © 2003-2004 Mandriva.\n"</div><div class='ctx'> "Çouchal est on libe programe et pout esse cossemé dzo les termes del licince "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -21727,8 +21727,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Cinte di l' aidance di Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Cinte di l' aidance di Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25070,8 +25070,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Djournås des usteyes di Mandrakelinux"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Djournås des usteyes di Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -25586,10 +25586,10 @@ msgstr "Raloyaedje completé."</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Li raloyaedje a fwait berwete.\n"</div><div class='del'>-"Verifyîz vost apontiaedje dins l' cinte di contrôle di Mandrakelinux."</div><div class='add'>+"Verifyîz vost apontiaedje dins l' cinte di contrôle di Mandrivalinux."</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po<br/>index d28b4518b..245016d13 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/zh_CN.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/zh_CN.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/zh_CN.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/zh_CN.po</a></div><div class='hunk'>@@ -11,7 +11,7 @@ msgstr ""</div><div class='ctx'> "POT-Creation-Date: 2005-04-21 14:27+0200\n"</div><div class='ctx'> "PO-Revision-Date: 2005-03-27 06:56+0800\n"</div><div class='ctx'> "Last-Translator: Funda Wang &lt;fundawang@linux.net.cn&gt;\n"</div><div class='del'>-"Language-Team: Mandrakelinux i18n Team &lt;cooker-i18n@linux-mandrake.com&gt;\n"</div><div class='add'>+"Language-Team: Mandrivalinux i18n Team &lt;cooker-i18n@linux-mandrake.com&gt;\n"</div><div class='ctx'> "MIME-Version: 1.0\n"</div><div class='ctx'> "Content-Type: text/plain; charset=UTF-8\n"</div><div class='ctx'> "Content-Transfer-Encoding: 8bit\n"</div><div class='hunk'>@@ -64,13 +64,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "USB 密钥盘好像启用了写保护, 但是现在无法安全拔出该密钥盘。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "请单击按钮重新启动计算机, 拔出该密钥盘之后, 去掉写保护后再插入, \n"</div><div class='del'>-"然后再次调用 Mandrake Move。"</div><div class='add'>+"然后再次调用 Mandriva Move。"</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -88,7 +88,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "您的 USB 密钥盘中没有有效的 Windows(FAT) 分区。而要继续使用此系\n"</div><div class='hunk'>@@ -98,13 +98,13 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "没有 USB 密钥盘, 您当然也可以继续 - 您仍然可以像普通的 Mandrake\n"</div><div class='del'>-"操作系统一样使用 Mandrake Move。"</div><div class='add'>+"操作系统一样使用 Mandriva Move。"</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:483</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -112,17 +112,17 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "我们没有在您的系统中检测到任何 USB 密钥盘。如果您现在插入一块这\n"</div><div class='del'>-"样的盘的话, Mandrake Move 将可以将您主目录和系统级配置中的数据透\n"</div><div class='add'>+"样的盘的话, Mandriva Move 将可以将您主目录和系统级配置中的数据透\n"</div><div class='ctx'> "明的保存在该密钥盘中, 以备下次启动此计算机之用。注意: 如果您刚刚\n"</div><div class='ctx'> "插入了密钥盘, 请在再次检测之前稍等几秒。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "没有 USB 密钥盘, 您当然也可以继续 - 您仍然可以像普通的 Mandrake\n"</div><div class='del'>-"操作系统一样使用 Mandrake Move。"</div><div class='add'>+"操作系统一样使用 Mandriva Move。"</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:494</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -246,7 +246,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -261,7 +261,7 @@ msgstr ""</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "这可能是 USB 密钥盘中的系统配置文件已经损坏。此时只需删除这些文\n"</div><div class='del'>-"件, 然后重新启动 Mandrake Move 即可解决此问题。要完成这一操作, \n"</div><div class='add'>+"件, 然后重新启动 Mandriva Move 即可解决此问题。要完成这一操作, \n"</div><div class='ctx'> "只需点击下面的按钮。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1287,11 +1287,11 @@ msgstr "语言选择"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux 可以支持多种语言。请选择您想要安装的语言。\n"</div><div class='add'>+"Mandrivalinux 可以支持多种语言。请选择您想要安装的语言。\n"</div><div class='ctx'> "安装完成并重新启动系统后它们就可以使用。"</div><div class='ctx'> </div><div class='ctx'> #: any.pm:752 any.pm:773 help.pm:647</div><div class='hunk'>@@ -3648,11 +3648,11 @@ msgstr "启用无线电支持"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrakelinux发行"</div><div class='add'>+"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrivalinux发行"</div><div class='ctx'> "版。如果您同意其中的全部条款, 请选中\"%s\"框。如果不同意, 单击\"%s\"按钮将重"</div><div class='ctx'> "新启动您的计算机。"</div><div class='ctx'> </div><div class='hunk'>@@ -3818,13 +3818,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, "</div><div class='add'>+"Mandrivalinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, "</div><div class='ctx'> "DrakX 将弹出当前\n"</div><div class='ctx'> "CD, 并要求您插入所需的正确 CD。如果您手中没有所请求的 CD, 只需单击\"%s\", 就"</div><div class='ctx'> "不会安装相应的软件包了。"</div><div class='hunk'>@@ -3835,11 +3835,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3890,11 +3890,11 @@ msgid ""</div><div class='ctx'> "command-line interface. The total size of this installation is about 65\n"</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='del'>-"现在该指定要在您的系统中安装哪些程序了。Mandrakelinux\n"</div><div class='add'>+"现在该指定要在您的系统中安装哪些程序了。Mandrivalinux\n"</div><div class='ctx'> "为您准备了数千个软件包。而为了使管理软件包更加容易, 软件包已经按相似程度分成"</div><div class='ctx'> "了多个组。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "按四个类别对软件包进行了分类。您可以从不同的类别混合选择应用程序。也就是说, "</div><div class='ctx'> "``工作站''中也可以选择安装``服务器''分类中的应用程序。\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -3992,10 +3992,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4023,9 +4023,9 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "!!\n"</div><div class='ctx'> "如果选择了服务器软件包, 不管是您特意选中的, 还是因为该软件包是某组的成员, 您"</div><div class='del'>-"都需要确认是否真的想要安装这些服务器。默认情况下, Mandrakelinux\n"</div><div class='add'>+"都需要确认是否真的想要安装这些服务器。默认情况下, Mandrivalinux\n"</div><div class='ctx'> "会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的, 但完"</div><div class='del'>-"全有可能在此版本 Mandrakelinux\n"</div><div class='add'>+"全有可能在此版本 Mandrivalinux\n"</div><div class='ctx'> "完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途, 或者不知道为什"</div><div class='ctx'> "么要安装这些服务, 请单击\"%s\"。单击\"%s\"将安装列出的服务, 并且启动时这些服"</div><div class='ctx'> "务会被自动启动。\n"</div><div class='hunk'>@@ -4172,7 +4172,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4226,7 +4226,7 @@ msgid ""</div><div class='ctx'> "want to check \"%s\" if your machine is to act as a server, or if you were\n"</div><div class='ctx'> "not successful in getting the display configured."</div><div class='ctx'> msgstr ""</div><div class='del'>-"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrakelinux\n"</div><div class='add'>+"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrivalinux\n"</div><div class='ctx'> "附带的所有图形环境(KDE、GNOME、AfterStep、WindowMaker 等)都依赖于该系统。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "您将会看到不同的参数列表, 以便进行图形显示选项的更改来达到最佳状态。其中包"</div><div class='hunk'>@@ -4338,12 +4338,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4370,7 +4370,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4379,7 +4379,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4399,11 +4399,11 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"在这一步里, 您需要决定您想要将 Mandrakelinux\n"</div><div class='add'>+"在这一步里, 您需要决定您想要将 Mandrivalinux\n"</div><div class='ctx'> "操作系统安装到硬盘的何处。如果您的硬盘完全是空的, 或者已有操作系统使用了所有"</div><div class='ctx'> "的空间, 您就必须要对硬盘进行分区。粗略的说, 对硬盘进行分区就是将其划分成几个"</div><div class='ctx'> "逻辑上不同的部分, 以便创建安装您新的\n"</div><div class='del'>-"Mandrakelinux 系统所需的空间。\n"</div><div class='add'>+"Mandrivalinux 系统所需的空间。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "由于对硬盘进行分区通常是不可恢复的, 并且可能导致数据丢失, 所以对于没有经验的"</div><div class='ctx'> "用户来说, 分区是十分危险的操作。所幸的是, DrakX\n"</div><div class='hunk'>@@ -4426,7 +4426,7 @@ msgstr ""</div><div class='ctx'> "Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢"</div><div class='ctx'> "失, 但您必须事先对 Windows\n"</div><div class='ctx'> "分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计"</div><div class='del'>-"算机上使用 Mandrakelinux 和 Microsoft\n"</div><div class='add'>+"算机上使用 Mandrivalinux 和 Microsoft\n"</div><div class='ctx'> "Windows, 则推荐使用此选项。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   注意, 在执行这一过程之后, 您原有的 Microsoft Windows 分区将会比先前小一"</div><div class='hunk'>@@ -4434,7 +4434,7 @@ msgstr ""</div><div class='ctx'> "下可用来存储数据或安装新软件的剩余空间也会变少。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区, 并将其替换为全新的 "</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "系统, 请选择此选项。请额外小心, 因为在您确认之后, 此操作无法撤销。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   !! 如果您选择了此选项, 您硬盘上的全部数据都将被删除。 !!\n"</div><div class='hunk'>@@ -4589,7 +4589,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4607,7 +4607,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "如果您准备好格式化分区了, 请单击\"%s\"。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"如果您想要选择其它分区用于安装 Mandrakelinux 操作系统, 请单击\"%s\"。\n"</div><div class='add'>+"如果您想要选择其它分区用于安装 Mandrivalinux 操作系统, 请单击\"%s\"。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "如果您想要选择要检测磁盘上的坏块, 请单击单击\"%s\"。"</div><div class='ctx'> </div><div class='hunk'>@@ -4625,7 +4625,7 @@ msgstr "上一步"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4637,7 +4637,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"在您安装 Mandrakelinux\n"</div><div class='add'>+"在您安装 Mandrivalinux\n"</div><div class='ctx'> "的这个时候, 很可能有些软件包在发行之后已经更新。有些故障已经被修正, 有些安全"</div><div class='ctx'> "问题已经被解决。为了让您能够享用这些更新, 您现在可以从 Internet\n"</div><div class='ctx'> "上下载它们。如果您的 Internet 连接已经可以使用, 请选择\"%s\"。如果您愿意以后"</div><div class='hunk'>@@ -4666,7 +4666,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4676,7 +4676,7 @@ msgstr ""</div><div class='ctx'> "包含关键数据, 或者将直接暴露于 Internet\n"</div><div class='ctx'> "之下, 则应该设置较高的安全级别。较高的安全级别通常以损失易用性作为代价。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mandrakelinux 控制中心的"</div><div class='add'>+"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mandrivalinux 控制中心的"</div><div class='ctx'> "一部分 draksec\n"</div><div class='ctx'> "来更改安全级别。\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4693,7 +4693,7 @@ msgstr "安全管理员"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4763,7 +4763,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mandrakelinux 系统。如果"</div><div class='add'>+"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mandrivalinux 系统。如果"</div><div class='ctx'> "已经定义了分区, 不管是先前安装的 GNU/Linux\n"</div><div class='ctx'> "还是由其它分区工具划分的, 您都可以使用已有的分区。否则, 必须对硬盘分区进行定"</div><div class='ctx'> "义。\n"</div><div class='hunk'>@@ -4837,7 +4837,7 @@ msgstr "在正常/专家模式间切换"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4866,7 +4866,7 @@ msgid ""</div><div class='ctx'> "disk or partition is called \"C:\")."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "在硬盘上检测到了多个 Microsoft 分区。请选择一个分区改变大小, 以便安装您新\n"</div><div class='del'>-"的 Mandrakelinux 操作系统。\n"</div><div class='add'>+"的 Mandrivalinux 操作系统。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "每个分区都是按“Linux 名称”、“Windows 名称”、“容量”顺序列出的。\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4913,7 +4913,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4922,30 +4922,30 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "仅当在您的计算机上发现了已有的 GNU/Linux 分区, 才会激活这一步骤。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mandrakelinux 系统：\n"</div><div class='add'>+"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mandrivalinux 系统：\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " *\n"</div><div class='ctx'> "\"%s\"：总体来说, 这将完全销毁旧系统。但是, 根据您选择的分区方案, 您可以让现"</div><div class='ctx'> "有的数据(比如\"主\"目录)免于覆盖。如果您想要更改硬盘的分区方案, 或者更该文件"</div><div class='ctx'> "系统, 您就应该使用此选项。\n"</div><div class='ctx'> "\n"</div><div class='del'>-" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrakelinux\n"</div><div class='add'>+" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrivalinux\n"</div><div class='ctx'> "系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可"</div><div class='ctx'> "用, 与标准安装类似。\n"</div><div class='ctx'> "\n"</div><div class='del'>-"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrakelinux 系统上工作正常。不"</div><div class='add'>+"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrivalinux 系统上工作正常。不"</div><div class='ctx'> "推荐在先于 \"8.1\" 版本的\n"</div><div class='del'>-"Mandrakelinux 系统上执行升级。"</div><div class='add'>+"Mandrivalinux 系统上执行升级。"</div><div class='ctx'> </div><div class='ctx'> # DO NOT BOTHER TO MODIFY HERE, SEE:</div><div class='ctx'> # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml</div><div class='hunk'>@@ -5002,7 +5002,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -5040,7 +5040,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "关于 UTF-8 (Unicode) 支持：Unicode 是一种新的字符编码, 该编码可支持所有现存的"</div><div class='ctx'> "语言。但是, 在 GNU/Linux 下完全支持\n"</div><div class='del'>-"Unicode, 仍然在开发和完善中。由此原因, Mandrakelinux 会根据用户的选择是否使"</div><div class='add'>+"Unicode, 仍然在开发和完善中。由此原因, Mandrivalinux 会根据用户的选择是否使"</div><div class='ctx'> "用 UTF-8：\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、"</div><div class='hunk'>@@ -5269,7 +5269,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5290,11 +5290,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "现在, 应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择, 但 "</div><div class='del'>-"Mandrakelinux\n"</div><div class='add'>+"Mandrivalinux\n"</div><div class='ctx'> "提供了两种。每种打印系统都能够在不同的配置中大展身手。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" --\n"</div><div class='hunk'>@@ -5313,7 +5313,7 @@ msgstr ""</div><div class='ctx'> "还包括一个图形界面, 可用来打印或选择打印机选项, 以及管理打印机。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "如果您现在进行了选择, 但稍后又发现您并不喜欢所选择的打印系统, 可以轻松修改。"</div><div class='del'>-"只需从 Mandrakelinux Control Center中选择\n"</div><div class='add'>+"只需从 Mandrivalinux Control Center中选择\n"</div><div class='ctx'> "PrinterDrake, 然后单击\"%s\"按钮。"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='hunk'>@@ -5430,7 +5430,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5447,7 +5447,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5490,7 +5490,7 @@ msgstr ""</div><div class='ctx'> "分辨率。如果这不适合您的话, 请单击\"%s\"重新配置您的图形界面。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\"：如果您想要配置您的 Internet 或局域网访问, 现在就可以进行。请参考印"</div><div class='del'>-"刷文档或在安装完成后使用 Mandrakelinux\n"</div><div class='add'>+"刷文档或在安装完成后使用 Mandrivalinux\n"</div><div class='ctx'> "Control Center来获得完整的在线帮助。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\"：如果您所安装的计算机位于代理服务器之后, 这里将允许您配置 HTTP 和 "</div><div class='hunk'>@@ -5503,7 +5503,7 @@ msgstr ""</div><div class='ctx'> "指南''中的相应章节, 以获得关于防火墙设置的细节。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\"：如果您想要更改您的引导程序配置, 请单击此按钮。这仅适用于高级用户。"</div><div class='del'>-"请参考印刷文档或 Mandrakelinux 控制中心中关于引导程序配置的帮助。\n"</div><div class='add'>+"请参考印刷文档或 Mandrivalinux 控制中心中关于引导程序配置的帮助。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\"：在此您可以精确调整要在您的计算机上运行哪些服务。如果您要将此计算机"</div><div class='ctx'> "用作服务器, 那么应该复查这一设置。"</div><div class='hunk'>@@ -5563,10 +5563,10 @@ msgstr "服务"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"请选择您为了安装新的 Mandrakelinux 分区想要删除的硬盘分区。\n"</div><div class='add'>+"请选择您为了安装新的 Mandrivalinux 分区想要删除的硬盘分区。\n"</div><div class='ctx'> "注意, 该硬盘分区上的所有数据将丢失并且无法恢复！"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -5909,11 +5909,11 @@ msgstr "正在计算 Windows 分区的大小"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "您的 Windows 分区有太多碎片, 请重新启动, 进入 Windows, 运行磁盘碎片整理程序, "</div><div class='del'>-"然后重新开始安装 Mandrakelinux"</div><div class='add'>+"然后重新开始安装 Mandrivalinux"</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -6024,19 +6024,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -6058,7 +6058,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -6066,14 +6066,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -6083,7 +6083,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -6103,10 +6103,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6117,11 +6117,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -6137,18 +6137,18 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "简介\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件"</div><div class='del'>-"产品包括但不限于与 Mandrakelinux 发行版的操作系统和各个部分有关的程序、方法、"</div><div class='add'>+"Mandrivalinux 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件"</div><div class='add'>+"产品包括但不限于与 Mandrivalinux 发行版的操作系统和各个部分有关的程序、方法、"</div><div class='ctx'> "规则和文档。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. 许可协议\n"</div><div class='ctx'> "\n"</div><div class='del'>-"请仔细阅读此文档。此文档是您与 Mandrakesoft S.A. 之间关于本软件产品的一个许可"</div><div class='add'>+"请仔细阅读此文档。此文档是您与 Mandriva S.A. 之间关于本软件产品的一个许可"</div><div class='ctx'> "协议。如果您安装、复制或使用本软件产品, 即表明您接受并完全同意遵守本许可协议"</div><div class='ctx'> "的内容和条件。如果您不同意本许可协议中的任何部分, 您将无权安装、复制或使用本"</div><div class='ctx'> "软件产品任何试图不遵守本许可协议的内容和条件, 而安装、复制或使用本软件产品的"</div><div class='hunk'>@@ -6159,15 +6159,15 @@ msgstr ""</div><div class='ctx'> "2. 有限担保\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "本软件产品和附带的文档是一经发表即“不再修改”, 在法律允许的范围内没有任何担"</div><div class='del'>-"保。在法律允许的范围内 Mandrakesoft S.A. 对因使用或不能使用本软件产品而引起的"</div><div class='add'>+"保。在法律允许的范围内 Mandriva S.A. 对因使用或不能使用本软件产品而引起的"</div><div class='ctx'> "特定、偶然、直接、间接的无论任何损失(包括但不限于生意的丧失、生意的中断、财务"</div><div class='ctx'> "损失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任, 即使 "</div><div class='del'>-"Mandrakesoft S.A. 已经被告知有发生这种损失的可能性。\n"</div><div class='add'>+"Mandriva S.A. 已经被告知有发生这种损失的可能性。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "在某些国家中关于拥有和使用被禁止的软件的有限责任\n"</div><div class='ctx'> "\n"</div><div class='del'>-"在法律允许的范围内 Mandrakesoft S.A. 或其分销者对因拥有或使用, 或从任何 "</div><div class='del'>-"Mandrakelinux 的网站下载在某些国家中被当地法律禁止或限制的软件而引起的特定、"</div><div class='add'>+"在法律允许的范围内 Mandriva S.A. 或其分销者对因拥有或使用, 或从任何 "</div><div class='add'>+"Mandrivalinux 的网站下载在某些国家中被当地法律禁止或限制的软件而引起的特定、"</div><div class='ctx'> "偶然、直接、间接的无论任何损失 (包括但不限于生意的丧失、生意的中断、财务损"</div><div class='ctx'> "失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任。这种有限"</div><div class='ctx'> "责任适用但不限于本软件产品所包括的强大数据加密组件。\n"</div><div class='hunk'>@@ -6179,17 +6179,17 @@ msgstr ""</div><div class='ctx'> "共许可协议(GNU General Public Licence), 此后简称为“GPL”, 或其它类似的许可协议"</div><div class='ctx'> "的条款和条件。这些许可协议大多允许您使用、复制、修改或重新发表协议所覆盖的部"</div><div class='ctx'> "分。使用这些软件之前, 请仔细阅读有关许可协议的条款和条件。如果对任何部分的许"</div><div class='del'>-"可协议有疑问, 应该与该部分的作者联系, Mandrakesoft 无法解答这些问题。由 "</div><div class='del'>-"Mandrakesoft S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandrakesoft S.A. 创"</div><div class='add'>+"可协议有疑问, 应该与该部分的作者联系, Mandriva 无法解答这些问题。由 "</div><div class='add'>+"Mandriva S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandrakesoft S.A. 创"</div><div class='ctx'> "作的文档采用一个特别的许可协议。详情见有关的文档。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "4. 知识产权\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "本软件产品的各个组件的所有权利属于它们各自的作者, 并受到所有可适用于软件程序"</div><div class='del'>-"的知识产权和版权法律的保护。Mandrakesoft S.A. 保留对本软件产品进行全面或部分"</div><div class='add'>+"的知识产权和版权法律的保护。Mandriva S.A. 保留对本软件产品进行全面或部分"</div><div class='ctx'> "的更改或调整的权利, 不论采用任何方法, 不论出于任何目的。\n"</div><div class='del'>-"“Mandrake”, “Mandrakelinux”和相关的标志是 Mandrakesoft S.A. 的商标。\n"</div><div class='add'>+"“Mandrake”, “Mandrivalinux”和相关的标志是 Mandriva S.A. 的商标。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. 适用法律\n"</div><div class='hunk'>@@ -6197,7 +6197,7 @@ msgstr ""</div><div class='ctx'> "如果本协议的任何部分被法院裁定为无效、非法或不适用, 该部分将被排除在本协议之"</div><div class='ctx'> "外。您仍然需要遵守本协议的其它可使用的部分。本协议的内容和条件受法国法律管"</div><div class='ctx'> "辖。有关本协议的任何争议最好在法庭外解决。作为最后的手段, 争议将被提交法国巴"</div><div class='del'>-"黎适当的法院审理。对本文档有任何疑问, 请联系 Mandrakesoft S.A.。\n"</div><div class='add'>+"黎适当的法院审理。对本文档有任何疑问, 请联系 Mandriva S.A.。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "以上中文翻译仅为方便您理解, 不能作为法律用途, 请以协议英文文本为准。\n"</div><div class='ctx'> </div><div class='hunk'>@@ -6278,7 +6278,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -6286,19 +6286,19 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "恭喜。安装完成了。\n"</div><div class='ctx'> "请取出启动介质, 然后按 ENTER 重新启动。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"要了解此版本 Mandrakelinux 的修订, 请访问以下勘误表: \n"</div><div class='add'>+"要了解此版本 Mandrivalinux 的修订, 请访问以下勘误表: \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"关于安装后如何配置您的系统, 请查看 Mandrakelinux 官方用户手册。"</div><div class='add'>+"关于安装后如何配置您的系统, 请查看 Mandrivalinux 官方用户手册。"</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_messages.pm:144</div><div class='hunk'>@@ -6332,11 +6332,11 @@ msgstr "进入步骤“%s”\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='del'>-"您的系统资源不足。您在安装 Mandrakelinux 时可能遇到问题。\n"</div><div class='add'>+"您的系统资源不足。您在安装 Mandrivalinux 时可能遇到问题。\n"</div><div class='ctx'> "如果这样, 您可以尝试文本模式的安装。\n"</div><div class='ctx'> "在从光盘启动后按“F1”键, 然后输入“text”。"</div><div class='ctx'> </div><div class='hunk'>@@ -6865,8 +6865,8 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='del'>-msgstr "正在连接 Mandrakelinux 网站以获得镜像网站列表..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='add'>+msgstr "正在连接 Mandrivalinux 网站以获得镜像网站列表..."</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -7083,8 +7083,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux 安装 %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux 安装 %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9669,13 +9669,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "“Drak 防火墙”配置\n"</div><div class='ctx'> "\n"</div><div class='del'>-"此程序可为您的 Mandrakelinux 机器配置个人防火墙。\n"</div><div class='add'>+"此程序可为您的 Mandrivalinux 机器配置个人防火墙。\n"</div><div class='ctx'> "如果要配置强大的专用防火墙, 请考虑使用专门的\n"</div><div class='ctx'> "MandrakeSecurity 防火墙发行版。"</div><div class='ctx'> </div><div class='hunk'>@@ -13588,11 +13588,11 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='del'>-"运行 SannerDrake (Mandrakelinux 控制中心中的硬件/扫描仪)可在网络上共向您的扫"</div><div class='add'>+"运行 SannerDrake (Mandrivalinux 控制中心中的硬件/扫描仪)可在网络上共向您的扫"</div><div class='ctx'> "描仪。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> </div><div class='hunk'>@@ -15423,32 +15423,32 @@ msgstr "停止"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;何为 Mandrakelinux?&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;何为 Mandrivalinux?&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux&lt;/b&gt; 欢迎您!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux&lt;/b&gt; 欢迎您!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux 是一整套系统的有机组成, 其中不仅包括&lt;b&gt;操作系统&lt;/b&gt;(基于 Linux "</div><div class='add'>+"Mandrivalinux 是一整套系统的有机组成, 其中不仅包括&lt;b&gt;操作系统&lt;/b&gt;(基于 Linux "</div><div class='ctx'> "内核), 还包括您梦寐以求的&lt;b&gt;海量应用程序&lt;/b&gt;。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux 是现今最&lt;b&gt;友好&lt;/b&gt;的 Linux 发行版之一。它还是世界上&lt;b&gt;使用最为"</div><div class='add'>+"Mandrivalinux 是现今最&lt;b&gt;友好&lt;/b&gt;的 Linux 发行版之一。它还是世界上&lt;b&gt;使用最为"</div><div class='ctx'> "广泛&lt;/b&gt;的 Linux 发行版之一!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:13</div><div class='hunk'>@@ -15464,13 +15464,13 @@ msgstr "欢迎进入&lt;b&gt;开放源代码世界&lt;/b&gt;!"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux 专注于开放源代码模型。这意味着您现在看到的新版本就是 "</div><div class='del'>-"&lt;b&gt;Mandrakesoft 开发者团队&lt;/b&gt;和来自&lt;b&gt;世界各地 Mandrakelinux 贡献者社区&lt;/b&gt;"</div><div class='add'>+"Mandrivalinux 专注于开放源代码模型。这意味着您现在看到的新版本就是 "</div><div class='add'>+"&lt;b&gt;Mandriva 开发者团队&lt;/b&gt;和来自&lt;b&gt;世界各地 Mandrivalinux 贡献者社区&lt;/b&gt;"</div><div class='ctx'> "共同努力的结果。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/02.pl:19</div><div class='hunk'>@@ -15489,9 +15489,9 @@ msgstr "&lt;b&gt;GPL&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"发行版中包含的绝大多数软件以及 Mandrakelinux 专有的全部工具都以 &lt;b&gt;GPL&lt;/b&gt; 协"</div><div class='add'>+"发行版中包含的绝大多数软件以及 Mandrivalinux 专有的全部工具都以 &lt;b&gt;GPL&lt;/b&gt; 协"</div><div class='ctx'> "议放出。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15521,13 +15521,13 @@ msgstr "&lt;b&gt;加入社区&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux 拥有的用户和开发者&lt;b&gt;社区人数众多&lt;/b&gt;。这样的社区所扮演的角色十"</div><div class='del'>-"分广泛, 从错误报告到开发新程序。社区在 Mandrakelinux 世界中扮演着&lt;b&gt;至关重要"</div><div class='add'>+"Mandrivalinux 拥有的用户和开发者&lt;b&gt;社区人数众多&lt;/b&gt;。这样的社区所扮演的角色十"</div><div class='add'>+"分广泛, 从错误报告到开发新程序。社区在 Mandrivalinux 世界中扮演着&lt;b&gt;至关重要"</div><div class='ctx'> "&lt;/b&gt;的角色。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15549,11 +15549,11 @@ msgstr "&lt;b&gt;下载版本&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"您正在安装 &lt;b&gt;Mandrakelinux 下载版本&lt;/b&gt;。这是一种免费下载的版本, "</div><div class='del'>-"Mandrakesoft 想要将其贡献给&lt;b&gt;每个人&lt;/b&gt;。"</div><div class='add'>+"您正在安装 &lt;b&gt;Mandrivalinux 下载版本&lt;/b&gt;。这是一种免费下载的版本, "</div><div class='add'>+"Mandriva 想要将其贡献给&lt;b&gt;每个人&lt;/b&gt;。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15580,8 +15580,8 @@ msgstr "\t* &lt;b&gt;私有软件&lt;/b&gt; (诸如 Acrobat® Reader®、RealPlayer®、Flas</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='del'>-msgstr "您也无法访问 Mandrakesoft 其它产品中&lt;b&gt;所赠送的增值服务&lt;/b&gt;。"</div><div class='add'>+"Mandriva products either."</div><div class='add'>+msgstr "您也无法访问 Mandriva 其它产品中&lt;b&gt;所赠送的增值服务&lt;/b&gt;。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15590,8 +15590,8 @@ msgstr "&lt;b&gt;探索, 您的第一个 Linux 桌面&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='del'>-msgstr "您正在安装 &lt;b&gt;Mandrakelinux 探索版&lt;/b&gt;。"</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='add'>+msgstr "您正在安装 &lt;b&gt;Mandrivalinux 探索版&lt;/b&gt;。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15612,17 +15612,17 @@ msgstr "&lt;b&gt;专业版, Linux 终极桌面&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='del'>-msgstr "您正在安装 &lt;b&gt;Mandrakelinux 专业版&lt;/b&gt;。"</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgstr "您正在安装 &lt;b&gt;Mandrivalinux 专业版&lt;/b&gt;。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='del'>-"专业版是 Mandrakesoft 的&lt;b&gt;金牌 Linux 桌面&lt;/b&gt;产品。除了是最易用最友好的 "</div><div class='add'>+"专业版是 Mandriva 的&lt;b&gt;金牌 Linux 桌面&lt;/b&gt;产品。除了是最易用最友好的 "</div><div class='ctx'> "Linux 发行版, 专业版还包括了&lt;b&gt;数千应用程序&lt;/b&gt; - 从最流行程序到最专业的程序"</div><div class='ctx'> "一应俱全。"</div><div class='ctx'> </div><div class='hunk'>@@ -15633,8 +15633,8 @@ msgstr "&lt;b&gt;专业版+, 桌面和服务器的 Linux 解决方案&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='del'>-msgstr "您正在安装 &lt;b&gt;Mandrakelinux 专业版+&lt;/b&gt;。"</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgstr "您正在安装 &lt;b&gt;Mandrivalinux 专业版+&lt;/b&gt;。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15649,20 +15649,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft 产品&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva 产品&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft&lt;/b&gt; 开发了广泛的 &lt;b&gt;Mandrakelinux&lt;/b&gt; 产品线。"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva&lt;/b&gt; 开发了广泛的 &lt;b&gt;Mandrivalinux&lt;/b&gt; 产品线。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='del'>-msgstr "Mandrakelinux 产品包括:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='add'>+msgstr "Mandrivalinux 产品包括:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15682,68 +15682,68 @@ msgstr "\t* &lt;b&gt;专业版+&lt;/b&gt;, 桌面和服务器的 Linux 解决方案。"</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, 充分发挥您 64 位处理器性能的 "</div><div class='del'>-"Mandrakelinux 解决方案。"</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, 充分发挥您 64 位处理器性能的 "</div><div class='add'>+"Mandrivalinux 解决方案。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft 产品(随身产品)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva 产品(随身产品)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakesoft 开发了两款随身产品, 使得您可以在不安装的情况下&lt;b&gt;在任何计算机上"</div><div class='del'>-"&lt;/b&gt;使用 Mandrakelinux:"</div><div class='add'>+"Mandriva 开发了两款随身产品, 使得您可以在不安装的情况下&lt;b&gt;在任何计算机上"</div><div class='add'>+"&lt;/b&gt;使用 Mandrivalinux:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='del'>-msgstr "\t* &lt;b&gt;Move&lt;/b&gt;, 直接从可启动光盘中运行的 Mandrakelinux 发行版。"</div><div class='add'>+msgstr "\t* &lt;b&gt;Move&lt;/b&gt;, 直接从可启动光盘中运行的 Mandrivalinux 发行版。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, 预装于超强压缩的 LaCie 移动硬盘中的 Mandrakelinux 发"</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, 预装于超强压缩的 LaCie 移动硬盘中的 Mandrivalinux 发"</div><div class='ctx'> "行版。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakesoft 产品(专业解决方案)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva 产品(专业解决方案)&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='del'>-msgstr "下面是 Mandrakesoft 专为适合&lt;b&gt;专业需求&lt;/b&gt;所设计的产品:"</div><div class='add'>+msgstr "下面是 Mandriva 专为适合&lt;b&gt;专业需求&lt;/b&gt;所设计的产品:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='del'>-msgstr "\t* &lt;b&gt;企业桌面&lt;/b&gt;, 商务适用的 Mandrakelinux 桌面。"</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='add'>+msgstr "\t* &lt;b&gt;企业桌面&lt;/b&gt;, 商务适用的 Mandrivalinux 桌面。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;企业服务器&lt;/b&gt;, Mandrakelinux 服务器解决方案。"</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;企业服务器&lt;/b&gt;, Mandrivalinux 服务器解决方案。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='del'>-msgstr "\t* &lt;b&gt;多网络防火墙&lt;/b&gt;, Mandrakelinux 安全解决方案。"</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='add'>+msgstr "\t* &lt;b&gt;多网络防火墙&lt;/b&gt;, Mandrivalinux 安全解决方案。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15786,9 +15786,9 @@ msgstr "&lt;b&gt;选择您喜爱的桌面环境&lt;/b&gt;"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='del'>-"在专业版中, 您可以选择各种&lt;b&gt;图形桌面环境&lt;/b&gt;。而 Mandrakesoft 为您预设的桌面"</div><div class='add'>+"在专业版中, 您可以选择各种&lt;b&gt;图形桌面环境&lt;/b&gt;。而 Mandriva 为您预设的桌面"</div><div class='ctx'> "环境是 &lt;b&gt;KDE&lt;/b&gt;。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15813,9 +15813,9 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='del'>-"在专业版+中, 您可以选择各种&lt;b&gt;图形桌面环境&lt;/b&gt;。而 Mandrakesoft 为您预设的桌"</div><div class='add'>+"在专业版+中, 您可以选择各种&lt;b&gt;图形桌面环境&lt;/b&gt;。而 Mandriva 为您预设的桌"</div><div class='ctx'> "面环境是 &lt;b&gt;KDE&lt;/b&gt;。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15938,10 +15938,10 @@ msgstr "&lt;b&gt;享受广泛的应用程序&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"在 Mandrakelinux 菜单中, 您可&lt;b&gt;轻而易举&lt;/b&gt;的找到完成&lt;b&gt;各种任务&lt;/b&gt;的应用程"</div><div class='add'>+"在 Mandrivalinux 菜单中, 您可&lt;b&gt;轻而易举&lt;/b&gt;的找到完成&lt;b&gt;各种任务&lt;/b&gt;的应用程"</div><div class='ctx'> "序:"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/18.pl:16</div><div class='hunk'>@@ -16186,17 +16186,17 @@ msgstr "\t* &lt;b&gt;Postfix&lt;/b&gt; 和 &lt;b&gt;Sendmail&lt;/b&gt;：流行而强大的邮件服务�</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux 控制中心&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux 控制中心&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='del'>-"&lt;b&gt;Mandrakelinux 控制中心&lt;/b&gt;是 Mandrakelinux 特有工具的大集合, 它可显著简化"</div><div class='add'>+"&lt;b&gt;Mandrivalinux 控制中心&lt;/b&gt;是 Mandrivalinux 特有工具的大集合, 它可显著简化"</div><div class='ctx'> "对计算机的配置。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:17</div><div class='hunk'>@@ -16220,14 +16220,14 @@ msgstr "&lt;b&gt;开放源代码模型&lt;/b&gt;"</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "与其它软件编程方式相同, 开放源代码软件&lt;b&gt;需要时间和人力&lt;/b&gt;进行开发。为了遵从"</div><div class='del'>-"开放源代码理念, Mandrakesoft 会销售增值产品和服务, 以便进一步&lt;b&gt;改进 "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;。如果您想要&lt;b&gt;支持开放源代码理念&lt;/b&gt;以及 Mandrakelinux 的开"</div><div class='add'>+"开放源代码理念, Mandriva 会销售增值产品和服务, 以便进一步&lt;b&gt;改进 "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;。如果您想要&lt;b&gt;支持开放源代码理念&lt;/b&gt;以及 Mandrivalinux 的开"</div><div class='ctx'> "发, &lt;b&gt;请&lt;/b&gt;考虑购买我们的产品或服务！"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='hunk'>@@ -16238,10 +16238,10 @@ msgstr "&lt;b&gt;在线商店&lt;/b&gt;"</div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"要了解关于 Mandrakesoft 产品和服务的更多信息, 您可以参观我们的&lt;b&gt;电子商务平台"</div><div class='add'>+"要了解关于 Mandriva 产品和服务的更多信息, 您可以参观我们的&lt;b&gt;电子商务平台"</div><div class='ctx'> "&lt;/b&gt;。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:17</div><div class='hunk'>@@ -16263,21 +16263,21 @@ msgstr "驻足 &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt; 是您 Mandrakelinux 产品的&lt;b&gt;绝佳拍档&lt;/b&gt;..."</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt; 是您 Mandrivalinux 产品的&lt;b&gt;绝佳拍档&lt;/b&gt;..."</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='del'>-msgstr "加入 Mandrakeclub, 您可充分享受各项&lt;b&gt;超值回馈&lt;/b&gt;, 例如："</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='add'>+msgstr "加入 Mandriva Club, 您可充分享受各项&lt;b&gt;超值回馈&lt;/b&gt;, 例如："</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16297,36 +16297,36 @@ msgstr "\t* 访问&lt;b&gt;商业应用程序&lt;/b&gt;(例如 NVIDIA® 或 ATI™ 的驱动</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='del'>-msgstr "\t* 参与 Mandrakelinux &lt;b&gt;用户论坛&lt;/b&gt;。"</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgstr "\t* 参与 Mandrivalinux &lt;b&gt;用户论坛&lt;/b&gt;。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"\t* &lt;b&gt;优先访问&lt;/b&gt;, 在公众之前优先访问 Mandrakelinux &lt;b&gt;ISO 映像&lt;/b&gt;。"</div><div class='add'>+"\t* &lt;b&gt;优先访问&lt;/b&gt;, 在公众之前优先访问 Mandrivalinux &lt;b&gt;ISO 映像&lt;/b&gt;。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline&lt;/b&gt; 是 Mandrakesoft 为客户特别开发的全新金牌服务。"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online&lt;/b&gt; 是 Mandriva 为客户特别开发的全新金牌服务。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakeonline 为&lt;b&gt;轻松更新&lt;/b&gt;您的 Mandrakelinux 系统提供了范围广泛的增值服"</div><div class='add'>+"Mandriva Online 为&lt;b&gt;轻松更新&lt;/b&gt;您的 Mandrivalinux 系统提供了范围广泛的增值服"</div><div class='ctx'> "务："</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -16349,38 +16349,38 @@ msgstr "\t* 灵活的&lt;b&gt;按计划&lt;/b&gt;更新。"</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b&gt; with one account."</div><div class='del'>-msgstr "\t* 通过一个账户管理&lt;b&gt;您所有的 Mandrakelinux 系统&lt;/b&gt;。"</div><div class='add'>+"\t* Management of &lt;b&gt;all your Mandrivalinux systems&lt;/b&gt; with one account."</div><div class='add'>+msgstr "\t* 通过一个账户管理&lt;b&gt;您所有的 Mandrivalinux 系统&lt;/b&gt;。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeexpert&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Expert&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandrakesoft's technical experts on "</div><div class='add'>+"Do you require &lt;b&gt;assistance?&lt;/b&gt; Meet Mandriva's technical experts on "</div><div class='ctx'> "&lt;b&gt;our technical support platform&lt;/b&gt; www.mandrakeexpert.com."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "您需要&lt;b&gt;帮助&lt;/b&gt;吗?您可在&lt;b&gt;我们的技术支持平台&lt;/b&gt; www.mandrakeexpert.com "</div><div class='del'>-"与 Mandrakesoft 的技术专家会面。"</div><div class='add'>+"与 Mandriva 的技术专家会面。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Thanks to the help of &lt;b&gt;qualified Mandrakelinux experts&lt;/b&gt;, you will save "</div><div class='add'>+"Thanks to the help of &lt;b&gt;qualified Mandrivalinux experts&lt;/b&gt;, you will save "</div><div class='ctx'> "a lot of time."</div><div class='ctx'> msgstr ""</div><div class='del'>-"感谢&lt;b&gt;具有资质认证的 Mandrakelinux 专家&lt;/b&gt;的帮助, 您将能够节省大量时间。"</div><div class='add'>+"感谢&lt;b&gt;具有资质认证的 Mandrivalinux 专家&lt;/b&gt;的帮助, 您将能够节省大量时间。"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/30.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"For any question related to Mandrakelinux, you have the possibility to "</div><div class='add'>+"For any question related to Mandrivalinux, you have the possibility to "</div><div class='ctx'> "purchase support incidents at &lt;b&gt;store.mandrakesoft.com&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='del'>-"如果有关于 Mandrakelinux 的任何问题, 您都可以在 &lt;b&gt;store.mandrakesoft.com&lt;/"</div><div class='add'>+"如果有关于 Mandrivalinux 的任何问题, 您都可以在 &lt;b&gt;store.mandrakesoft.com&lt;/"</div><div class='ctx'> "b&gt; 购买支持事件。"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:25</div><div class='hunk'>@@ -16673,8 +16673,8 @@ msgstr "监视工具、进程统计、tcpdump、nmap……"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:196</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakesoft Wizards"</div><div class='del'>-msgstr "Mandrakesoft 向导"</div><div class='add'>+msgid "Mandriva Wizards"</div><div class='add'>+msgstr "Mandriva 向导"</div><div class='ctx'> </div><div class='ctx'> #: share/compssUsers.pl:197</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16764,8 +16764,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "选项:\n"</div><div class='ctx'> "  --help            - 打印此帮助信息。\n"</div><div class='del'>-"  --report          - 程序应该是 Mandrakelinux 工具之一\n"</div><div class='del'>-"  --incident        - 程序应该是 Mandrakelinux 工具之一"</div><div class='add'>+"  --report          - 程序应该是 Mandrivalinux 工具之一\n"</div><div class='add'>+"  --incident        - 程序应该是 Mandrivalinux 工具之一"</div><div class='ctx'> </div><div class='ctx'> #: standalone.pm:63</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -16819,7 +16819,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTIONS]...\n"</div><div class='del'>-"Mandrakelinux Terminal Server Configurator\n"</div><div class='add'>+"Mandrivalinux Terminal Server Configurator\n"</div><div class='ctx'> "--enable         : enable MTS\n"</div><div class='ctx'> "--disable        : disable MTS\n"</div><div class='ctx'> "--start          : start MTS\n"</div><div class='hunk'>@@ -16833,7 +16833,7 @@ msgid ""</div><div class='ctx'> "IP, nbi image name)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[选项]...\n"</div><div class='del'>-"Mandrakelinux 终端服务器配置\n"</div><div class='add'>+"Mandrivalinux 终端服务器配置\n"</div><div class='ctx'> "--enable         :启用 MTS\n"</div><div class='ctx'> "--disable        :禁用 MTS\n"</div><div class='ctx'> "--start          :启动 MTS\n"</div><div class='hunk'>@@ -16886,14 +16886,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"</div><div class='ctx'> msgid ""</div><div class='ctx'> "[OPTION]...\n"</div><div class='ctx'> "  --no-confirmation      do not ask first confirmation question in "</div><div class='del'>-"MandrakeUpdate mode\n"</div><div class='add'>+"Mandriva Update mode\n"</div><div class='ctx'> "  --no-verify-rpm        do not verify packages signatures\n"</div><div class='ctx'> "  --changelog-first      display changelog before filelist in the "</div><div class='ctx'> "description window\n"</div><div class='ctx'> "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "[选项]...\n"</div><div class='del'>-"  --no-confirmation      不询问 MandrakeUpdate 模块中的第一个确认问题\n"</div><div class='add'>+"  --no-confirmation      不询问 Mandriva Update 模块中的第一个确认问题\n"</div><div class='ctx'> "  --no-verify-rpm        不校验包签名\n"</div><div class='ctx'> "  --changelog-first      在描述窗口中的文件列表前显示更改日志\n"</div><div class='ctx'> "  --merge-all-rpmnew     计划合并找到的所有 .rpmnew/.rpmsave 文件"</div><div class='hunk'>@@ -19670,13 +19670,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:41</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Bug Report Tool"</div><div class='del'>-msgstr "Mandrakelinux 故障报告工具"</div><div class='add'>+msgid "Mandrivalinux Bug Report Tool"</div><div class='add'>+msgstr "Mandrivalinux 故障报告工具"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:46</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Control Center"</div><div class='del'>-msgstr "Mandrakelinux 控制中心"</div><div class='add'>+msgid "Mandrivalinux Control Center"</div><div class='add'>+msgstr "Mandrivalinux 控制中心"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:48</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19696,8 +19696,8 @@ msgstr "Drak 硬盘管理"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:51</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakeonline"</div><div class='del'>-msgstr "Mandrakeonline"</div><div class='add'>+msgid "Mandriva Online"</div><div class='add'>+msgstr "Mandriva Online"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:52</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -19741,8 +19741,8 @@ msgstr "配置向导"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:81</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Select Mandrakesoft Tool:"</div><div class='del'>-msgstr "选择 Mandrakesoft 工具:"</div><div class='add'>+msgid "Select Mandriva Tool:"</div><div class='add'>+msgstr "选择 Mandriva 工具:"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakbug:82</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20163,19 +20163,19 @@ msgstr "开机时启动"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "This interface has not been configured yet.\n"</div><div class='del'>-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "这块网卡还没有配置过。\n"</div><div class='del'>-"请从“Mandrakelinux 控制中心”运行“添加网卡”助手"</div><div class='add'>+"请从“Mandrivalinux 控制中心”运行“添加网卡”助手"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakconnect:1009 standalone/net_applet:61</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You do not have any configured Internet connection.\n"</div><div class='del'>-"Run the \"%s\" assistant from the Mandrakelinux Control Center"</div><div class='add'>+"Run the \"%s\" assistant from the Mandrivalinux Control Center"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "您从未配置过 Internet 连接。\n"</div><div class='del'>-"请从 Mandrakelinux 控制中心运行“%s”助手"</div><div class='add'>+"请从 Mandrivalinux 控制中心运行“%s”助手"</div><div class='ctx'> </div><div class='ctx'> #. -PO: here "Add Connection" should be translated the same was as in control-center</div><div class='ctx'> #: standalone/drakconnect:1010 standalone/net_applet:62</div><div class='hunk'>@@ -20225,8 +20225,8 @@ msgstr "KDM (KDE 显示管理器)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "MdkKDM (Mandrakelinux Display Manager)"</div><div class='del'>-msgstr "MdkKDM (Mandrakelinux 显示管理器)"</div><div class='add'>+msgid "MdkKDM (Mandrivalinux Display Manager)"</div><div class='add'>+msgstr "MdkKDM (Mandrivalinux 显示管理器)"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakedm:37</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -20522,7 +20522,7 @@ msgstr "导入"</div><div class='ctx'> #: standalone/drakfont:511</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Copyright (C) 2001-2002 by Mandrakesoft \n"</div><div class='add'>+"Copyright (C) 2001-2002 by Mandriva \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (original version)\n"</div><div class='hunk'>@@ -20531,7 +20531,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "       VIGNAUD Thierry &lt;tvignaud@mandrakesoft.com&gt;"</div><div class='ctx'> msgstr ""</div><div class='del'>-"版权 (C) 2001-2002 由 Mandrakesoft 持有\n"</div><div class='add'>+"版权 (C) 2001-2002 由 Mandriva 持有\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "       DUPONT Sebastien (原始版本)\n"</div><div class='hunk'>@@ -21060,14 +21060,14 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> " drakhelp 0.1\n"</div><div class='del'>-"Copyright (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"Copyright (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "This is free software and may be redistributed under the terms of the GNU "</div><div class='ctx'> "GPL.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Usage: \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> " Drak 帮助 0.1\n"</div><div class='del'>-"版权 (C) 2003-2004 Mandrakesoft.\n"</div><div class='add'>+"版权 (C) 2003-2004 Mandriva.\n"</div><div class='ctx'> "这是自由软件, 可按照 GNU GPL 协议条款再发放。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "用法: \n"</div><div class='hunk'>@@ -21092,8 +21092,8 @@ msgstr " --doc &lt;link&gt;          - 链接到其他网页 ( 给 WM 欢迎的前端�</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Help Center"</div><div class='del'>-msgstr "Mandrakelinux 帮助中心"</div><div class='add'>+msgid "Mandrivalinux Help Center"</div><div class='add'>+msgstr "Mandrivalinux 帮助中心"</div><div class='ctx'> </div><div class='ctx'> #: standalone/drakhelp:36</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24317,8 +24317,8 @@ msgstr "修改已经完成, 不过您必须退出登录修改才会生效"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:50</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Tools Logs"</div><div class='del'>-msgstr "Mandrakelinux 工具日志"</div><div class='add'>+msgid "Mandrivalinux Tools Logs"</div><div class='add'>+msgstr "Mandrivalinux 工具日志"</div><div class='ctx'> </div><div class='ctx'> #: standalone/logdrake:51</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -24830,10 +24830,10 @@ msgstr "连接完成。"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Connection failed.\n"</div><div class='del'>-"Verify your configuration in the Mandrakelinux Control Center."</div><div class='add'>+"Verify your configuration in the Mandrivalinux Control Center."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "连接失败。\n"</div><div class='del'>-"请在 Mandrakelinux 控制中心中检查您的配置。"</div><div class='add'>+"请在 Mandrivalinux 控制中心中检查您的配置。"</div><div class='ctx'> </div><div class='ctx'> #: standalone/net_monitor:341</div><div class='ctx'> #, c-format</div><div class='head'>diff --git a/perl-install/share/po/zh_TW.po b/perl-install/share/po/zh_TW.po<br/>index 75d7c3783..c109f5e31 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/zh_TW.po?h=12.60&amp;id=a2c392a9ab83bb9031fb11f99f0101f1f2d9f140'>perl-install/share/po/zh_TW.po</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/zh_TW.po?h=12.60&amp;id=b6e6dfe3bb5ca1480b60d1bd6710dbf2298d00ab'>perl-install/share/po/zh_TW.po</a></div><div class='hunk'>@@ -78,13 +78,13 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click the button to reboot the machine, unplug it, remove write protection,\n"</div><div class='del'>-"plug the key again, and launch Mandrake Move again."</div><div class='add'>+"plug the key again, and launch Mandriva Move again."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "您的 USB 隨身碟似乎有防寫保護，但是我們現在無法安全的移除它。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "請按下此按鈕來重新開機，移除隨身碟並解除它的寫入保護，接著重\n"</div><div class='del'>-"新插入隨身碟，最後重新啟動 Mandrake Move。"</div><div class='add'>+"新插入隨身碟，最後重新啟動 Mandriva Move。"</div><div class='ctx'> </div><div class='ctx'> #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -102,7 +102,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -110,7 +110,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "We did not detect any USB key on your system. If you\n"</div><div class='del'>-"plug in an USB key now, Mandrake Move will have the ability\n"</div><div class='add'>+"plug in an USB key now, Mandriva Move will have the ability\n"</div><div class='ctx'> "to transparently save the data in your home directory and\n"</div><div class='ctx'> "system wide configuration, for next boot on this computer\n"</div><div class='ctx'> "or another one. Note: if you plug in a key now, wait several\n"</div><div class='hunk'>@@ -118,7 +118,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You may also proceed without an USB key - you'll still be\n"</div><div class='del'>-"able to use Mandrake Move as a normal live Mandrake\n"</div><div class='add'>+"able to use Mandriva Move as a normal live Mandriva\n"</div><div class='ctx'> "Operating System."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -244,7 +244,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "This may come from corrupted system configuration files\n"</div><div class='ctx'> "on the USB key, in this case removing them and then\n"</div><div class='del'>-"rebooting Mandrake Move would fix the problem. To do\n"</div><div class='add'>+"rebooting Mandriva Move would fix the problem. To do\n"</div><div class='ctx'> "so, click on the corresponding button.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -1268,11 +1268,11 @@ msgstr "語言選擇"</div><div class='ctx'> #: any.pm:733</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux can support multiple languages. Select\n"</div><div class='add'>+"Mandrivalinux can support multiple languages. Select\n"</div><div class='ctx'> "the languages you would like to install. They will be available\n"</div><div class='ctx'> "when your installation is complete and you restart your system."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux 能支援多種語言. 選擇您想安裝的語言.\n"</div><div class='add'>+"Mandrivalinux 能支援多種語言. 選擇您想安裝的語言.\n"</div><div class='ctx'> "他們將可使用於您的安裝完成與您重新開始您的系統之後."</div><div class='ctx'> </div><div class='ctx'> #: any.pm:752 any.pm:773 help.pm:647</div><div class='hunk'>@@ -3580,12 +3580,12 @@ msgstr "啟用音效支援"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Before continuing, you should carefully read the terms of the license. It\n"</div><div class='del'>-"covers the entire Mandrakelinux distribution. If you agree with all the\n"</div><div class='add'>+"covers the entire Mandrivalinux distribution. If you agree with all the\n"</div><div class='ctx'> "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"</div><div class='ctx'> "button will reboot your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "在繼續之前，您應該仔細的閱讀下面相關版權條款。\n"</div><div class='del'>-"這包含整個 Mandrakelinux 發行版的版權內容。若是您同意裡面的所有條款，\n"</div><div class='add'>+"這包含整個 Mandrivalinux 發行版的版權內容。若是您同意裡面的所有條款，\n"</div><div class='ctx'> "請點選 \"%s\" 按鈕，否則請點選 \"%s\" 按鈕並自動重新開機。"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:14 install_steps_gtk.pm:556 install_steps_interactive.pm:92</div><div class='hunk'>@@ -3753,13 +3753,13 @@ msgstr ""</div><div class='ctx'> #: help.pm:85</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"</div><div class='add'>+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"</div><div class='ctx'> "selected package is located on another CD-ROM, DrakX will eject the current\n"</div><div class='ctx'> "CD and ask you to insert the required one. If you do not have the requested\n"</div><div class='ctx'> "CD at hand, just click on \"%s\", the corresponding packages will not be\n"</div><div class='ctx'> "installed."</div><div class='ctx'> msgstr ""</div><div class='del'>-"Mandrakelinux 安裝片包含數張光碟片. 若一所選擇的套件是位於另一張光碟,\n"</div><div class='add'>+"Mandrivalinux 安裝片包含數張光碟片. 若一所選擇的套件是位於另一張光碟,\n"</div><div class='ctx'> "DrakeX 會彈出現在的光碟且要求您放入所要求的正確光碟片.\n"</div><div class='ctx'> "若您沒有要求的光碟在手上的話, 就按下 \"%s\", 對應的套件不會被安裝."</div><div class='ctx'> </div><div class='hunk'>@@ -3767,11 +3767,11 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "It's now time to specify which programs you wish to install on your system.\n"</div><div class='del'>-"There are thousands of packages available for Mandrakelinux, and to make it\n"</div><div class='add'>+"There are thousands of packages available for Mandrivalinux, and to make it\n"</div><div class='ctx'> "simpler to manage, they have been placed into groups of similar\n"</div><div class='ctx'> "applications.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux sorts package groups in four categories. You can mix and\n"</div><div class='add'>+"Mandrivalinux sorts package groups in four categories. You can mix and\n"</div><div class='ctx'> "match applications from the various categories, so a ``Workstation''\n"</div><div class='ctx'> "installation can still have applications from the ``Server'' category\n"</div><div class='ctx'> "installed.\n"</div><div class='hunk'>@@ -3822,10 +3822,10 @@ msgid ""</div><div class='ctx'> "command-line interface. The total size of this installation is about 65\n"</div><div class='ctx'> "megabytes."</div><div class='ctx'> msgstr ""</div><div class='del'>-"現在是指定那個程式您想要裝在您的系統上. Mandrakelinux 有上千個套件,\n"</div><div class='add'>+"現在是指定那個程式您想要裝在您的系統上. Mandrivalinux 有上千個套件,\n"</div><div class='ctx'> "為了簡單管理, 相似性質的應用程式已經被分類到群組裡.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Mandrakelinux 分類套件群組於四個範疇. 你能由不同範疇混合與配對應用程式,\n"</div><div class='add'>+"Mandrivalinux 分類套件群組於四個範疇. 你能由不同範疇混合與配對應用程式,\n"</div><div class='ctx'> "所以一個 ``工作站''安裝也能安裝``伺服器''範疇安裝的應用程式.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": 如果您計畫用您的機器當作一個工作站, 選擇一個或\n"</div><div class='hunk'>@@ -3920,10 +3920,10 @@ msgid ""</div><div class='ctx'> "!! If a server package has been selected, either because you specifically\n"</div><div class='ctx'> "chose the individual package or because it was part of a group of packages,\n"</div><div class='ctx'> "you'll be asked to confirm that you really want those servers to be\n"</div><div class='del'>-"installed. By default Mandrakelinux will automatically start any installed\n"</div><div class='add'>+"installed. By default Mandrivalinux will automatically start any installed\n"</div><div class='ctx'> "services at boot time. Even if they are safe and have no known issues at\n"</div><div class='ctx'> "the time the distribution was shipped, it is entirely possible that\n"</div><div class='del'>-"security holes were discovered after this version of Mandrakelinux was\n"</div><div class='add'>+"security holes were discovered after this version of Mandrivalinux was\n"</div><div class='ctx'> "finalized. If you do not know what a particular service is supposed to do "</div><div class='ctx'> "or\n"</div><div class='ctx'> "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"</div><div class='hunk'>@@ -4050,7 +4050,7 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"</div><div class='ctx'> "on which all the graphical environments (KDE, GNOME, AfterStep,\n"</div><div class='del'>-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"</div><div class='add'>+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "You'll see a list of different parameters to change to get an optimal\n"</div><div class='ctx'> "graphical display.\n"</div><div class='hunk'>@@ -4163,12 +4163,12 @@ msgstr ""</div><div class='ctx'> #: help.pm:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You now need to decide where you want to install the Mandrakelinux\n"</div><div class='add'>+"You now need to decide where you want to install the Mandrivalinux\n"</div><div class='ctx'> "operating system on your hard drive. If your hard drive is empty or if an\n"</div><div class='ctx'> "existing operating system is using all the available space you will have to\n"</div><div class='ctx'> "partition the drive. Basically, partitioning a hard drive means to\n"</div><div class='ctx'> "logically divide it to create the space needed to install your new\n"</div><div class='del'>-"Mandrakelinux system.\n"</div><div class='add'>+"Mandrivalinux system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Because the process of partitioning a hard drive is usually irreversible\n"</div><div class='ctx'> "and can lead to data losses, partitioning can be intimidating and stressful\n"</div><div class='hunk'>@@ -4195,7 +4195,7 @@ msgid ""</div><div class='ctx'> "FAT or NTFS partition. Resizing can be performed without the loss of any\n"</div><div class='ctx'> "data, provided you've previously defragmented the Windows partition.\n"</div><div class='ctx'> "Backing up your data is strongly recommended. Using this option is\n"</div><div class='del'>-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"</div><div class='add'>+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"</div><div class='ctx'> "the same computer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   Before choosing this option, please understand that after this\n"</div><div class='hunk'>@@ -4204,7 +4204,7 @@ msgid ""</div><div class='ctx'> "to store your data or to install new software.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". If you want to delete all data and all partitions present on\n"</div><div class='del'>-"your hard drive and replace them with your new Mandrakelinux system, choose\n"</div><div class='add'>+"your hard drive and replace them with your new Mandrivalinux system, choose\n"</div><div class='ctx'> "this option. Be careful, because you will not be able to undo this "</div><div class='ctx'> "operation\n"</div><div class='ctx'> "after you confirm.\n"</div><div class='hunk'>@@ -4224,12 +4224,12 @@ msgid ""</div><div class='ctx'> "experience. For more instructions on how to use the DiskDrake utility,\n"</div><div class='ctx'> "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."</div><div class='ctx'> msgstr ""</div><div class='del'>-"您需要決定那裡你想要安裝 Mandrakelinux\n"</div><div class='add'>+"您需要決定那裡你想要安裝 Mandrivalinux\n"</div><div class='ctx'> "作業系統於那個硬碟. 如果您的硬碟是全新尚未使用或\n"</div><div class='ctx'> "已經存在的作業系統正在使用全部可被利用的空間, 您將\n"</div><div class='ctx'> "必須進行分割硬碟的動作. 基本上, 分割硬碟的動作包含\n"</div><div class='ctx'> "邏輯上劃分它以建立需要的空間來安裝您的新\n"</div><div class='del'>-"Mandrakelinux 系統.\n"</div><div class='add'>+"Mandrivalinux 系統.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "因為分割硬碟的動作程序通常是無法回復的\n"</div><div class='ctx'> "且能導致資料遺失, 若您是一位不熟練的使用者,\n"</div><div class='hunk'>@@ -4255,7 +4255,7 @@ msgstr ""</div><div class='ctx'> "重新調整 Microsoft Windows FAT 或 NTFS 分割區大小.\n"</div><div class='ctx'> "若您已經 defragment(不連續碎片重新整理) Windows 分割\n"</div><div class='ctx'> "且它用 FAT 格式.重新調整分割可以被執行於不遺失任何資料\n"</div><div class='del'>-"資料備份是被強烈建議的. 若您想要使用 Mandrakelinux and Microsoft\n"</div><div class='add'>+"資料備份是被強烈建議的. 若您想要使用 Mandrivalinux and Microsoft\n"</div><div class='ctx'> "Windows 於同一台電腦, 使用此選項是被建議的.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "   選擇此選項前, 請了解當使用這個過程項目後, Microsoft Windows\n"</div><div class='hunk'>@@ -4263,7 +4263,7 @@ msgstr ""</div><div class='ctx'> " Microsoft Windows 來存您的資料與安裝新軟體.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". 如果您想要刪除全部現存於您的硬碟上資料與\n"</div><div class='del'>-"分割且以您的新 Mandrakelinux 系統替換他們,\n"</div><div class='add'>+"分割且以您的新 Mandrivalinux 系統替換他們,\n"</div><div class='ctx'> "選此選項. 但是小心使用, 你將無法於你確認之後\n"</div><div class='ctx'> "逆反你的決定.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4415,7 +4415,7 @@ msgid ""</div><div class='ctx'> "Click on \"%s\" when you're ready to format the partitions.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you want to choose another partition for your new\n"</div><div class='del'>-"Mandrakelinux operating system installation.\n"</div><div class='add'>+"Mandrivalinux operating system installation.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Click on \"%s\" if you wish to select partitions which will be checked for\n"</div><div class='ctx'> "bad blocks on the disk."</div><div class='hunk'>@@ -4430,7 +4430,7 @@ msgstr ""</div><div class='ctx'> "您將不行重新恢復它.\n"</div><div class='ctx'> "當您準備好要格式化此分割, 點選 \"%s\".\n"</div><div class='ctx'> "\n"</div><div class='del'>-"若您想選擇另一個分割給您的新的 Mandrakelinux 作業系統安裝, 點選了\"%s\".\n"</div><div class='add'>+"若您想選擇另一個分割給您的新的 Mandrivalinux 作業系統安裝, 點選了\"%s\".\n"</div><div class='ctx'> "若您想選擇要被檢查磁碟上壞的區塊的分割, 點選.\"%s\"."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434</div><div class='hunk'>@@ -4445,7 +4445,7 @@ msgstr "上一步"</div><div class='ctx'> #: help.pm:434</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"By the time you install Mandrakelinux, it's likely that some packages will\n"</div><div class='add'>+"By the time you install Mandrivalinux, it's likely that some packages will\n"</div><div class='ctx'> "have been updated since the initial release. Bugs may have been fixed,\n"</div><div class='ctx'> "security issues resolved. To allow you to benefit from these updates,\n"</div><div class='ctx'> "you're now able to download them from the Internet. Check \"%s\" if you\n"</div><div class='hunk'>@@ -4457,7 +4457,7 @@ msgid ""</div><div class='ctx'> "will appear: review the selection, and press \"%s\" to retrieve and install\n"</div><div class='ctx'> "the selected package(s), or \"%s\" to abort."</div><div class='ctx'> msgstr ""</div><div class='del'>-"此時您安裝 Mandrakelinux 時, 或許自從初始釋出的某些套件將有更新.\n"</div><div class='add'>+"此時您安裝 Mandrivalinux 時, 或許自從初始釋出的某些套件將有更新.\n"</div><div class='ctx'> "臭蟲或許已經修正了, 安全性問題解決了. 為了允許您從這些更新中\n"</div><div class='ctx'> "獲得利益, 您現在可以由網際網路下載他們. 如果您有可用的網際網路連線,\n"</div><div class='ctx'> "選取 \"%s\", 或是, 如果您想稍後安裝更新套件, 選取 \"%s\".\n"</div><div class='hunk'>@@ -4482,7 +4482,7 @@ msgid ""</div><div class='ctx'> "generally obtained at the expense of ease of use.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you do not know what to choose, keep the default option. You'll be able\n"</div><div class='del'>-"to change it later with the draksec tool, which is part of Mandrakelinux\n"</div><div class='add'>+"to change it later with the draksec tool, which is part of Mandrivalinux\n"</div><div class='ctx'> "Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Fill the \"%s\" field with the e-mail address of the person responsible for\n"</div><div class='hunk'>@@ -4493,7 +4493,7 @@ msgstr ""</div><div class='ctx'> "安全性等級應該設定較高. 權衡之下, 較高的安全性等級換得不容易使用.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "如果您不知道選什麼, 保留預設選項. 您將能在稍後用 draksec 工具改變它,\n"</div><div class='del'>-"draksec 是 Mandrakelinux 控制中心的一部分.用負責安全性的人的 e-mail 地址填入 "</div><div class='add'>+"draksec 是 Mandrivalinux 控制中心的一部分.用負責安全性的人的 e-mail 地址填入 "</div><div class='ctx'> "\"%s\" 欄位. 安全性訊息將被寄到\n"</div><div class='ctx'> "那個位址."</div><div class='ctx'> </div><div class='hunk'>@@ -4506,7 +4506,7 @@ msgstr "安全性管理員:"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "At this point, you need to choose which partition(s) will be used for the\n"</div><div class='del'>-"installation of your Mandrakelinux system. If partitions have already been\n"</div><div class='add'>+"installation of your Mandrivalinux system. If partitions have already been\n"</div><div class='ctx'> "defined, either from a previous installation of GNU/Linux or by another\n"</div><div class='ctx'> "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"</div><div class='ctx'> "partitions must be defined.\n"</div><div class='hunk'>@@ -4576,7 +4576,7 @@ msgid ""</div><div class='ctx'> "may find it a useful place to store a spare kernel and ramdisk images for\n"</div><div class='ctx'> "emergency boot situations."</div><div class='ctx'> msgstr ""</div><div class='del'>-"在這個階段, 您需要選擇要用來安裝 Mandrakelinux 系統的分割區.\n"</div><div class='add'>+"在這個階段, 您需要選擇要用來安裝 Mandrivalinux 系統的分割區.\n"</div><div class='ctx'> "如果分割區已經被定義了, 不管是從舊有的 GNU/Linux 安裝或是\n"</div><div class='ctx'> "另一個處理分割區的工具, 您可以使用原本已經劃分好的分割區.\n"</div><div class='ctx'> "否則硬碟分割必須要被定義.\n"</div><div class='hunk'>@@ -4651,7 +4651,7 @@ msgstr "切換一般/專家模式"</div><div class='ctx'> msgid ""</div><div class='ctx'> "More than one Microsoft partition has been detected on your hard drive.\n"</div><div class='ctx'> "Please choose the one which you want to resize in order to install your new\n"</div><div class='del'>-"Mandrakelinux operating system.\n"</div><div class='add'>+"Mandrivalinux operating system.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"</div><div class='ctx'> "\"Capacity\".\n"</div><div class='hunk'>@@ -4680,7 +4680,7 @@ msgid ""</div><div class='ctx'> "disk or partition is called \"C:\")."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "多於一個 Microsoft 分割區已經在您的硬碟上被偵測到. 請選擇您希望要重新調整 大"</div><div class='del'>-"小的分割以便安裝您的新的 Mandrakelinux 作業系統.\n"</div><div class='add'>+"小的分割以便安裝您的新的 Mandrivalinux 作業系統.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "每個分割區都列出了像是: \"Linux 名稱\", \"Windows 名稱\", \"容量\".\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -4722,7 +4722,7 @@ msgid ""</div><div class='ctx'> "found on your machine.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "DrakX now needs to know if you want to perform a new installation or an\n"</div><div class='del'>-"upgrade of an existing Mandrakelinux system:\n"</div><div class='add'>+"upgrade of an existing Mandrivalinux system:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". For the most part, this completely wipes out the old system.\n"</div><div class='ctx'> "However, depending on your partitioning scheme, you can prevent some of\n"</div><div class='hunk'>@@ -4731,13 +4731,13 @@ msgid ""</div><div class='ctx'> "the file system, you should use this option.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\". This installation class allows you to update the packages\n"</div><div class='del'>-"currently installed on your Mandrakelinux system. Your current partitioning\n"</div><div class='add'>+"currently installed on your Mandrivalinux system. Your current partitioning\n"</div><div class='ctx'> "scheme and user data will not be altered. Most of the other configuration\n"</div><div class='ctx'> "steps remain available and are similar to a standard installation.\n"</div><div class='ctx'> "\n"</div><div class='del'>-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"</div><div class='add'>+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"</div><div class='ctx'> "running version \"8.1\" or later. Performing an upgrade on versions prior\n"</div><div class='del'>-"to Mandrakelinux version \"8.1\" is not recommended."</div><div class='add'>+"to Mandrivalinux version \"8.1\" is not recommended."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: help.pm:591</div><div class='hunk'>@@ -4790,7 +4790,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"</div><div class='ctx'> "cover all existing languages. However full support for it in GNU/Linux is\n"</div><div class='del'>-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"</div><div class='add'>+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"</div><div class='ctx'> "depend on the user's choices:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * If you choose a language with a strong legacy encoding (latin1\n"</div><div class='hunk'>@@ -4827,7 +4827,7 @@ msgstr ""</div><div class='ctx'> "選擇英文當預設語言且在進階部份選擇 \"%s\".\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "關於 UTF-8 (unicode) 支援: Unicode 是一個新的字元編碼以含蓋全部存在的語言.\n"</div><div class='del'>-"然而, 在 GNU/Linux 下完全的支援仍然在開發中. 因為那個原因, Mandrakelinux 的\n"</div><div class='add'>+"然而, 在 GNU/Linux 下完全的支援仍然在開發中. 因為那個原因, Mandrivalinux 的\n"</div><div class='ctx'> " UTF-8 使用將根據使用者的選擇:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * 如果您選擇一個有強烈舊式編碼的語言 (latin1 語言, 俄羅斯, 日本, 中國,\n"</div><div class='hunk'>@@ -5032,7 +5032,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Now, it's time to select a printing system for your computer. Other\n"</div><div class='del'>-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"</div><div class='add'>+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"</div><div class='ctx'> "the printing systems is best suited to particular types of configuration.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"</div><div class='hunk'>@@ -5053,11 +5053,11 @@ msgid ""</div><div class='ctx'> "options and for managing the printer.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "If you make a choice now, and later find that you do not like your printing\n"</div><div class='del'>-"system you may change it by running PrinterDrake from the Mandrakelinux\n"</div><div class='add'>+"system you may change it by running PrinterDrake from the Mandrivalinux\n"</div><div class='ctx'> "Control Center and clicking on the \"%s\" button."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "現在要選擇您的電腦要使用的列印系統. 其他作業系統或許只有提供您一種選擇,\n"</div><div class='del'>-"但是 Mandrakelinux 這邊提供了兩種選擇. 每一種列印系統是最適合於特別設定型"</div><div class='add'>+"但是 Mandrivalinux 這邊提供了兩種選擇. 每一種列印系統是最適合於特別設定型"</div><div class='ctx'> "態.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\" - 是 ``print, do not queue (列印, 不排隊)'' 之縮寫字, 是當您有一"</div><div class='hunk'>@@ -5075,7 +5075,7 @@ msgstr ""</div><div class='ctx'> "\"%s\" 提供了圖形的介面前端給列印, 選擇列印的選項, 管理印表機.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "如果您現在做出決定, 且您之後發現不喜歡您的列印系統, 您可以藉由從\n"</div><div class='del'>-"Mandrakelinux 控制中心執行 PrinterDrake 點選 \"%s\" 按鍵改變它."</div><div class='add'>+"Mandrivalinux 控制中心執行 PrinterDrake 點選 \"%s\" 按鍵改變它."</div><div class='ctx'> </div><div class='ctx'> #: help.pm:765</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -5185,7 +5185,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": if you wish to configure your Internet or local network access,\n"</div><div class='ctx'> "you can do so now. Refer to the printed documentation or use the\n"</div><div class='del'>-"Mandrakelinux Control Center after the installation has finished to benefit\n"</div><div class='add'>+"Mandrivalinux Control Center after the installation has finished to benefit\n"</div><div class='ctx'> "from full in-line help.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"</div><div class='hunk'>@@ -5202,7 +5202,7 @@ msgid ""</div><div class='ctx'> " * \"%s\": if you wish to change your bootloader configuration, click this\n"</div><div class='ctx'> "button. This should be reserved to advanced users. Refer to the printed\n"</div><div class='ctx'> "documentation or the in-line help about bootloader configuration in the\n"</div><div class='del'>-"Mandrakelinux Control Center.\n"</div><div class='add'>+"Mandrivalinux Control Center.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> " * \"%s\": through this entry you can fine tune which services will be run\n"</div><div class='ctx'> "on your machine. If you plan to use this machine as a server it's a good\n"</div><div class='hunk'>@@ -5264,10 +5264,10 @@ msgstr "服務"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Choose the hard drive you want to erase in order to install your new\n"</div><div class='del'>-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"</div><div class='add'>+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"</div><div class='ctx'> "and will not be recoverable!"</div><div class='ctx'> msgstr ""</div><div class='del'>-"選擇您想要抹除的硬碟來安裝新的 Mandrakelinux 分割. 小心,\n"</div><div class='add'>+"選擇您想要抹除的硬碟來安裝新的 Mandrivalinux 分割. 小心,\n"</div><div class='ctx'> "磁碟上全部資料將遺失且將無法挽回!"</div><div class='ctx'> </div><div class='ctx'> #: help.pm:863</div><div class='hunk'>@@ -5612,11 +5612,11 @@ msgstr "計算 Windows 分割區大小"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your Windows partition is too fragmented. Please reboot your computer under "</div><div class='del'>-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "</div><div class='add'>+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "</div><div class='ctx'> "installation."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "您的 Windows 分割區太支離破碎。請先用 Windows 重新開機，執行  ``defrag'' 工具"</div><div class='del'>-"程式，然後重新開始安裝 Mandrakelinux 。"</div><div class='add'>+"程式，然後重新開始安裝 Mandrivalinux 。"</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='ctx'> #: install_interactive.pm:166</div><div class='hunk'>@@ -5728,19 +5728,19 @@ msgid ""</div><div class='ctx'> "Introduction\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "The operating system and the different components available in the "</div><div class='del'>-"Mandrakelinux distribution \n"</div><div class='add'>+"Mandrivalinux distribution \n"</div><div class='ctx'> "shall be called the \"Software Products\" hereafter. The Software Products "</div><div class='ctx'> "include, but are not \n"</div><div class='ctx'> "restricted to, the set of programs, methods, rules and documentation related "</div><div class='ctx'> "to the operating \n"</div><div class='del'>-"system and the different components of the Mandrakelinux distribution.\n"</div><div class='add'>+"system and the different components of the Mandrivalinux distribution.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "1. License Agreement\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Please read this document carefully. This document is a license agreement "</div><div class='ctx'> "between you and  \n"</div><div class='del'>-"Mandrakesoft S.A. which applies to the Software Products.\n"</div><div class='add'>+"Mandriva S.A. which applies to the Software Products.\n"</div><div class='ctx'> "By installing, duplicating or using the Software Products in any manner, you "</div><div class='ctx'> "explicitly \n"</div><div class='ctx'> "accept and fully agree to conform to the terms and conditions of this "</div><div class='hunk'>@@ -5762,7 +5762,7 @@ msgid ""</div><div class='ctx'> "The Software Products and attached documentation are provided \"as is\", "</div><div class='ctx'> "with no warranty, to the \n"</div><div class='ctx'> "extent permitted by law.\n"</div><div class='del'>-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "</div><div class='add'>+"Mandriva S.A. will, in no circumstances and to the extent permitted by "</div><div class='ctx'> "law, be liable for any special,\n"</div><div class='ctx'> "incidental, direct or indirect damages whatsoever (including without "</div><div class='ctx'> "limitation damages for loss of \n"</div><div class='hunk'>@@ -5770,14 +5770,14 @@ msgid ""</div><div class='ctx'> "resulting from a court \n"</div><div class='ctx'> "judgment, or any other consequential loss) arising out of  the use or "</div><div class='ctx'> "inability to use the Software \n"</div><div class='del'>-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "</div><div class='add'>+"Products, even if Mandriva S.A. has been advised of the possibility or "</div><div class='ctx'> "occurrence of such \n"</div><div class='ctx'> "damages.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "</div><div class='ctx'> "COUNTRIES\n"</div><div class='ctx'> "\n"</div><div class='del'>-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "</div><div class='add'>+"To the extent permitted by law, Mandriva S.A. or its distributors will, "</div><div class='ctx'> "in no circumstances, be \n"</div><div class='ctx'> "liable for any special, incidental, direct or indirect damages whatsoever "</div><div class='ctx'> "(including without \n"</div><div class='hunk'>@@ -5787,7 +5787,7 @@ msgid ""</div><div class='ctx'> "loss) arising out \n"</div><div class='ctx'> "of the possession and use of software components or arising out of  "</div><div class='ctx'> "downloading software components \n"</div><div class='del'>-"from one of Mandrakelinux sites  which are prohibited or restricted in some "</div><div class='add'>+"from one of Mandrivalinux sites  which are prohibited or restricted in some "</div><div class='ctx'> "countries by local laws.\n"</div><div class='ctx'> "This limited liability applies to, but is not restricted to, the strong "</div><div class='ctx'> "cryptography components \n"</div><div class='hunk'>@@ -5807,10 +5807,10 @@ msgid ""</div><div class='ctx'> "and conditions of the license agreement for each component before using any "</div><div class='ctx'> "component. Any question \n"</div><div class='ctx'> "on a component license should be addressed to the component author and not "</div><div class='del'>-"to Mandrakesoft.\n"</div><div class='del'>-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "</div><div class='add'>+"to Mandriva.\n"</div><div class='add'>+"The programs developed by Mandriva S.A. are governed by the GPL License. "</div><div class='ctx'> "Documentation written \n"</div><div class='del'>-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "</div><div class='add'>+"by Mandriva S.A. is governed by a specific license. Please refer to the "</div><div class='ctx'> "documentation for \n"</div><div class='ctx'> "further details.\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5821,11 +5821,11 @@ msgid ""</div><div class='ctx'> "respective authors and are \n"</div><div class='ctx'> "protected by intellectual property and copyright laws applicable to software "</div><div class='ctx'> "programs.\n"</div><div class='del'>-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "</div><div class='add'>+"Mandriva S.A. reserves its rights to modify or adapt the Software "</div><div class='ctx'> "Products, as a whole or in \n"</div><div class='ctx'> "parts, by all means and for all purposes.\n"</div><div class='del'>-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "</div><div class='del'>-"Mandrakesoft S.A.  \n"</div><div class='add'>+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "</div><div class='add'>+"Mandriva S.A.  \n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "5. Governing Laws \n"</div><div class='hunk'>@@ -5841,7 +5841,7 @@ msgid ""</div><div class='ctx'> "court. As a last \n"</div><div class='ctx'> "resort, the dispute will be referred to the appropriate Courts of Law of "</div><div class='ctx'> "Paris - France.\n"</div><div class='del'>-"For any question on this document, please contact Mandrakesoft S.A.  \n"</div><div class='add'>+"For any question on this document, please contact Mandriva S.A.  \n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_messages.pm:90</div><div class='hunk'>@@ -5926,7 +5926,7 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "For information on fixes which are available for this release of "</div><div class='del'>-"Mandrakelinux,\n"</div><div class='add'>+"Mandrivalinux,\n"</div><div class='ctx'> "consult the Errata available from:\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='hunk'>@@ -5934,21 +5934,21 @@ msgid ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "Information on configuring your system is available in the post\n"</div><div class='del'>-"install chapter of the Official Mandrakelinux User's Guide."</div><div class='add'>+"install chapter of the Official Mandrivalinux User's Guide."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "恭喜您！系統已經完成安裝。\n"</div><div class='ctx'> "請取出開機媒介並按下 return 以重新開機。\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"要獲得這個 Mandrakelinux 釋出版本可用的修正相關資訊，\n"</div><div class='add'>+"要獲得這個 Mandrivalinux 釋出版本可用的修正相關資訊，\n"</div><div class='ctx'> "請諮詢可用的勘誤表：\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "%s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "\n"</div><div class='del'>-"關於如何設定您系統的資訊可以在官方 Mandrakelinux 使用者指南\n"</div><div class='del'>-"(Official Mandrakelinux User's Guide) 的安裝後章節 (post install chapter )\n"</div><div class='add'>+"關於如何設定您系統的資訊可以在官方 Mandrivalinux 使用者指南\n"</div><div class='add'>+"(Official Mandrivalinux User's Guide) 的安裝後章節 (post install chapter )\n"</div><div class='ctx'> "裡面找到。"</div><div class='ctx'> </div><div class='ctx'> #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX</div><div class='hunk'>@@ -5983,11 +5983,11 @@ msgstr "進入步驟 `%s'\n"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Your system is low on resources. You may have some problem installing\n"</div><div class='del'>-"Mandrakelinux. If that occurs, you can try a text install instead. For "</div><div class='add'>+"Mandrivalinux. If that occurs, you can try a text install instead. For "</div><div class='ctx'> "this,\n"</div><div class='ctx'> "press `F1' when booting on CDROM, then enter `text'."</div><div class='ctx'> msgstr ""</div><div class='del'>-"您的系統資源太少。您可能會在安裝 Mandrakelinux 過程中遇到問題。\n"</div><div class='add'>+"您的系統資源太少。您可能會在安裝 Mandrivalinux 過程中遇到問題。\n"</div><div class='ctx'> "若是真的發生問題，您或許可以改用文字模式的安裝方式來取代。\n"</div><div class='ctx'> "要如此作的話m，請在光碟開機時按下 `F1'，然後輸入 `text'。"</div><div class='ctx'> </div><div class='hunk'>@@ -6518,7 +6518,7 @@ msgstr ""</div><div class='ctx'> #: install_steps_interactive.pm:821</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Contacting Mandrakelinux web site to get the list of available mirrors..."</div><div class='add'>+"Contacting Mandrivalinux web site to get the list of available mirrors..."</div><div class='ctx'> msgstr "連結到 Mirror Linux Web Site 查詢可用的映射站台"</div><div class='ctx'> </div><div class='ctx'> #: install_steps_interactive.pm:840</div><div class='hunk'>@@ -6735,8 +6735,8 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: install_steps_newt.pm:20</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Mandrakelinux Installation %s"</div><div class='del'>-msgstr "Mandrakelinux 安裝程式 %s"</div><div class='add'>+msgid "Mandrivalinux Installation %s"</div><div class='add'>+msgstr "Mandrivalinux 安裝程式 %s"</div><div class='ctx'> </div><div class='ctx'> #. -PO: This string must fit in a 80-char wide text screen</div><div class='ctx'> #: install_steps_newt.pm:34</div><div class='hunk'>@@ -9315,13 +9315,13 @@ msgstr "BitTorrent"</div><div class='ctx'> msgid ""</div><div class='ctx'> "drakfirewall configurator\n"</div><div class='ctx'> "\n"</div><div class='del'>-"This configures a personal firewall for this Mandrakelinux machine.\n"</div><div class='add'>+"This configures a personal firewall for this Mandrivalinux machine.\n"</div><div class='ctx'> "For a powerful and dedicated firewall solution, please look to the\n"</div><div class='ctx'> "specialized MandrakeSecurity Firewall distribution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "drakfirewall 設定程式\n"</div><div class='ctx'> "\n"</div><div class='del'>-"這是用來設定個人防火牆給 Mandrakelinux 機器.\n"</div><div class='add'>+"這是用來設定個人防火牆給 Mandrivalinux 機器.\n"</div><div class='ctx'> "若是您需要很致力強大的防火牆解決方案, 請您參閱\n"</div><div class='ctx'> "專門的 MandrakeSecurity Firewall distribution 產品資訊."</div><div class='ctx'> </div><div class='hunk'>@@ -13172,7 +13172,7 @@ msgstr ""</div><div class='ctx'> #: printer/printerdrake.pm:3929</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "</div><div class='add'>+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "</div><div class='ctx'> "your scanner on the network.\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -14950,18 +14950,18 @@ msgstr "停止"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;What is Mandrakelinux?&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux 是什麼？&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;What is Mandrivalinux?&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux 是什麼？&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Welcome to &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='del'>-msgstr "歡迎來到 &lt;b&gt;Mandrakelinux&lt;/b&gt;!"</div><div class='add'>+msgid "Welcome to &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='add'>+msgstr "歡迎來到 &lt;b&gt;Mandrivalinux&lt;/b&gt;!"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/01.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='add'>+"Mandrivalinux is a &lt;b&gt;Linux distribution&lt;/b&gt; that comprises the core of the "</div><div class='ctx'> "system, called the &lt;b&gt;operating system&lt;/b&gt; (based on the Linux kernel) "</div><div class='ctx'> "together with &lt;b&gt;a lot of applications&lt;/b&gt; meeting every need you could even "</div><div class='ctx'> "think of."</div><div class='hunk'>@@ -14970,7 +14970,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/01.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='add'>+"Mandrivalinux is the most &lt;b&gt;user-friendly&lt;/b&gt; Linux distribution today. It "</div><div class='ctx'> "is also one of the &lt;b&gt;most widely used&lt;/b&gt; Linux distributions worldwide!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -14987,9 +14987,9 @@ msgstr "歡迎來到開放源碼的世界。"</div><div class='ctx'> #: share/advertising/02.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux is committed to the open source model. This means that this "</div><div class='del'>-"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandrakesoft's "</div><div class='del'>-"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrakelinux "</div><div class='add'>+"Mandrivalinux is committed to the open source model. This means that this "</div><div class='add'>+"new release is the result of &lt;b&gt;collaboration&lt;/b&gt; between &lt;b&gt;Mandriva's "</div><div class='add'>+"team of developers&lt;/b&gt; and the &lt;b&gt;worldwide community&lt;/b&gt; of Mandrivalinux "</div><div class='ctx'> "contributors."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15009,7 +15009,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Most of the software included in the distribution and all of the "</div><div class='del'>-"Mandrakelinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux tools are licensed under the &lt;b&gt;General Public License&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/03.pl:17</div><div class='hunk'>@@ -15035,10 +15035,10 @@ msgstr ""</div><div class='ctx'> #: share/advertising/04.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakelinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='add'>+"Mandrivalinux has one of the &lt;b&gt;biggest communities&lt;/b&gt; of users and "</div><div class='ctx'> "developers. The role of such a community is very wide, ranging from bug "</div><div class='ctx'> "reporting to the development of new applications. The community plays a "</div><div class='del'>-"&lt;b&gt;key role&lt;/b&gt; in the Mandrakelinux world."</div><div class='add'>+"&lt;b&gt;key role&lt;/b&gt; in the Mandrivalinux world."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/04.pl:17</div><div class='hunk'>@@ -15057,8 +15057,8 @@ msgstr ""</div><div class='ctx'> #: share/advertising/05.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"You are now installing &lt;b&gt;Mandrakelinux Download&lt;/b&gt;. This is the free "</div><div class='del'>-"version that Mandrakesoft wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='add'>+"You are now installing &lt;b&gt;Mandrivalinux Download&lt;/b&gt;. This is the free "</div><div class='add'>+"version that Mandriva wants to keep &lt;b&gt;available to everyone&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/05.pl:19</div><div class='hunk'>@@ -15085,7 +15085,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "You will not have access to the &lt;b&gt;services included&lt;/b&gt; in the other "</div><div class='del'>-"Mandrakesoft products either."</div><div class='add'>+"Mandriva products either."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:13</div><div class='hunk'>@@ -15095,7 +15095,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux Discovery&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux Discovery&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/06.pl:17</div><div class='hunk'>@@ -15114,13 +15114,13 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/07.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"PowerPack is Mandrakesoft's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='add'>+"PowerPack is Mandriva's &lt;b&gt;premier Linux desktop&lt;/b&gt; product. PowerPack "</div><div class='ctx'> "includes &lt;b&gt;thousands of applications&lt;/b&gt; - everything from the most popular "</div><div class='ctx'> "to the most advanced."</div><div class='ctx'> msgstr ""</div><div class='hunk'>@@ -15132,7 +15132,7 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You are now installing &lt;b&gt;Mandrakelinux PowerPack+&lt;/b&gt;."</div><div class='add'>+msgid "You are now installing &lt;b&gt;Mandrivalinux PowerPack+&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/08.pl:17</div><div class='hunk'>@@ -15146,19 +15146,19 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux 控制中心"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products&lt;/b&gt;"</div><div class='add'>+msgstr "Mandrivalinux 控制中心"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakesoft&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrakelinux&lt;/b&gt; "</div><div class='add'>+"&lt;b&gt;Mandriva&lt;/b&gt; has developed a wide range of &lt;b&gt;Mandrivalinux&lt;/b&gt; "</div><div class='ctx'> "products."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The Mandrakelinux products are:"</div><div class='add'>+msgid "The Mandrivalinux products are:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/09.pl:18</div><div class='hunk'>@@ -15179,61 +15179,61 @@ msgstr ""</div><div class='ctx'> #: share/advertising/09.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Mandrakelinux for x86-64&lt;/b&gt;, The Mandrakelinux solution for making "</div><div class='add'>+"\t* &lt;b&gt;Mandrivalinux for x86-64&lt;/b&gt;, The Mandrivalinux solution for making "</div><div class='ctx'> "the most of your 64-bit processor."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Nomad Products)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Nomad Products)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "</div><div class='add'>+"Mandriva has developed two products that allow you to use Mandrivalinux "</div><div class='ctx'> "&lt;b&gt;on any computer&lt;/b&gt; and without any need to actually install it:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:18</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrakelinux distribution that runs entirely from a "</div><div class='add'>+"\t* &lt;b&gt;Move&lt;/b&gt;, a Mandrivalinux distribution that runs entirely from a "</div><div class='ctx'> "bootable CD-ROM."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/10.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrakelinux distribution pre-installed on the "</div><div class='add'>+"\t* &lt;b&gt;GlobeTrotter&lt;/b&gt;, a Mandrivalinux distribution pre-installed on the "</div><div class='ctx'> "ultra-compact “LaCie Mobile Hard Drive”."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakesoft Products (Professional Solutions)&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Products (Professional Solutions)&lt;/b&gt;"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Below are the Mandrakesoft products designed to meet the &lt;b&gt;professional "</div><div class='add'>+"Below are the Mandriva products designed to meet the &lt;b&gt;professional "</div><div class='ctx'> "needs&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:16</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrakelinux Desktop for Businesses."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Desktop&lt;/b&gt;, The Mandrivalinux Desktop for Businesses."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:17</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrakelinux Server Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Corporate Server&lt;/b&gt;, The Mandrivalinux Server Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/11.pl:18</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrakelinux Security Solution."</div><div class='add'>+msgid "\t* &lt;b&gt;Multi-Network Firewall&lt;/b&gt;, The Mandrivalinux Security Solution."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/12.pl:13</div><div class='hunk'>@@ -15271,7 +15271,7 @@ msgstr "選擇您檔案系統所使用的加密金鑰"</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17</div><div class='hunk'>@@ -15292,7 +15292,7 @@ msgstr ""</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "With PowerPack+, you will have the choice of the &lt;b&gt;graphical desktop "</div><div class='del'>-"environment&lt;/b&gt;. Mandrakesoft has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='add'>+"environment&lt;/b&gt;. Mandriva has chosen &lt;b&gt;KDE&lt;/b&gt; as the default one."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/14.pl:15</div><div class='hunk'>@@ -15322,7 +15322,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/15.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Kontact&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/15.pl:15</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -15409,7 +15409,7 @@ msgstr ""</div><div class='ctx'> #: share/advertising/18.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"In the Mandrakelinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='add'>+"In the Mandrivalinux menu you will find &lt;b&gt;easy-to-use&lt;/b&gt; applications for "</div><div class='ctx'> "&lt;b&gt;all of your tasks&lt;/b&gt;:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15644,14 +15644,14 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakelinux Control Center&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakelinux 控制中心&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandrivalinux Control Center&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandrivalinux 控制中心&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/25.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"The &lt;b&gt;Mandrakelinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='del'>-"Mandrakelinux-specific utilities designed to simplify the configuration of "</div><div class='add'>+"The &lt;b&gt;Mandrivalinux Control Center&lt;/b&gt; is an essential collection of "</div><div class='add'>+"Mandrivalinux-specific utilities designed to simplify the configuration of "</div><div class='ctx'> "your computer."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15673,21 +15673,21 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "Like all computer programming, open source software &lt;b&gt;requires time and "</div><div class='ctx'> "people&lt;/b&gt; for development. In order to respect the open source philosophy, "</div><div class='del'>-"Mandrakesoft sells added value products and services to &lt;b&gt;keep improving "</div><div class='del'>-"Mandrakelinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='del'>-"and the development of Mandrakelinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='add'>+"Mandriva sells added value products and services to &lt;b&gt;keep improving "</div><div class='add'>+"Mandrivalinux&lt;/b&gt;. If you want to &lt;b&gt;support the open source philosophy&lt;/b&gt; "</div><div class='add'>+"and the development of Mandrivalinux, &lt;b&gt;please&lt;/b&gt; consider buying one of "</div><div class='ctx'> "our products or services!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:13</div><div class='ctx'> #, fuzzy, c-format</div><div class='ctx'> msgid "&lt;b&gt;Online Store&lt;/b&gt;"</div><div class='del'>-msgstr "Mandrakelinux 控制中心"</div><div class='add'>+msgstr "Mandrivalinux 控制中心"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/27.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"To learn more about Mandrakesoft products and services, you can visit our "</div><div class='add'>+"To learn more about Mandriva products and services, you can visit our "</div><div class='ctx'> "&lt;b&gt;e-commerce platform&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -15710,20 +15710,20 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:15</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeclub&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Club&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeclub&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrakelinux "</div><div class='add'>+"&lt;b&gt;Mandriva Club&lt;/b&gt; is the &lt;b&gt;perfect companion&lt;/b&gt; to your Mandrivalinux "</div><div class='ctx'> "product.."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:19</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandrakeclub, such as:"</div><div class='add'>+"Take advantage of &lt;b&gt;valuable benefits&lt;/b&gt; by joining Mandriva Club, such as:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:20</div><div class='hunk'>@@ -15742,33 +15742,33 @@ msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:22</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "\t* Participation in Mandrakelinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='add'>+msgid "\t* Participation in Mandrivalinux &lt;b&gt;user forums&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/28.pl:23</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "\t* &lt;b&gt;Early and privileged access&lt;/b&gt;, before public release, to "</div><div class='del'>-"Mandrakelinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='add'>+"Mandrivalinux &lt;b&gt;ISO images&lt;/b&gt;."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:13</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "&lt;b&gt;Mandrakeonline&lt;/b&gt;"</div><div class='del'>-msgstr "&lt;b&gt;Mandrakeonline 線上服務&lt;/b&gt;"</div><div class='add'>+msgid "&lt;b&gt;Mandriva Online&lt;/b&gt;"</div><div class='add'>+msgstr "&lt;b&gt;Mandriva Online 線上服務&lt;/b&gt;"</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:15</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"&lt;b&gt;Mandrakeonline&lt;/b&gt; is a new premium service that Mandrakesoft is proud to "</div><div class='add'>+"&lt;b&gt;Mandriva Online&lt;/b&gt; is a new premium service that Mandriva is proud to "</div><div class='ctx'> "offer its customers!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:17</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"Mandrakeonline provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='del'>-"updating&lt;/b&gt; your Mandrakelinux systems:"</div><div class='add'>+"Mandriva Online provides a wide range of valuable services for &lt;b&gt;easily "</div><div class='add'>+"updating&lt;/b&gt; your Mandrivalinux systems:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='ctx'> #: share/advertising/29.pl:18</div><div class='hunk'>@@ -15791,32 +15791,32 @@ msgstr ""</div><div class='ctx'> #: share/advertising/29.pl:21</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='del'>-"\t* Management of &lt;b&gt;all your Mandrakelinux systems&lt;/b