Merge pull request #1206 from grandoc/develop

uniformize
Fix: doc
Syn with transifex
Trad: Fix bad descriptor