[Aptitude-devel] Bug#720186: Bug#720186: German translation confusing

[Manuel A. Fernandez Montecelo]

Hi,

2014/1/19 Axel Beckert <abe at debian.org>:
> Control: tag -1 + pending patch
>
> Hi Manuel,
>
> Manuel A. Fernandez Montecelo wrote:
>> I don't think that a fix for this was commited to the VCS,
>
> It was committed but never pushed due to pending workflow questions.

Oh, I see, I was wondering if that's what had happened.

I thought about not unmarking it as pending because I was quite sure
that you would reply within a day, but just in case, it was no big
harm.


> See http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=16;bug=720186
>
>> and it did not make it to the last release, so unmarking it as
>> pending.
>
> Granted. I nevertheless still have those commits (and some more :-) so
> tagging again as pending, since I'm ready to push, I'm just unsure
> where to push them, i.e. to which branch.
>
> I've got:
>
> + 1 upstream fix for #720186
> + 1 debian packaging fix to fix a lintian warning
> + 1 debian packaging fix to fix a lintian warning, fixed in today's upload, too
>
> Where can I push which one (the last one will be dropped of couse)
> after rebasing on top of the current git branches?

See another email that I sent about it, I think that should be
"master" for the upstream fix (updating NEWS) and debian-sid for the
packaging ones (updating the changelog but only for this, not the ones
from "upstream" until they are merged.

BTW, I updated most of the .po files (only comments I think, but if my
update to the Debian translation was later than your commits...), so
maybe you will experience conflicts.  Perhaps it's better if you
remove the local file and pull from the VCS again, to fix the one-line
error/typo and commit.

Also, if you want I can commit it on your behalf, but if you want to
do it yourself (and fix more things) it would be great.

Thanks for the fix.

Cheers.
-- 
Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>