fix language
fix: bad commit
Fix: Translation
Merge pull request #667 from simnandez/3.3

Fix: Translation
Merge pull request #666 from grandoc/3.3

fix language
Fix: Missing translation
Fix: Pagination at bottom not work correctly with filters applied
Merge pull request #677 from simnandez/3.3

Fix: Pagination at bottom not work correctly with filters applied
Fix : some & -> &amp;
WIP : Admin for Carriers (Activate/Desactivate)
Fix : It was a bad idea to add COL in the code name of new carriers
Merge remote-tracking branch 'upstream/develop' into develop
english standardization
english standardization
english standardization
Fix bug #730
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
english standardization
Fix: regression, the product discount overwrites the default customer
discount !
Fix: hide blocs with multi-page