For the past few months, wherever possible, I've been backporting
updates to trunk to the 1.0.X branch. However, the branches (and line
numbers) are differing enough now that it's becoming a bit of a fragile
process and I'm concerned that even when the patch applies without
obvious errors, things may not be completely correct.
So, it's up to you -- the translators -- to do the work. You are in a
better position than me, or any other committer, to know if the patch
against 1.0.X is correct. If you want the branch to be updated, create a
second patch.
Regards,
Malcolm