Russ Allbery: > gitattributes(5) has the details under "Defining a custom merge > driver." It looks like the only hard part would be finding the *.pot > file with which to msgmerge. You should be able to run msgmerge against the target .po file, and it should ignore the translation in it. The .pot file is not strictly necessary. -- \\// Peter - http://www.softwolves.pp.se/