working on translations, incorporated both beta and release into the branch