diff options
Diffstat (limited to 'perl-install/fs')
-rw-r--r-- | perl-install/fs/any.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/dmraid.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/format.pm | 6 | ||||
-rw-r--r-- | perl-install/fs/get.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/loopback.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/mount.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/mount_options.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/mount_point.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/partitioning.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/partitioning_wizard.pm | 8 | ||||
-rw-r--r-- | perl-install/fs/proc_partitions.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/remote.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/remote/nfs.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/remote/smb.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/type.pm | 2 | ||||
-rw-r--r-- | perl-install/fs/wild_device.pm | 2 |
16 files changed, 21 insertions, 21 deletions
diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm index 50d03b656..65ca02403 100644 --- a/perl-install/fs/any.pm +++ b/perl-install/fs/any.pm @@ -1,4 +1,4 @@ -package fs::any; # $Id$ +package fs::any; # $Id: any.pm 269745 2010-06-02 11:21:42Z pterjan $ use diagnostics; use strict; diff --git a/perl-install/fs/dmraid.pm b/perl-install/fs/dmraid.pm index 68dd98a16..a744f01af 100644 --- a/perl-install/fs/dmraid.pm +++ b/perl-install/fs/dmraid.pm @@ -1,4 +1,4 @@ -package fs::dmraid; # $Id$ +package fs::dmraid; # $Id: dmraid.pm 265309 2010-01-27 00:28:23Z pterjan $ use diagnostics; use strict; diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm index 708c8ef8e..fcd88a5ea 100644 --- a/perl-install/fs/format.pm +++ b/perl-install/fs/format.pm @@ -1,4 +1,4 @@ -package fs::format; # $Id$ +package fs::format; # $Id: format.pm 268842 2010-05-17 06:54:44Z pterjan $ use diagnostics; use strict; @@ -81,14 +81,14 @@ sub check_package_is_installed_format { my ($do_pkgs, $fs_type) = @_; my ($pkg, $binary) = @{$cmds{$fs_type} || return}; - whereis_binary($binary) || $do_pkgs->ensure_binary_is_installed($pkg, $binary); #- ensure_binary_is_installed checks binary chrooted, whereas we run the binary non-chrooted (pb for Mandriva One) + whereis_binary($binary) || $do_pkgs->ensure_binary_is_installed($pkg, $binary); #- ensure_binary_is_installed checks binary chrooted, whereas we run the binary non-chrooted (pb for Mageia One) } sub check_package_is_installed_label { my ($do_pkgs, $fs_type) = @_; my ($pkg, $binary) = @{$edit_LABEL{$fs_type} || return}; - whereis_binary($binary) || $do_pkgs->ensure_binary_is_installed($pkg, $binary); #- ensure_binary_is_installed checks binary chrooted, whereas we run the binary non-chrooted (pb for Mandriva One) + whereis_binary($binary) || $do_pkgs->ensure_binary_is_installed($pkg, $binary); #- ensure_binary_is_installed checks binary chrooted, whereas we run the binary non-chrooted (pb for Mageia One) } sub canEditLabel { diff --git a/perl-install/fs/get.pm b/perl-install/fs/get.pm index d98ccb2c7..8e49e91fa 100644 --- a/perl-install/fs/get.pm +++ b/perl-install/fs/get.pm @@ -1,4 +1,4 @@ -package fs::get; # $Id$ +package fs::get; # $Id: get.pm 245972 2008-09-18 17:00:11Z pixel $ use diagnostics; use strict; diff --git a/perl-install/fs/loopback.pm b/perl-install/fs/loopback.pm index 572c79f67..9d77c7302 100644 --- a/perl-install/fs/loopback.pm +++ b/perl-install/fs/loopback.pm @@ -1,4 +1,4 @@ -package fs::loopback; # $Id$ +package fs::loopback; # $Id: loopback.pm 212860 2005-06-28 09:12:16Z prigaux $ use diagnostics; use strict; diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm index 63db0470a..3c0696b75 100644 --- a/perl-install/fs/mount.pm +++ b/perl-install/fs/mount.pm @@ -1,4 +1,4 @@ -package fs::mount; # $Id$ +package fs::mount; # $Id: mount.pm 267516 2010-04-12 16:40:47Z pterjan $ use diagnostics; use strict; diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm index 291f7d350..8b8cc0bff 100644 --- a/perl-install/fs/mount_options.pm +++ b/perl-install/fs/mount_options.pm @@ -1,4 +1,4 @@ -package fs::mount_options; # $Id$ +package fs::mount_options; # $Id: mount_options.pm 268841 2010-05-17 06:52:12Z pterjan $ use diagnostics; use strict; diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm index 2e7f01b67..5854d4ebe 100644 --- a/perl-install/fs/mount_point.pm +++ b/perl-install/fs/mount_point.pm @@ -1,4 +1,4 @@ -package fs::mount_point; # $Id$ +package fs::mount_point; # $Id: mount_point.pm 269270 2010-05-24 09:55:20Z pterjan $ use diagnostics; use strict; diff --git a/perl-install/fs/partitioning.pm b/perl-install/fs/partitioning.pm index ab2b6733a..7621db9f8 100644 --- a/perl-install/fs/partitioning.pm +++ b/perl-install/fs/partitioning.pm @@ -1,4 +1,4 @@ -package fs::partitioning; # $Id$ +package fs::partitioning; # $Id: partitioning.pm 243679 2008-07-29 11:55:58Z tv $ use diagnostics; use strict; diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 7ae3ba2de..355992142 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -1,4 +1,4 @@ -package fs::partitioning_wizard; # $Id$ +package fs::partitioning_wizard; # $Id: partitioning_wizard.pm 269969 2010-06-09 13:01:09Z pterjan $ use diagnostics; use strict; @@ -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 Mandriva Linux installation."); +# die N("Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the Mageia Linux installation."); 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 Mandriva Linux 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 Mageia Linux installation."); } else { $part = top(grep { $_->{req_size} } @ok_for_resize_fat); } @@ -352,7 +352,7 @@ sub create_display_box { my $update_size_labels = sub { $win_size_label->set_label(" Windows (" . formatXiB($entry->{req_size}, 512) . ")"); - $mdv_size_label->set_label(" Mandriva (" . formatXiB($entry->{size} - $entry->{req_size}, 512) . ")"); + $mdv_size_label->set_label(" Mageia (" . formatXiB($entry->{size} - $entry->{req_size}, 512) . ")"); 0; }; my $update_req_size = sub { diff --git a/perl-install/fs/proc_partitions.pm b/perl-install/fs/proc_partitions.pm index 566f9ee70..8a1bc8ab0 100644 --- a/perl-install/fs/proc_partitions.pm +++ b/perl-install/fs/proc_partitions.pm @@ -1,4 +1,4 @@ -package fs::proc_partitions; # $Id$ +package fs::proc_partitions; # $Id: proc_partitions.pm 232285 2007-12-03 16:41:16Z pixel $ use common; diff --git a/perl-install/fs/remote.pm b/perl-install/fs/remote.pm index ea22a04af..efc630d4c 100644 --- a/perl-install/fs/remote.pm +++ b/perl-install/fs/remote.pm @@ -1,4 +1,4 @@ -package fs::remote; # $Id$ +package fs::remote; # $Id: remote.pm 215411 2007-04-25 12:26:16Z pixel $ use strict; use diagnostics; diff --git a/perl-install/fs/remote/nfs.pm b/perl-install/fs/remote/nfs.pm index 816c152a5..7ebda3b11 100644 --- a/perl-install/fs/remote/nfs.pm +++ b/perl-install/fs/remote/nfs.pm @@ -1,4 +1,4 @@ -package fs::remote::nfs; # $Id$ +package fs::remote::nfs; # $Id: nfs.pm 254157 2009-03-17 16:13:42Z eugeni $ use strict; use diagnostics; diff --git a/perl-install/fs/remote/smb.pm b/perl-install/fs/remote/smb.pm index acdf0d7cf..616636807 100644 --- a/perl-install/fs/remote/smb.pm +++ b/perl-install/fs/remote/smb.pm @@ -1,4 +1,4 @@ -package fs::remote::smb; # $Id$ +package fs::remote::smb; # $Id: smb.pm 258615 2009-07-27 06:26:03Z pterjan $ use strict; use diagnostics; diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index 5ff8210f3..bb90bdfe1 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -1,4 +1,4 @@ -package fs::type; # $Id$ +package fs::type; # $Id: type.pm 269283 2010-05-24 15:31:58Z pterjan $ use diagnostics; use strict; diff --git a/perl-install/fs/wild_device.pm b/perl-install/fs/wild_device.pm index 37818ce5a..efb48d9d7 100644 --- a/perl-install/fs/wild_device.pm +++ b/perl-install/fs/wild_device.pm @@ -1,4 +1,4 @@ -package fs::wild_device; # $Id$ +package fs::wild_device; # $Id: wild_device.pm 268572 2010-05-11 16:42:46Z pterjan $ use diagnostics; use strict; |