translations
Merge remote-tracking branch 'upstream/master'
minor change
Merge pull request #138 from calonso-conabio/master

translations