Raphael Hertzog:
Well, given the high standards for git usage I don't know if my git foo is good enough for this. It would definitly be faster if someone with more knowledge would do this ...Ask peterk, he offered help. :)
I've moved the German changes over, via an intermediate topic branch, which I merged into both master and sid. At least this makes merging sid into master conflict-free as to PO files for me.
-- \\// Peter - http://www.softwolves.pp.se/