version and translation update
merge master