[Dolibarr-git] [Dolibarr/dolibarr] 94eeaf: Fix typo error

[Laurent Destailleur]

  Branch: refs/heads/5.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 94eeaf9ed05cb70bb79897363283626bc5549569
      
https://github.com/Dolibarr/dolibarr/commit/94eeaf9ed05cb70bb79897363283626bc5549569
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M htdocs/langs/en_US/errors.lang

  Log Message:
  -----------
  Fix typo error


  Commit: f7e5898b4ad79393ffe300b91b42fb580050ee3f
      
https://github.com/Dolibarr/dolibarr/commit/f7e5898b4ad79393ffe300b91b42fb580050ee3f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M htdocs/langs/en_US/mails.lang

  Log Message:
  -----------
  Fix show a more accurate translation


  Commit: 9cc2a7422154fba8bfc152bba5d5d7613c31f25a
      
https://github.com/Dolibarr/dolibarr/commit/9cc2a7422154fba8bfc152bba5d5d7613c31f25a
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-23 (Fri, 23 Dec 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update changelog


  Commit: cdcbf58ca860bc2eaffa18e600891c60eb59aafb
      
https://github.com/Dolibarr/dolibarr/commit/cdcbf58ca860bc2eaffa18e600891c60eb59aafb
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-23 (Fri, 23 Dec 2016)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare 3.9.5


  Commit: 98599b0bbfde042e3ee25636e1ed391080995d6d
      
https://github.com/Dolibarr/dolibarr/commit/98599b0bbfde042e3ee25636e1ed391080995d6d
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-12-27 (Tue, 27 Dec 2016)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  FIX #6227 Document models table header "Unit" is shown in 2 lines in Spanish


  Commit: c953ae2a3d1146e1b63f32342ccbbf99d51c75f0
      
https://github.com/Dolibarr/dolibarr/commit/c953ae2a3d1146e1b63f32342ccbbf99d51c75f0
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-31 (Sat, 31 Dec 2016)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Merge pull request #6228 from marcosgdf/bug-6227

FIX #6227 Document models table header "Unit" is shown in 2 lines in Spanish


  Commit: ecab8d874bac78cc71eef09d67d4410162022c61
      
https://github.com/Dolibarr/dolibarr/commit/ecab8d874bac78cc71eef09d67d4410162022c61
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge changelog


  Commit: 157b17b6d58343d8dbef2e1f9a87505ed83ad92f
      
https://github.com/Dolibarr/dolibarr/commit/157b17b6d58343d8dbef2e1f9a87505ed83ad92f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/mails.lang

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

Conflicts:
        htdocs/filefunc.inc.php
        htdocs/langs/en_US/errors.lang


  Commit: c635baa8483acd563f771d86681ea5e08e450b3c
      
https://github.com/Dolibarr/dolibarr/commit/c635baa8483acd563f771d86681ea5e08e450b3c
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/mails.lang

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

Conflicts:
        htdocs/langs/en_US/errors.lang


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7dc55daf380c...c635baa8483a