Put the space inside the translatable string for the words 'in', 'and' and 'on' and update _default.pot file.
Merge branch 'submodule'