Prepared internationalization﻿
Merge branch 'merge' into release