Fix string localizability
Fix string localizability, part 2
Update translations
Merge branch 'develop'