Merging fixes and translation live.