[Dolibarr-git] [Dolibarr/dolibarr] a6c1cf: Fix: bad translation

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a6c1cfca7e972f2e87e6e41ad9892b4246fecfa0
      
https://github.com/Dolibarr/dolibarr/commit/a6c1cfca7e972f2e87e6e41ad9892b4246fecfa0
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

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

  Log Message:
  -----------
  Fix: bad translation


  Commit: d167fb4fcd4a47aa6fe7994e474ec42b566aa270
      
https://github.com/Dolibarr/dolibarr/commit/d167fb4fcd4a47aa6fe7994e474ec42b566aa270
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M htdocs/comm/action/index.php
    A htdocs/comm/action/peruser.php

  Log Message:
  -----------
  Wok on page to show events per users.


  Commit: 32b015e661fcb50e85847bf277f978053f6e64d8
      
https://github.com/Dolibarr/dolibarr/commit/32b015e661fcb50e85847bf277f978053f6e64d8
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php
    M htdocs/core/class/ctypent.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/install/mysql/data/llx_c_typent.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_c_typent.sql

  Log Message:
  -----------
  New: Type of thirdparties can accept a country (to show list of types
specific for a country).


  Commit: 4dfaf9ce38c386409fb57cffbaccc8b4fefb472b
      
https://github.com/Dolibarr/dolibarr/commit/4dfaf9ce38c386409fb57cffbaccc8b4fefb472b
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/deplacement/class/deplacement.class.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/fiche.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/fiche.php
    M htdocs/install/check.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_commande_fournisseur.sql
    M htdocs/install/mysql/tables/llx_facture_fourn.sql
    M htdocs/langs/es_ES/agenda.lang
    M htdocs/langs/es_ES/languages.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/shop.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/product.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5e75dd27e8cf...4dfaf9ce38c3