factorize more distro name

3 files changed, 10 insertions, 9 deletions

diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 4d13f3692..97e7472f5 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -139,7 +139,7 @@ sub partitionWizardSolutions {
                     $min_win += partition_table::raw::cylinder_size($hd);
 
                     if ($part->{size} <= $min_linux_all + $min_win) {
-#                die N("Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the Mageia installation.");
+#                die N("Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the %s installation.", N("Mageia"));
                         undef $part;
                     } else {
                         $part->{resize_fat} = $resize_fat;
@@ -169,7 +169,7 @@ sub partitionWizardSolutions {
                           $part = $in->ask_from_listf_raw({ messages => N("Which partition do you want to resize?"),
                                                                interactive_help_id => 'resizeFATChoose',
                                                              }, \&partition_table::description, \@ok_for_resize_fat) or return;
-                          $part->{size} > $part->{min_linux} + $part->{min_win} or die N("Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the Mageia installation.");
+                          $part->{size} > $part->{min_linux} + $part->{min_win} or die N("Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the %s installation.", N("Mageia"));
                       } else {
                           $part = top(grep { $_->{req_size} } @ok_for_resize_fat);
                       }
diff --git a/perl-install/install/help/help.pm b/perl-install/install/help/help.pm
index b570e9ca3..9e4e63f7a 100644
--- a/perl-install/install/help/help.pm
+++ b/perl-install/install/help/help.pm
@@ -85,11 +85,11 @@ With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means
 \"second lowest SCSI ID\", etc.");
 }
 sub chooseCd() {
-    N("The Mageia installation is distributed on several CD-ROMs. If a
+    N("The %s installation is distributed on several CD-ROMs. If a
 selected package is located on another CD-ROM, DrakX will eject the current
 CD and ask you to insert the required one. If you do not have the requested
 CD at hand, just click on \"%s\", the corresponding packages will not be
-installed.", N("Cancel"));
+installed.", N("Mageia"), N("Cancel"));
 }
 sub choosePackages() {
     N("It's now time to specify which programs you wish to install on your system.
@@ -309,7 +309,7 @@ want to check \"%s\" if your machine is to act as a server, or if you were
 not successful in getting the display configured.", N("No"));
 }
 sub doPartitionDisks() {
-    N("You now need to decide where you want to install the Mageia
+    N("You now need to decide where you want to install the %s 
 operating system on your hard disk drive. If your hard disk drive is empty or if an
 existing operating system is using all the available space you will have to
 partition the drive. Basically, partitioning a hard disk drive means to
@@ -367,7 +367,8 @@ drive. Be careful -- it is a powerful but dangerous choice and you can very
 easily lose all your data. That's why this option is really only
 recommended if you have done something like this before and have some
 experience. For more instructions on how to use the DiskDrake utility,
-refer to the ``Managing Your Partitions'' section in the ``Starter Guide''.", N("Use free space"), N("Use existing partition"), N("Use the free space on the Microsoft Windows® partition"), N("Erase entire disk"), N("Remove Microsoft Windows®"), N("Custom disk partitioning"));
+refer to the ``Managing Your Partitions'' section in the ``Starter Guide''.",
+N("Mageia"), N("Use free space"), N("Use existing partition"), N("Use the free space on the Microsoft Windows® partition"), N("Erase entire disk"), N("Remove Microsoft Windows®"), N("Custom disk partitioning"));
 }
 sub exitInstall() {
     N("There you are. Installation is now complete and your GNU/Linux system is
@@ -427,7 +428,7 @@ Click on \"%s\" if you wish to select partitions which will be checked for
 bad blocks on the disk.", N("Next"), N("Previous"), N("Advanced"));
 }
 sub installUpdates() {
-    N("By the time you install Mageia, it's likely that some packages will
+    N("By the time you install %s, it's likely that some packages will
 have been updated since the initial release. Bugs may have been fixed,
 security issues resolved. To allow you to benefit from these updates,
 you're now able to download them from the Internet. Check \"%s\" if you
@@ -437,7 +438,7 @@ updated packages later.
 Choosing \"%s\" will display a list of web locations from which updates can
 be retrieved. You should choose one near to you. A package-selection tree
 will appear: review the selection, and press \"%s\" to retrieve and install
-the selected package(s), or \"%s\" to abort.", N("Yes"), N("No"), N("Yes"), N("Install"), N("Cancel"));
+the selected package(s), or \"%s\" to abort.", N("Mageia"), N("Yes"), N("No"), N("Yes"), N("Install"), N("Cancel"));
 }
 sub miscellaneous() {
     N("At this point, DrakX will allow you to choose the security level you desire
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index d60a57ede..57808b618 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -519,7 +519,7 @@ sub help() {
          $license =~ s/\n/\n\n/sg; # nicer formatting
          my $w = gtknew('AboutDialog', name => N("Drakfont"),
                         version => mageia_release_info()->{version},
-                        copyright => N("Copyright (C) %s by Mandriva", '2001-2008') ."\n" .N("Copyright (C) %s by Mageia", '2011') . "\n",
+                        copyright => N("Copyright (C) %s by %s", 'Mandriva', '2001-2008') ."\n" .N("Copyright (C) %s by %s", N("Mageia"), '2011') . "\n",
                         license => $license, wrap_license => 1,
                         comments => N("Font installer."),
                         website => 'http://www.mageia.org',