merging successfull version, some translations added