[Dolibarr-git] [Dolibarr/dolibarr] 600598: Work on transifex

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 600598e59196beb8810dd1c28a0012220cd67424
      
https://github.com/Dolibarr/dolibarr/commit/600598e59196beb8810dd1c28a0012220cd67424
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-26 (Sun, 26 May 2013)

  Changed paths:
    M .tx/config

  Log Message:
  -----------
  Work on transifex


  Commit: a3f1169cd447e90100c4c6fc2ced3b3e58ada793
      
https://github.com/Dolibarr/dolibarr/commit/a3f1169cd447e90100c4c6fc2ced3b3e58ada793
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-26 (Sun, 26 May 2013)

  Changed paths:
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_CN/boxes.lang
    M htdocs/langs/zh_CN/products.lang
    M htdocs/langs/zh_CN/propal.lang

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/dacd5e98cf87...a3f1169cd447