[Mageia-dev] [1124] - fix plural, thank to JohnR

[John]

On Fri, 6 May 2011 19:19:10 +0200
Ahmad Samir wrote:

> On 6 May 2011 15:40,  <root at mageia.org> wrote:
> > Revision 1124 Author misc Date 2011-05-06 15:40:27 +0200 (Fri, 06 May
> > 2011)
> >
> > Log Message
> >
> > - fix plural, thank to JohnR
> >
> > Modified Paths
> >
> > rpmdrake/trunk/Rpmdrake/edit_urpm_sources.pm
> > rpmdrake/trunk/Rpmdrake/gui.pm
> > rpmdrake/trunk/Rpmdrake/init.pm
> > rpmdrake/trunk/Rpmdrake/pkg.pm
> >
> > Modified: rpmdrake/trunk/Rpmdrake/edit_urpm_sources.pm
> > ===================================================================
> > --- rpmdrake/trunk/Rpmdrake/edit_urpm_sources.pm	2011-05-06
> > 13:34:07 UTC (rev 1123)
> > +++ rpmdrake/trunk/Rpmdrake/edit_urpm_sources.pm	2011-05-06
> > 13:40:27 UTC (rev 1124)
> > @@ -1188,8 +1188,8 @@
> >          my $err_msg = "urpmdb locked\n";
> >          local $urpm->{fatal} = sub {
> >              interactive_msg('rpmdrake',
> > -                            N("Packages database is locked. Please
> > close other applications
> > -working with packages database (do you have another media
> > +                            N("The Package Database is locked. Please
> > close other applications
> > +working with the Package Database (do you have another media
> >  manager on another desktop, or are you currently installing
> >  packages as well?)."));
> >              die $err_msg;
> >
> > Modified: rpmdrake/trunk/Rpmdrake/gui.pm
> > ===================================================================
> > --- rpmdrake/trunk/Rpmdrake/gui.pm	2011-05-06 13:34:07 UTC (rev
> > 1123) +++ rpmdrake/trunk/Rpmdrake/gui.pm	2011-05-06 13:40:27
> > UTC (rev 1124) @@ -841,7 +841,7 @@
> >                      ($count == 1 ? N("One package cannot be
> > installed") : N("Some packages can't be installed")),
> >  		    ($count == 1 ?
> >                   N("Sorry, the following package cannot be
> > selected:\n\n%s", format_list(@reasons))
> > -                   : N("Sorry, the following packages can't be
> > selected:\n\n%s", format_list(@reasons))),
> > +                   : N("Sorry, the following packages cannot be
> > selected:\n\n%s", format_list(@reasons))),
> >                      scroll => 1,
> >                  );
> >                  foreach (@cant) {
> > @@ -912,7 +912,7 @@
> >      my $size_added = sum(map { if_($_->flag_selected &&
> > !$_->flag_installed, $_->size) } @{$urpm->{depslist}});
> >      if ($MODE eq 'install' && $size_free - $size_added/1024 <
> > 50*1024) { interactive_msg(N("Too many packages are selected"),
> > -                        N("Warning: it seems that you are attempting
> > to add so much
> > +                        N("Warning: it seems that you are attempting
> > to add so many
> >  packages that your filesystem may run out of free diskspace,
> 
> Should 'disk space'.

It could be either, so I left it as 'diskspace'.

John NZ