Add locale generation
Merge remote-tracking branch 'origin/patch-1'