Conflicts: dictsource/dict_phonemes phsource/compile_report phsource/vdiph/eei_5 phsource/vdiph2/i@_3 phsource/vietnam/_c.wav phsource/vietnam/a phsource/vietnam/ch.wav phsource/vietnam/dd.wav phsource/vietnam/ie_2 phsource/vietnam/oe phsource/vietnam/th.wav phsource/vietnam/tr.wav platforms/windows/make_espeakedit.iss src/Makefile