Fix: Solve conflict of translation
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3