R18n + translations + markup fix