'git pull' before pushing to prevent merge
Merge pull request #485 from Ppjet6/update_translations

'git pull' before pushing to prevent merge