Added additional translations. Fixed some Sonar violations