I think we should separate for WinMerge 3.x the website sources from the normal source codes.
The website has only one state and don't need different brunches like WinMerge self. Also the source zip files would get a little bit smaller.
The website should get a own bitbucket/Mercurial repository and should use Transifex
for the translation.