Merge pull request #5345 from JosJuice/consistent-controller-translation Use _trans consistently for controllers
