[Dolibarr-git] [Dolibarr/dolibarr] 8a1994: Trad: Commissions and margins

[simnandez]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8a19946e4ab55d9f6cfc6f1f4b66b03ab23130b1
      
https://github.com/Dolibarr/dolibarr/commit/8a19946e4ab55d9f6cfc6f1f4b66b03ab23130b1
  Author: simnandez <address@hidden>
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
    M htdocs/langs/ca_ES/admin.lang
    A htdocs/langs/ca_ES/commissions.lang
    A htdocs/langs/ca_ES/margins.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/admin.lang
    A htdocs/langs/es_ES/commissions.lang
    A htdocs/langs/es_ES/margins.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/commissions.lang
    M htdocs/langs/fr_FR/margins.lang

  Log Message:
  -----------
  Trad: Commissions and margins

Conflicts:
        htdocs/langs/fr_FR/margins.lang