translations
fix merge
changes
Merge remote-tracking branch 'upstream/master'
Merge pull request #42 from calonso-conabio/master

more translations