Merge pull request #9727 from JosJuice/translatable-strings-fixes-2 Fixes to translatable strings, take 2
