Removed "" for the warning, as __ does not parse " o ' and lead to a wrong URL
Added missing changelog
Changed to function used to __x
fixed style/indentation
Merge pull request #426 from Zentyal/jbahillo/gwcomma

Jbahillo/gwcomma