The translations have been merged by calling
python development/tools/mergepo.py -n ../lyx-2.1-git/po
cd po; make update-gmo
For some languages it may make sense to merge also changed translations,
but this neds to be decided by the individual translators.
These have been added by 36d7b40c, before we had always UNIX only.
poedit can read the mixed files just fine, but python polib (which is used
in po/lyx_pot.py) refuses to load files with mixed endings.