Hello, On Tue, Aug 01, 2006 at 06:42:51PM +0200, Helge Kreutzmann wrote: > On Tue, Aug 01, 2006 at 12:44:10AM +0200, Nicolas François wrote: > > On Mon, Jul 31, 2006 at 07:02:49PM +0200, Helge Kreutzmann wrote: > > > > > > I'm not sure here (I find this line hard to read), but what does "version" > > > refere to here? My suggestion: > > > -msgid "I<E<lt>divert-toE<gt>> is the name used by other packages' > > > versions." > > > +msgid "I<E<lt>divert-toE<gt>> is the name used by other packages." > > > > it means "by the versions of the files provided by other packages", or > > "other > > packages will install their versions to <divert-to>" > > Ok. For me I always think of "version" in terms of numbers, i.e. > version numbers, especially in the context of dpkg/apt. I think your > more verbose statement should be taken, as it is much easier to parse. > > Is the second suggestion correct? As I understood this, divert-to is > the name as given in the deb-package, the one the admin would not like > to see on her disk. As seen in the examples: > dpkg-divert --divert /usr/bin/example --rename /usr/bin/example.foo > > So a package ships "/usr/bin/example" which will, after the above > call, end up in /usr/bin/example.foo on the disc, correct?
No. divert-to is a destination name. In the above example, the package provides a file named /usr/bin/example.foo, and the admin (or a package script) wants to install it in /usr/bin/example. > In the first suggestion you use plural, but I am not sure that > multiple files can be specified (at least the man page does not say > so). So maybe this line could become: > +msgid "" > +"I<E<lt>divert-toE<gt>> is the name used by the versions of the file as " > +"provided by other packages." Do you think this is correct: <divert-to> is the location where the versions of the <file>, as provided by other packages, will be diverted. > It may be a little longer, but it is much easier to read. > > > > The explanation for --local I did not understand (and there was no > > > example), > > > so I would recommend explaining this a bit more. I hope the translation > > > for > > > this option is correct. > > > > --local is the default, so it is not specified in the first example. > > > > It means that there are no exceptions, whatever package is installed, the > > file is diverted. This can be used by an admin to install a *locally* > > modified version. > > > > On the contrary, if '--package foo' is provided, whatever package *except > > package foo* will have this file diverted. > > > > I hope this explanation is clearer...Do you have a rewording proposal? > > Yes, very much clearer. Could we simply include this? So then for > local we have: > +msgid "" > +"Specifies that all packages' versions of this file are diverted. > +"This means, that there are no exceptions, and whatever package is > installed, " > +"the file is diverted. This can be used by an admin to install a I<locally> " > +"modified version. This is complementary to B<--package>." I will remove the "This is complementary to B<--package>." part, and the beautification arround "locally". (I'm not sure of the first (complementary or contarry?); and I don't think the second is necessary). Kind Regards, -- Nekral
