9 Commits (ivanbratovic/improve-translatables)