message catalogs: fix comment lines, also remove linux hack in merge.c