Code cleanup
Add translations