josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tweak translation strings

Browse source 
git-svn-id: http://emdebian.org/svn/current@7256 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2010-05-30 23:40:38 +00:00
parent bb03f08521
commit 2de5a872b8
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
multistrap
View file

@ -151,8 +151,8 @@ if (not -d "$dir")
{ {
my $ret = system ("mkdir -p $dir"); my $ret = system ("mkdir -p $dir");
$ret /= 256 if (defined $ret); $ret /= 256 if (defined $ret);
die ("Unable to create directory '$dir' $!\n") my $msg = sprintf (_g("Unable to create directory '%s'"),$dir);
if ($ret != 0); die "$progname: $msg\n" if ($ret != 0);
} }
$dir = `realpath $dir`; $dir = `realpath $dir`;
chomp ($dir); chomp ($dir);
@ -315,7 +315,7 @@ my @s = ();
$str = ""; $str = "";
if ((not defined $omitrequired) or ($omitrequired eq "false")) if ((not defined $omitrequired) or ($omitrequired eq "false"))
{ {
print "Calculating required packages.\n"; print _g("I: Calculating required packages.\n");
&get_required_debs; &get_required_debs;
$str .= join (' ', keys %required); $str .= join (' ', keys %required);
chomp($str); chomp($str);
@ -440,7 +440,7 @@ exit 0;
sub our_version { sub our_version {
my $query = `dpkg-query -W -f='\${Version}' multistrap`; my $query = `dpkg-query -W -f='\${Version}' multistrap`;
(defined $query) ? return $query : return "2.1.1"; (defined $query) ? return $query : return "2.1.5";
} }
sub add_extra_packages sub add_extra_packages
@ -705,7 +705,7 @@ sub native
"LC_ALL=C LANGUAGE=C LANG=C"; "LC_ALL=C LANGUAGE=C LANG=C";
printf (_g("I: dpkg configuration settings:\n\t%s\n"), $env); printf (_g("I: dpkg configuration settings:\n\t%s\n"), $env);
if ($e =~ /\nFAKEROOTKEY=[0-9]+\n/) { if ($e =~ /\nFAKEROOTKEY=[0-9]+\n/) {
warn ("W: Cannot use 'chroot' when fakeroot is in use. Skipping package configuration.\n"); warn (_g("W: Cannot use 'chroot' when fakeroot is in use. Skipping package configuration.\n"));
return; return;
} }
print _g("I: Native mode - configuring unpacked packages . . .\n"); print _g("I: Native mode - configuring unpacked packages . . .\n");
@ -934,8 +934,7 @@ sub cascade
} }
} }
my %uniq=(); my %uniq=();
foreach my $listing (@reinstall) foreach my $listing (@reinstall) {
{
$uniq{$listing}++; $uniq{$listing}++;
} }
@reinstall=(); @reinstall=();
@ -989,7 +988,7 @@ sub dump_config {
foreach my $sect (sort keys %uniq) foreach my $sect (sort keys %uniq)
{ {
if (not exists $keys{$sect}) { if (not exists $keys{$sect}) {
$msg .= sprintf (_g("ERROR: The '%s' section is not defined.\n"), $sect); $msg .= sprintf (_g("ERR: The '%s' section is not defined.\n"), $sect);
} }
} }
if (scalar @includes > 0) { if (scalar @includes > 0) {
@ -1031,7 +1030,7 @@ sub dump_config {
print "reinstall: ".join (", ", sort (@reinstall))."\n" print "reinstall: ".join (", ", sort (@reinstall))."\n"
if (scalar @reinstall > 0); if (scalar @reinstall > 0);
if (defined $arch) { if (defined $arch) {
printf (_g("arch: \tArchitecture: %s\n"), $arch); printf ("arch: \t"._g("Architecture: %s\n"), $arch);
} else { } else {
$msg .= sprintf(_g("Cannot determine architecture from '%s'.\n"), $file); $msg .= sprintf(_g("Cannot determine architecture from '%s'.\n"), $file);
} }