[master] Fix problems with translatable strings