translations
Merge remote-tracking branch 'upstream/master'
mix translations
translation on flash controller observations
minor change
Merge pull request #72 from calonso-conabio/master

translations CONABIO