some locale translation added
cnflict solved
changes in frontend