Merge remote-tracking branch 'upstream/master'
more translations
Merge remote-tracking branch 'upstream/master'
Merge pull request #269 from calonso-conabio/master

more translations