package fs; # $Id$ use diagnostics; use strict; use common qw(:common :file :system :functional); use log; use devices; use partition_table qw(:types); use run_program; use swap; use detect_devices; use commands; use modules; use fsedit; use loopback; 1; sub add_options(\$@) { my ($option, @options) = @_; my %l; @l{split(',', $$option), @options} = (); delete $l{defaults}; $$option = join(',', keys %l) || "defaults"; } sub read_fstab($) { my ($file) = @_; local *F; open F, $file or return; map { my ($dev, @l) = split; $dev =~ s,/(tmp|dev)/,,; { device => $dev, mntpoint => $l[0], type => $l[1], options => $l[2] } } ; } sub up_mount_point { my ($mntpoint, $fstab) = @_; while (1) { $mntpoint = dirname($mntpoint); $mntpoint ne "." or return; $_->{mntpoint} eq $mntpoint and return $_ foreach @$fstab; } } sub check_mounted($) { my ($fstab) = @_; local (*F, *G, *H); open F, "/etc/mtab"; open G, "/proc/mounts"; open H, "/proc/swaps"; foreach (, , ) { foreach my $p (@$fstab) { /$p->{device}\s+([^\s]*)\s+/ and $p->{realMntpoint} = $1, $p->{isMounted} = $p->{isFormatted} = 1; } } } sub get_mntpoints_from_fstab { my ($fstab, $prefix, $uniq) = @_; foreach (read_fstab("$prefix/etc/fstab")) { next if $uniq && fsedit::mntpoint2part($_->{mntpoint}, $fstab); foreach my $p (@$fstab) { $p->{device} eq $_->{device} or next; $_->{type} ne 'auto' && $_->{type} ne type2fs($p->{type}) and log::l("err, fstab and partition table do not agree for $_->{device} type: " . (type2fs($p->{type}) || type2name($p->{type})) . " vs $_->{type}"), next; delete $p->{unsafeMntpoint} || !$p->{mntpoint} or next; $p->{mntpoint} = $_->{mntpoint}; $p->{options} = $_->{options}; } } } #- mke2fs -b (1024|2048|4096) -c -i(1024 > 262144) -N (1 > 100000000) -m (0-100%) -L volume-label #- tune2fs sub format_ext2($@) { my ($dev, @options) = @_; $dev =~ m,(rd|ida)/, and push @options, qw(-b 4096 -R stride=16); #- For RAID only. push @options, qw(-b 1024 -O none) if arch() =~ /alpha/; run_program::run("mke2fs", @options, devices::make($dev)) or die _("%s formatting of %s failed", "ext2", $dev); } sub format_reiserfs($@) { my ($dev, @options) = @_; run_program::run("mkreiserfs", "-f", @options, devices::make($dev)) or die _("%s formatting of %s failed", "reiserfs", $dev); } sub format_dos($@) { my ($dev, @options) = @_; run_program::run("mkdosfs", @options, devices::make($dev)) or die _("%s formatting of %s failed", "dos", $dev); } sub format_hfs($@) { my ($dev, @options) = @_; run_program::run("hformat", @options, devices::make($dev)) or die _("%s formatting of %s failed", "HFS", $dev); } sub real_format_part { my ($part) = @_; $part->{isFormatted} and return; my @options = $part->{toFormatCheck} ? "-c" : (); log::l("formatting device $part->{device} (type ", type2name($part->{type}), ")"); if (isExt2($part)) { push @options, "-F" if isLoopback($part); format_ext2($part->{device}, @options); } elsif (isReiserfs($part)) { format_reiserfs($part->{device}, @options); } elsif (isDos($part)) { format_dos($part->{device}, @options); } elsif (isWin($part)) { format_dos($part->{device}, @options, '-F', 32); } elsif (isHFS($part)) { format_hfs($part->{device}, @options, '-l', "Untitled"); } elsif (isSwap($part)) { my $check_blocks = grep { /^-c$/ } @options; swap::make($part->{device}, $check_blocks); } else { die _("I don't know how to format %s in type %s", $_->{device}, type2name($_->{type})); } $part->{isFormatted} = 1; } sub format_part { my ($raid, $part, $prefix) = @_; if (isRAID($part)) { require raid; raid::format_part($raid, $part); } elsif (isLoopback($part)) { loopback::format_part($part, $prefix); } else { real_format_part($part); } } sub formatMount_part { my ($part, $raid, $fstab, $prefix, $callback) = @_; if (isLoopback($part)) { formatMount_part($part->{device}, $raid, $fstab, $prefix, $callback); } if (my $p = up_mount_point($part->{mntpoint}, $fstab)) { formatMount_part($p, $raid, $fstab, $prefix, $callback) unless loopback::carryRootLoopback($part); } if ($part->{toFormat}) { $callback->($part) if $callback; format_part($raid, $part, $prefix); } mount_part($part, $prefix); } sub formatMount_all { my ($raid, $fstab, $prefix, $callback) = @_; formatMount_part($_, $raid, $fstab, $prefix, $callback) foreach sort { isLoopback($a) ? 1 : isSwap($a) ? -1 : 0 } grep { $_->{mntpoint} } @$fstab; #- ensure the link is there loopback::carryRootCreateSymlink($_, $prefix) foreach @$fstab; #- for fun :) #- that way, when install exits via ctrl-c, it gives hand to partition eval { local $SIG{__DIE__} = 'ignore'; my ($type, $major, $minor) = devices::entry(fsedit::get_root($fstab)->{device}); output "/proc/sys/kernel/real-root-dev", makedev($major, $minor); }; } sub mount($$$;$) { my ($dev, $where, $fs, $rdonly) = @_; log::l("mounting $dev on $where as type $fs"); -d $where or commands::mkdir_('-p', $where); if ($fs eq 'nfs') { log::l("calling nfs::mount($dev, $where)"); # nfs::mount($dev, $where) or die _("nfs mount failed"); } elsif ($fs eq 'smb') { die "no smb yet..."; } else { $dev = devices::make($dev) if $fs ne 'proc' && $fs ne 'usbdevfs'; my $flag = c::MS_MGC_VAL(); $flag |= c::MS_RDONLY() if $rdonly; my $mount_opt = ""; if ($fs eq 'vfat') { $mount_opt = 'check=relaxed'; eval { modules::load('vfat') }; #- try using vfat eval { modules::load('msdos') } if $@; #- otherwise msdos... } elsif ($fs eq 'ufs') { eval { modules::load('ufs') }; } elsif ($fs eq 'reiserfs') { #- could be better if we knew if there is a /boot or not #- without knowing it, / is forced to be mounted with notail $mount_opt = 'notail' if $where =~ m|/(boot)?$|; eval { modules::load('reiserfs') }; } elsif ($fs eq 'romfs') { eval { modules::load('romfs') }; } $where =~ s|/$||; log::l("calling mount($dev, $where, $fs, $flag, $mount_opt)"); syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die _("mount failed: ") . "$!"; } local *F; open F, ">>/etc/mtab" or return; #- fail silently, must be read-only /etc print F "$dev $where $fs defaults 0 0\n"; } #- takes the mount point to umount (can also be the device) sub umount($) { my ($mntpoint) = @_; log::l("calling umount($mntpoint)"); syscall_('umount', $mntpoint) or die _("error unmounting %s: %s", $mntpoint, "$!"); substInFile { $_ = '' if /(^|\s)$mntpoint\s/ } '/etc/mtab'; #- don't care about error, if we can't read, we won't manage to write... (and mess mtab) } sub mount_part($;$$) { my ($part, $prefix, $rdonly) = @_; #- root carrier's link can't be mounted loopback::carryRootCreateSymlink($part, $prefix); return if $part->{isMounted}; unless ($::testing) { if (isSwap($part)) { swap::swapon(isLoopback($part) ? $prefix . loopback::file($part) : $part->{device}); } else { $part->{mntpoint} or die "missing mount point"; my $dev = $part->{device}; my $mntpoint = ($prefix || '') . $part->{mntpoint}; if (isLoopback($part)) { eval { modules::load('loop') }; $dev = $part->{real_device} = devices::set_loop($prefix . loopback::file($part)) || die; } elsif (loopback::carryRootLoopback($part)) { $mntpoint = "/initrd/loopfs"; } mount(devices::make($dev), $mntpoint, type2fs($part->{type}), $rdonly); rmdir "$mntpoint/lost+found"; } } $part->{isMounted} = $part->{isFormatted} = 1; #- assume that if mount works, partition is formatted } sub umount_part($;$) { my ($part, $prefix) = @_; $part->{isMounted} or return; unless ($::testing) { if (isSwap($part)) { swap::swapoff($part->{device}); } elsif (loopback::carryRootLoopback($part)) { umount("/initrd/loopfs"); } else { umount(($prefix || '') . $part->{mntpoint} || devices::make($part->{device})); c::del_loop(delete $part->{real_device}) if isLoopback($part); } } $part->{isMounted} = 0; } sub mount_all($;$$) { my ($fstab, $prefix) = @_; #- TODO fsck, create check_mount_all ? log::l("mounting all filesystems"); #- order mount by alphabetical ordre, that way / < /home < /home/httpd... foreach (sort { $a->{mntpoint} cmp $b->{mntpoint} } grep { $_->{mntpoint} && isTrueFS($_) } @$fstab) { mount_part($_, $prefix); } } sub umount_all($;$) { my ($fstab, $prefix) = @_; log::l("unmounting all filesystems"); foreach (sort { $b->{mntpoint} cmp $a->{mntpoint} } @$fstab) { $_->{mntpoint} and umount_part($_, $prefix); } } sub df { my ($part, $prefix) = @_; my $dir = "/tmp/tmp_fs_df"; return $part->{free} if exists $part->{free}; if ($part->{isMounted}) { $dir = ($prefix || '') . $part->{mntpoint}; } elsif ($part->{notFormatted} && !$part->{isFormatted}) { return; #- won't even try! } else { mkdir $dir; eval { mount($part->{device}, $dir, type2fs($part->{type}), 'readonly') }; if ($@) { $part->{notFormatted} = 1; $part->{isFormatted} = 0; unlink $dir; return; } } my (undef, $free) = common::df($dir); if (!$part->{isMounted}) { umount($dir); unlink($dir) } $part->{free} = 2 * $free if defined $free; $part->{free}; } #- do some stuff before calling write_fstab sub write($$$$) { my ($prefix, $fstab, $manualFstab, $useSupermount) = @_; $fstab = [ @{$fstab||[]}, @{$manualFstab||[]} ]; log::l("resetting /etc/mtab"); local *F; open F, "> $prefix/etc/mtab" or die "error resetting $prefix/etc/mtab"; my ($floppy) = detect_devices::floppies(); my @to_add = ( $useSupermount ? [ split ' ', "/mnt/floppy /mnt/floppy supermount fs=vfat,dev=/dev/$floppy 0 0" ] : [ split ' ', "/dev/$floppy /mnt/floppy auto sync,user,noauto,nosuid,nodev 0 0" ], [ split ' ', 'none /proc proc defaults 0 0' ], [ split ' ', 'none /dev/pts devpts mode=0620 0 0' ], (map_index { my $i = $::i ? $::i + 1 : ''; mkdir "$prefix/mnt/cdrom$i", 0755;#- or log::l("failed to mkdir $prefix/mnt/cdrom$i: $!"); symlinkf $_->{device}, "$prefix/dev/cdrom$i" or log::l("failed to symlink $prefix/dev/cdrom$i: $!"); chown 0, 22, "$prefix/dev/$_->{device}"; $useSupermount ? [ "/mnt/cdrom$i", "/mnt/cdrom$i", "supermount", "fs=iso9660,dev=/dev/cdrom$i", 0, 0 ] : [ "/dev/cdrom$i", "/mnt/cdrom$i", "auto", "user,noauto,nosuid,exec,nodev,ro", 0, 0 ]; } detect_devices::cdroms()), (map_index { #- for zip drives, the right partition is the 4th by default. my $i = $::i ? $::i + 1 : ''; mkdir "$prefix/mnt/zip$i", 0755 or log::l("failed to mkdir $prefix/mnt/zip$i: $!"); symlinkf "$_->{device}4", "$prefix/dev/zip$i" or log::l("failed to symlink $prefix/dev/zip$i: $!"); $useSupermount ? [ "/mnt/zip$i", "/mnt/zip$i", "supermount", "fs=vfat,dev=/dev/zip$i", 0, 0 ] : [ "/dev/zip$i", "/mnt/zip$i", "auto", "user,noauto,nosuid,exec,nodev", 0, 0 ]; } detect_devices::zips())); write_fstab($fstab, $prefix, @to_add); } sub write_fstab($;$$) { my ($fstab, $prefix, @to_add) = @_; $prefix ||= ''; #- get the list of devices and mntpoint to remove existing entries #- and @to_add take precedence over $fstab to handle removable device #- if they are mounted OR NOT during install. my @new = grep { $_ ne 'none' } map { @$_[0,1] } @to_add; my %new; @new{@new} = undef; unshift @to_add, grep { my $b = !exists $new{$_->[0]} && !exists $new{$_->[1]}; #- keep in mind the new line for fstab. @new{@$_[0,1]} = undef; $b } map { my ($dir, $options, $freq, $passno) = qw(/dev/ defaults 0 0); $options = $_->{options} || $options; isTrueFS($_) and ($freq, $passno) = (1, ($_->{mntpoint} eq '/') ? 1 : 2); isNfs($_) and $dir = '', $options = $_->{options} || 'ro,nosuid,rsize=8192,wsize=8192'; isFat($_) and $options = $_->{options} || "user,exec,umask=0"; isReiserfs($_) && $_ == fsedit::get_root($fstab, 'boot') and add_options($options, "notail"); my $dev = isLoopback($_) ? ($_->{mntpoint} eq '/' ? "/initrd/loopfs$_->{loopback_file}" : loopback::file($_)) : ($_->{device} =~ /^\// ? $_->{device} : "$dir$_->{device}"); local $_->{mntpoint} = do { $passno = 0; "/initrd/loopfs"; } if loopback::carryRootLoopback($_); add_options($options, "loop") if isLoopback($_) && !isSwap($_); #- no need for loop option for swap files eval { devices::make("$prefix/$dev") } if $dir && !isLoopback($_); mkdir "$prefix/$_->{mntpoint}", 0755 if $_->{mntpoint} && !isSwap($_); [ $dev, $_->{mntpoint}, type2fs($_->{type}), $options, $freq, $passno ]; } grep { $_->{mntpoint} && type2fs($_->{type}) } @$fstab; push @to_add, grep { !exists $new{$_->[0]} && !exists $new{$_->[1]} } map { [ split ] } cat_("$prefix/etc/fstab"); log::l("writing $prefix/etc/fstab"); local *F; open F, "> $prefix/etc/fstab" or die "error writing $prefix/etc/fstab"; print F join(" ", @$_), "\n" foreach sort { $a->[1] cmp $b->[1] } @to_add; } sub merge_fstabs { my ($fstab, $manualFstab) = @_; my %l; $l{$_->{device}} = $_ foreach @$manualFstab; %$_ = (%$_, %{$l{$_->{device}} || next}) foreach @$fstab; } #sub check_mount_all_fstab($;$) { # my ($fstab, $prefix) = @_; # $prefix ||= ''; # # foreach (sort { ($a->{mntpoint} || '') cmp ($b->{mntpoint} || '') } @$fstab) { # #- avoid unwanted mount in fstab. # next if ($_->{device} =~ /none/ || $_->{type} =~ /nfs|smbfs|ncpfs|proc/ || $_->{options} =~ /noauto|ro/); # # #- TODO fsck # # eval { mount(devices::make($_->{device}), $prefix . $_->{mntpoint}, $_->{type}, 0); }; # if ($@) { # log::l("unable to mount partition $_->{device} on $prefix/$_->{mntpoint}"); # } # } #} summary='file diffstat' width='6%'> -rw-r--r--perl-install/share/po/ca.po2
-rw-r--r--perl-install/share/po/cs.po4
-rw-r--r--perl-install/share/po/cy.po4
-rw-r--r--perl-install/share/po/da.po4
-rw-r--r--perl-install/share/po/de.po4
-rw-r--r--perl-install/share/po/el.po4
-rw-r--r--perl-install/share/po/eo.po2
-rw-r--r--perl-install/share/po/es.po4
-rw-r--r--perl-install/share/po/et.po4
-rw-r--r--perl-install/share/po/eu.po4
-rw-r--r--perl-install/share/po/fa.po4
-rw-r--r--perl-install/share/po/fi.po6
-rw-r--r--perl-install/share/po/fr.po4
-rw-r--r--perl-install/share/po/fur.po2
-rw-r--r--perl-install/share/po/ga.po2
-rw-r--r--perl-install/share/po/gl.po4
-rw-r--r--perl-install/share/po/he.po4
-rw-r--r--perl-install/share/po/hi.po4
-rw-r--r--perl-install/share/po/hr.po4
-rw-r--r--perl-install/share/po/hu.po4
-rw-r--r--perl-install/share/po/id.po4
-rw-r--r--perl-install/share/po/is.po4
-rw-r--r--perl-install/share/po/it.po4
-rw-r--r--perl-install/share/po/ja.po4
-rw-r--r--perl-install/share/po/ko.po2
-rw-r--r--perl-install/share/po/ky.po2
-rw-r--r--perl-install/share/po/libDrakX.pot2
-rw-r--r--perl-install/share/po/lt.po2
-rw-r--r--perl-install/share/po/ltg.po2
-rw-r--r--perl-install/share/po/lv.po2
-rw-r--r--perl-install/share/po/mk.po4
-rw-r--r--perl-install/share/po/mn.po2
-rw-r--r--perl-install/share/po/ms.po2
-rw-r--r--perl-install/share/po/mt.po2
-rw-r--r--perl-install/share/po/nb.po4
-rw-r--r--perl-install/share/po/nl.po4
-rw-r--r--perl-install/share/po/nn.po4
-rw-r--r--perl-install/share/po/pa_IN.po2
-rw-r--r--perl-install/share/po/pl.po4
-rw-r--r--perl-install/share/po/pt.po4
-rw-r--r--perl-install/share/po/pt_BR.po4
-rw-r--r--perl-install/share/po/ro.po4
-rw-r--r--perl-install/share/po/ru.po4
-rw-r--r--perl-install/share/po/sc.po2
-rw-r--r--perl-install/share/po/sk.po4
-rw-r--r--perl-install/share/po/sl.po4
-rw-r--r--perl-install/share/po/sq.po4
-rw-r--r--perl-install/share/po/sr.po4
-rw-r--r--perl-install/share/po/sr@Latn.po4
-rw-r--r--perl-install/share/po/sv.po4
-rw-r--r--perl-install/share/po/ta.po4
-rw-r--r--perl-install/share/po/tg.po4
-rw-r--r--perl-install/share/po/th.po4
-rw-r--r--perl-install/share/po/tl.po4
-rw-r--r--perl-install/share/po/tr.po4
-rw-r--r--perl-install/share/po/uk.po4
-rw-r--r--perl-install/share/po/uz.po4
-rw-r--r--perl-install/share/po/uz@cyrillic.po4
-rw-r--r--perl-install/share/po/vi.po4
-rw-r--r--perl-install/share/po/wa.po2
-rw-r--r--perl-install/share/po/zh_CN.po4
-rw-r--r--perl-install/share/po/zh_TW.po2
74 files changed, 123 insertions, 123 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 03ff03993..9c2fda96b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,7 +1,7 @@
- drakbug:
o fix preselecting "RPM package" (Manuel Hiebel, mga#7380)
- finish-install:
- o advertize new doc license (mga#7347)
+ o advertize new doc license & licenser (mga#7347)
Version 14.43 - 4 September 2012
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c9589e27a..778ba44ca 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,5 @@
- adapt to xserver 1.13
-- advertize new doc license (mga#7347)
+- advertize new doc license & licenser (mga#7347)
- install cpupower instead of cpupower
Version 14.43 - 4 September 2012
diff --git a/perl-install/messages.pm b/perl-install/messages.pm
index 1d55964b6..b464e6d15 100644
--- a/perl-install/messages.pm
+++ b/perl-install/messages.pm
@@ -75,7 +75,7 @@ All rights to the components of the Software Products belong to their respective
protected by intellectual property and copyright laws applicable to software programs.
Mageia and its suppliers and licensors reserves their rights to modify or adapt the Software
Products, as a whole or in parts, by all means and for all purposes.
-\"Mageia\" and associated logos are trademarks of Mageia"),
+\"Mageia\" and associated logos are trademarks of %s", "Mageia.Org"),
N("5. Governing Laws
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index e5eda1765..a0114a794 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -4887,7 +4887,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po
index 5d23b6b5c..b6b82ed5f 100644
--- a/perl-install/share/po/am.po
+++ b/perl-install/share/po/am.po
@@ -4685,7 +4685,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po
index 5f4e4a603..375a0ed56 100644
--- a/perl-install/share/po/ar.po
+++ b/perl-install/share/po/ar.po
@@ -4798,7 +4798,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po
index 3efac9f00..67c140cb2 100644
--- a/perl-install/share/po/az.po
+++ b/perl-install/share/po/az.po
@@ -4976,7 +4976,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. İntelektual Sahiblik Hüquqları\n"
"\n"
@@ -4987,7 +4987,7 @@ msgstr ""
"Mageia reserves its rights to modify or adapt the Software Products, as a "
"whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po
index 161c98daa..4096d27dc 100644
--- a/perl-install/share/po/be.po
+++ b/perl-install/share/po/be.po
@@ -4707,7 +4707,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po
index a01ea9424..17507e9c0 100644
--- a/perl-install/share/po/bg.po
+++ b/perl-install/share/po/bg.po
@@ -4957,7 +4957,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Права за Интелектуална Собственост\n"
"\n"
@@ -4968,7 +4968,7 @@ msgstr ""
"Mageia запазва правото си да модифицира и пригодява Софтуерния Продукт, като "
"цяло или на\n"
"части, по всякакъв начин и с всякакви цели.\n"
-"\"Mageia\" и свързаните логота са запазена марка на Mageia"
+"\"Mageia\" и свързаните логота са запазена марка на %s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/bn.po b/perl-install/share/po/bn.po
index 7ab74af6d..8a53c9467 100644
--- a/perl-install/share/po/bn.po
+++ b/perl-install/share/po/bn.po
@@ -4912,7 +4912,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po
index 3758eb417..3b9e678e1 100644
--- a/perl-install/share/po/br.po
+++ b/perl-install/share/po/br.po
@@ -4786,7 +4786,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po
index da9a85507..1c7131371 100644
--- a/perl-install/share/po/bs.po
+++ b/perl-install/share/po/bs.po
@@ -5032,7 +5032,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Intellectual Property Rights\n"
"\n"
@@ -5043,7 +5043,7 @@ msgstr ""
"Mageia reserves its rights to modify or adapt the Software Products, as a "
"whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index c524b5f89..704d2f2c6 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -4884,7 +4884,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po
index 1dee2fd84..049c77fa9 100644
--- a/perl-install/share/po/cs.po
+++ b/perl-install/share/po/cs.po
@@ -4969,7 +4969,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Práva duševního vlastnictví\n"
"\n"
@@ -4977,7 +4977,7 @@ msgstr ""
"konkrétních součástí Software a jsou chráněna zejm. Autorským zákonem v "
"platném znění. Sdružení Mageia jakož i jednotliví autoři si vyhrazují právo "
"kdykoliv pozměnit či upravit Software či jeho součásti bez omezení. \n"
-"\"Mageia\" a její loga jsou ochrannými známkami sdružení Mageia."
+"\"Mageia\" a její loga jsou ochrannými známkami sdružení %s."
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 4de2746f1..096a3799d 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -5016,7 +5016,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Hawliau Eiddo Deallusol\n"
"\n"
@@ -5028,7 +5028,7 @@ msgstr ""
"addasu'r Cynnyrch Meddalwedd,\n"
"yn rhannol neu yn gyfan, drwy unrhyw ddull ac ar gyfer unrhyw bwrpas.\n"
"Mae \"Mageia\" a'r logos cysylltiedig yn nodau masnachol sy'n perthyn i "
-"Mageia"
+"%s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po
index fca735732..8920fc5b7 100644
--- a/perl-install/share/po/da.po
+++ b/perl-install/share/po/da.po
@@ -4999,7 +4999,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Intellektuelle rettigheder\n"
"\n"
@@ -5008,7 +5008,7 @@ msgstr ""
"ophavsretslove, gældende for programmel. Mageia forbeholder sine rettigheder "
"til at ændre eller tilpasse programmelprodukterne, helt eller delvist, med "
"alle midler og til alle formål. \"Mageia\" samt de tilhørende logoer er "
-"varemærker for Mageia "
+"varemærker for %s "
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po
index 3a0413549..d0c8e7826 100644
--- a/perl-install/share/po/de.po
+++ b/perl-install/share/po/de.po
@@ -5075,7 +5075,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Geistiges Eigentum\n"
"\n"
@@ -5086,7 +5086,7 @@ msgstr ""
"Recht vor, die Software-Produkte als Ganzes oder teilweise aus jeglichen\n"
"Gründen zu modifizieren und anzupassen.\n"
"„Mageia“ und entsprechende Logos sind eingetragene\n"
-"Warenzeichen der Mageia."
+"Warenzeichen der %s."
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po
index f419e70f6..9dd6b8277 100644
--- a/perl-install/share/po/el.po
+++ b/perl-install/share/po/el.po
@@ -5101,7 +5101,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Δικαιώματα Πνευματικής Ιδιοκτησίας\n"
"Όλα τα δικαιώματα για τα συστατικά μέρη των Προϊόντων Λογισμικού ανήκουν "
@@ -5112,7 +5112,7 @@ msgstr ""
"αναπροσαρμογή ή την προσαρμογή \n"
"των προϊόντων λογισμικού, στο σύνολό τους ή κατά τμήματα, με όλα τα μέσα και "
"για όλους τους σκοπούς.\n"
-"«Mageia» και τα σχετιζόμενα με αυτά λογότυπα είναι εμπορικά σήματα της Mageia"
+"«Mageia» και τα σχετιζόμενα με αυτά λογότυπα είναι εμπορικά σήματα της %s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po
index 8e1d0973b..432e36850 100644
--- a/perl-install/share/po/eo.po
+++ b/perl-install/share/po/eo.po
@@ -4825,7 +4825,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/es.po b/perl-install/share/po/es.po
index 17b3164e9..3e68d8a76 100644
--- a/perl-install/share/po/es.po
+++ b/perl-install/share/po/es.po
@@ -5057,7 +5057,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Derechos de propiedad intelectual\n"
"\n"
@@ -5070,7 +5070,7 @@ msgstr ""
"modificar o adaptar los \n"
"Productos de Software, como un todo o en parte, por todos los medios y para "
"cualquier propósito.\n"
-"\"Mageia\" y los logos asociados son marca registrada de Mageia "
+"\"Mageia\" y los logos asociados son marca registrada de %s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index 1ffbdc6a5..06fe1f357 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -5012,7 +5012,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Intellectual Property Rights\n"
"\n"
@@ -5023,7 +5023,7 @@ msgstr ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po
index 752d681bd..c741c41e9 100644
--- a/perl-install/share/po/eu.po
+++ b/perl-install/share/po/eu.po
@@ -5026,7 +5026,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Jabetza intelektualaren eskubideak\n"
"\n"
@@ -5037,7 +5037,7 @@ msgstr ""
"Mageiak eskubidea du Software Produktuak bere osotasunean edo zatika "
"aldatzeko, \n"
"edozein bide erabiliz eta helburu guztietarako.\n"
-"\"Mageia\" eta asoziatutako logotipoak Mageiaren marka erregistratuak dira. "
+"\"Mageia\" eta asoziatutako logotipoak %s marka erregistratuak dira. "
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/fa.po b/perl-install/share/po/fa.po
index 7529f3e5f..92e09104a 100644
--- a/perl-install/share/po/fa.po
+++ b/perl-install/share/po/fa.po
@@ -4978,7 +4978,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"۴. حقوق مالکیت نبوغی\n"
"تمام حقوق برنامه‌های محصولات نرم‌افزاری به نویسندگان هر یک از آنها تعلق داشته "
@@ -4986,7 +4986,7 @@ msgstr ""
"مالکیت نبوغی و قوانین حق امتیاز برنامه‌های نرم‌افزاری حفاظت می‌شوند. \n"
"شرکت Mageiaحقوق امتیازی خود را برای تغییر یا وفق دادن محصولات نرم‌افزاری \n"
"بطور کامل یا قسمت‌هایی از آنها، در هر صورت و برای هر منظور محفوظ می‌دارد. \n"
-"\"Mageia\" و علائم مربوطه آرم‌های بازرگانی Mageia می باشند."
+"\"Mageia\" و علائم مربوطه آرم‌های بازرگانی %s می باشند."
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po
index d05f77fec..07fe7b9df 100644
--- a/perl-install/share/po/fi.po
+++ b/perl-install/share/po/fi.po
@@ -5050,7 +5050,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Henkisten omaisuuksien oikeudet\n"
"\n"
@@ -5059,7 +5059,7 @@ msgstr ""
"jotka koskevat ohjelmistoja. Mageia pidättää oikeuden muokata\n"
"tai sovittaa Ohjelmistoa, joko kokonaan tai osittain, kaikilla tavoilla\n"
"jokaiseen tarpeeseen. \"Mageia\" ja kaikki niihin\n"
-"liittyvät logot ovat Mageia:n rekisteröityjä tavaramerkkejä."
+"liittyvät logot ovat %s:n rekisteröityjä tavaramerkkejä."
#: messages.pm:81
#, c-format
@@ -5189,7 +5189,7 @@ msgstr ""
"rights to modify or adapt the Software Products, as a whole or in parts, by "
"all\n"
"means and for all purposes. \"Mageia\" and associated logos\n"
-"are trademarks of Mageia\n"
+"are trademarks of Mageia.Org\n"
"\n"
"\n"
"5. Governing Laws \n"
diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po
index b7e03532c..fe782f170 100644
--- a/perl-install/share/po/fr.po
+++ b/perl-install/share/po/fr.po
@@ -5050,7 +5050,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4 Droits à la propriété intellectuelle\n"
"\n"
@@ -5060,7 +5060,7 @@ msgstr ""
"bailleurs de licence et ses fournisseurs se réservent le droit de modifier "
"ou adapter les produits logiciels dans leur totalité ou en partie, par tous "
"les moyens et à toute fin. « Mageia » et les logos associés sont des marques "
-"commerciales de Mageia."
+"commerciales de %s."
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/fur.po b/perl-install/share/po/fur.po
index b949d0791..9f79a0a54 100644
--- a/perl-install/share/po/fur.po
+++ b/perl-install/share/po/fur.po
@@ -4698,7 +4698,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/ga.po b/perl-install/share/po/ga.po
index 37a7c13b5..7e8121ce5 100644
--- a/perl-install/share/po/ga.po
+++ b/perl-install/share/po/ga.po
@@ -4736,7 +4736,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po
index a5fc527f8..28af91a64 100644
--- a/perl-install/share/po/gl.po
+++ b/perl-install/share/po/gl.po
@@ -5042,7 +5042,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Dereitos de Propiedade Intelectual\n"
"\n"
@@ -5054,7 +5054,7 @@ msgstr ""
"de \n"
"Software, en conxunto ou en parte, de calquera maneira e para tódolos "
"propósitos.\n"
-"\"Mageia\" e os logos asociados son marcas comerciais de Mageia "
+"\"Mageia\" e os logos asociados son marcas comerciais de %s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/he.po b/perl-install/share/po/he.po
index 3b1feafcc..2838ffa09 100644
--- a/perl-install/share/po/he.po
+++ b/perl-install/share/po/he.po
@@ -4942,7 +4942,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. זכויות קניין רוחני\n"
"\n"
@@ -4954,7 +4954,7 @@ msgstr ""
"בכל שיטה שהיא ולכל צורך שהוא.\n"
"השמות \"Mageia\", \"מנדריבה לינוקס\" וסמלים מסחריים הקשורים אליהם הם שמות "
"שמורים של חברת\n"
-"Mageia"
+"%s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/hi.po b/perl-install/share/po/hi.po
index cb62f04ec..6a04b7f91 100644
--- a/perl-install/share/po/hi.po
+++ b/perl-install/share/po/hi.po
@@ -4973,7 +4973,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"४. बौधिक सम्पत्ति के अधिकार\n"
"\n"
@@ -4984,7 +4984,7 @@ msgstr ""
"Mageia reserves its rights to modify or adapt the Software Products, as a "
"whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po
index 04398f1d2..c3501c125 100644
--- a/perl-install/share/po/hr.po
+++ b/perl-install/share/po/hr.po
@@ -4910,7 +4910,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Prava na intelektualno vlasništvo\n"
"\n"
@@ -4921,7 +4921,7 @@ msgstr ""
"Mageia zadržava svoje pravo za izmjenu ili prilagođavanje Software-skog "
"Produkta, kao cijelinu ili u\n"
"dijelovima, u svim slučajevima za sve namjene.\n"
-"\"Mageia\" i pripadajući logoi su zaštićeni prodajni znaci Mageia "
+"\"Mageia\" i pripadajući logoi su zaštićeni prodajni znaci %s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po
index 7fb66d351..a19718ad8 100644
--- a/perl-install/share/po/hu.po
+++ b/perl-install/share/po/hu.po
@@ -5060,7 +5060,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Szellemi tulajdonra vonatkozó jogok\n"
"\n"
@@ -5071,7 +5071,7 @@ msgstr ""
"A Mageia fenntartja a jogot arra, hogy módosítsa illetve átalakítsa a\n"
"Szoftvertermékeket - teljes egészében vagy részben, bármilyen módon, illetve "
"bármilyen célra.\n"
-"A \"Mageia\" és az azokhoz tartozó logók a Mageia védjegyei."
+"A \"Mageia\" és az azokhoz tartozó logók a %s védjegyei."
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po
index bb3039e02..bcf29cdb2 100644
--- a/perl-install/share/po/id.po
+++ b/perl-install/share/po/id.po
@@ -5018,7 +5018,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Intellectual Property Rights\n"
"\n"
@@ -5029,7 +5029,7 @@ msgstr ""
"Mageia reserves its rights to modify or adapt the Software Products, as a "
"whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po
index 43533ac91..c78702030 100644
--- a/perl-install/share/po/is.po
+++ b/perl-install/share/po/is.po
@@ -4999,7 +4999,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Höfundaréttur\n"
"\n"
@@ -5008,7 +5008,7 @@ msgstr ""
"eins og þau eiga við um hugbúnað. Mageia tekur sér rétt til að breyta eða "
"aðlaga \n"
"Hugbúnaðar-einingar, að hluta eða í heild, með öllum og til \"Mageia\" og "
-"tengd vörumerki eru skráð vörumerki Mageia "
+"tengd vörumerki eru skráð vörumerki %s "
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/it.po b/perl-install/share/po/it.po
index efd8ffcd1..588b05844 100644
--- a/perl-install/share/po/it.po
+++ b/perl-install/share/po/it.po
@@ -5093,7 +5093,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Diritti di proprietà intellettuale\n"
"\n"
@@ -5109,7 +5109,7 @@ msgstr ""
"adattare i \"Prodotti software\", in parte o in tutto, con ogni mezzo e per "
"qualsiasi \n"
"\n"
-"scopo. \"Mageia\" e i relativi loghi sono proprietà di Mageia "
+"scopo. \"Mageia\" e i relativi loghi sono proprietà di %s"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index 550f0f6f9..d1091f55f 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -4964,7 +4964,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. 知的所有権\n"
"\n"
@@ -4972,7 +4972,7 @@ msgstr ""
"に属し、ソフトウェア・プログラムに適用される知的財産法・著作権法によって\n"
"保護されています。Mageia は方法・目的の如何にかかわらずソフト\n"
"ウェア製品を全面的・部分的に改変する権利を留保しています。\n"
-"Mageia、ならびに関連するロゴは Mageia の登録商標です。"
+"Mageia、ならびに関連するロゴは %s の登録商標です。"
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/ko.po b/perl-install/share/po/ko.po
index b5ac94734..a18f84b7a 100644
--- a/perl-install/share/po/ko.po
+++ b/perl-install/share/po/ko.po
@@ -4819,7 +4819,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/ky.po b/perl-install/share/po/ky.po
index 0feb27983..7720569df 100644
--- a/perl-install/share/po/ky.po
+++ b/perl-install/share/po/ky.po
@@ -4898,7 +4898,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/libDrakX.pot b/perl-install/share/po/libDrakX.pot
index 81c4bda67..804de9ba2 100644
--- a/perl-install/share/po/libDrakX.pot
+++ b/perl-install/share/po/libDrakX.pot
@@ -4570,7 +4570,7 @@ msgid ""
"protected by intellectual property and copyright laws applicable to software programs.\n"
"Mageia and its suppliers and licensors reserves their rights to modify or adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/lt.po b/perl-install/share/po/lt.po
index c407c69a0..201ca19fc 100644
--- a/perl-install/share/po/lt.po
+++ b/perl-install/share/po/lt.po
@@ -4764,7 +4764,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/ltg.po b/perl-install/share/po/ltg.po
index 2f8da057d..e0228bcdf 100644
--- a/perl-install/share/po/ltg.po
+++ b/perl-install/share/po/ltg.po
@@ -4835,7 +4835,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po
index 7faadb634..b5da13821 100644
--- a/perl-install/share/po/lv.po
+++ b/perl-install/share/po/lv.po
@@ -4825,7 +4825,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/mk.po b/perl-install/share/po/mk.po
index e12bbcb5e..9fe6d0f36 100644
--- a/perl-install/share/po/mk.po
+++ b/perl-install/share/po/mk.po
@@ -4976,7 +4976,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
"4. Права на интелектиална сопственост\n"
"\n"
@@ -4987,7 +4987,7 @@ msgstr ""
"адаптира софтверските производи, како целина или во делови, на било кој\n"
"начин и за било која цел.\n"
"\"Mageia\" и придружените логотипи се заштитени знаци\n"
-"на Mageia "
+"на %s "
#: messages.pm:81
#, c-format
diff --git a/perl-install/share/po/mn.po b/perl-install/share/po/mn.po
index b153f2c5f..e9284af85 100644
--- a/perl-install/share/po/mn.po
+++ b/perl-install/share/po/mn.po
@@ -4693,7 +4693,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/ms.po b/perl-install/share/po/ms.po
index 648716910..4e0975bde 100644
--- a/perl-install/share/po/ms.po
+++ b/perl-install/share/po/ms.po
@@ -4697,7 +4697,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "
"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\" and associated logos are trademarks of Mageia"
+"\"Mageia\" and associated logos are trademarks of %s"
msgstr ""
#: messages.pm:81
diff --git a/perl-install/share/po/mt.po b/perl-install/share/po/mt.po
index a608151ef..9c2753742 100644
--- a/perl-install/share/po/mt.po
+++ b/perl-install/share/po/mt.po
@@ -4918,7 +4918,7 @@ msgid ""
"Mageia and its suppliers and licensors reserves their rights to modify or "