preparing the integration of the Hungarian language
fixes the conflicts