German translation unusable

[Christoph]

Hi,

two days ago i ran msgmerge to update the German .po file. After that 
(and even to some extend before that) the translation is now in large 
parts unusable. For example, the documentation for the convert extension 
has been split into many little texts instead of one large block. 
msgmerge copied the large translated block to every single little unit, 
so when someone runs 'hg help convert', they would get the same text 
over and over again.

I started updating the translations, but more than two thirds are still 
missing. But I already pushed the current results into the i18n repo, so 
they will eventually end up in the next release and all German users 
would be very annoyed.

What would be the best way to handle this? As Mark mentioned in IRC, the 
next freeze for 1.6.4 will be in 8 days, and I don't think I can update 
all missing translations in this time.
So should we go with the old translation file (the one before msgmerge) 
or use the current one, except removing all those over and over repeatd 
messages?

Greetings,
    Christoph

PS: The convert extension is finished, but some other exts are still 
left, that's why I'm asking.