Merge "New settings text for translation" into jb-mr2-dev