[Dolibarr-git] [Dolibarr/dolibarr] cb4e56: FIX Merge manually PR #5161 - Bad translation key

[Laurent Destailleur]

  Branch: refs/heads/3.9
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: cb4e569a5fd0cd87104cc27a8eb2d46ddc7c61c6
      
https://github.com/Dolibarr/dolibarr/commit/cb4e569a5fd0cd87104cc27a8eb2d46ddc7c61c6
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-08 (Sun, 08 May 2016)

  Changed paths:
    M htdocs/comm/action/card.php

  Log Message:
  -----------
  FIX Merge manually PR #5161 - Bad translation key


  Commit: 7262dd5934a3f85c9de907c73d1a4070e5c112f4
      
https://github.com/Dolibarr/dolibarr/commit/7262dd5934a3f85c9de907c73d1a4070e5c112f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-08 (Sun, 08 May 2016)

  Changed paths:
    M htdocs/accountancy/admin/index.php
    M htdocs/admin/modules.php
    M htdocs/langs/en_US/products.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/card.php

  Log Message:
  -----------
  Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d39bd75c57d2...7262dd5934a3