summaryrefslogtreecommitdiffstats
path: root/perl-install/partition_table.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-11-06 13:20:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-11-06 13:20:21 +0000
commit9091151d546e5d749b47e2efce3ff651784fcc8c (patch)
tree2be2bec5e60f21ffe431eeef74095896ae5efe7f /perl-install/partition_table.pm
parent68a1a2a6f2b9fdb1fd0c833cd9b3d8dcb9d8fd5c (diff)
downloaddrakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.tar
drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.tar.gz
drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.tar.bz2
drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.tar.xz
drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.zip
replace "_" with "N" and "__" with "N_"
rationale: - currently, we use _("xxx") as a shorthand for gettext("xxx"). It also used to call xgettext with --keyword=_ - alas, function &_ is global and not by package (notice esp. that _ is not exported in common.pm) - this lead to big ugly pb with packages defining their own &_, overriding common.pm's &_ - a fix is to set @::textdomains to add a new domain (the default being "libDrakX") but relying on the global "_" is still dangerous!
Diffstat (limited to 'perl-install/partition_table.pm')
-rw-r--r--perl-install/partition_table.pm16
1 files changed, 8 insertions, 8 deletions
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 787e4e416..d7e0ccbce 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -596,11 +596,11 @@ sub write {
my @magic_parts = grep { $_->{isMounted} && $_->{real_mntpoint} } get_normal_parts($hd);
foreach (@magic_parts) {
- syscall_('umount', $_->{real_mntpoint}) or log::l(_("error unmounting %s: %s", $_->{real_mntpoint}, "$!"));
+ syscall_('umount', $_->{real_mntpoint}) or log::l(N("error unmounting %s: %s", $_->{real_mntpoint}, "$!"));
}
$hd->kernel_read;
foreach (@magic_parts) {
- syscall_('mount', , $_->{real_mntpoint}, type2fs($_), c::MS_MGC_VAL()) or log::l(_("mount failed: ") . "$!");
+ syscall_('mount', , $_->{real_mntpoint}, type2fs($_), c::MS_MGC_VAL()) or log::l(N("mount failed: ") . "$!");
}
}
$hd->{needKernelReread} = 0;
@@ -664,7 +664,7 @@ sub add_primary {
}
sub add_extended {
- arch() =~ /^sparc|ppc/ and die _("Extended partition not supported on this platform");
+ arch() =~ /^sparc|ppc/ and die N("Extended partition not supported on this platform");
my ($hd, $part, $extended_type) = @_;
$extended_type =~ s/Extended_?//;
@@ -682,7 +682,7 @@ sub add_extended {
local $e->{size} = $end - $start;
eval { verifyPrimary($hd->{primary}) };
$@ and die
-_("You have a hole in your partition table but I can't use it.
+N("You have a hole in your partition table but I can't use it.
The only solution is to move your primary partitions to have the hole next to the extended partitions.");
}
}
@@ -765,16 +765,16 @@ sub load {
my ($hd, $file, $force) = @_;
local *F;
- open F, $file or die _("Error reading file %s", $file);
+ open F, $file or die N("Error reading file %s", $file);
my $h;
{
local $/ = "\0";
eval <F>;
}
- $@ and die _("Restoring from file %s failed: %s", $file, $@);
+ $@ and die N("Restoring from file %s failed: %s", $file, $@);
- ref $h eq 'ARRAY' or die _("Bad backup file");
+ ref $h eq 'ARRAY' or die N("Bad backup file");
my %h; @h{@fields2save} = @$h;
@@ -796,5 +796,5 @@ sub save {
require Data::Dumper;
open F, ">$file"
and print F Data::Dumper->Dump([\@h], ['$h']), "\0"
- or die _("Error writing to file %s", $file);
+ or die N("Error writing to file %s", $file);
}