Update locale list
Merge branch 'master' into rails-3-x