Conflicts: dictsource/dict_phonemes phsource/compile_report platforms/riscos/cpp/speak_riscos platforms/riscos/s/cmhgfile