[Dolibarr-git] [Dolibarr/dolibarr] ea296d: fix error translation

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ea296d8429892dc67a733ba4fa3ede238441d1be
      
https://github.com/Dolibarr/dolibarr/commit/ea296d8429892dc67a733ba4fa3ede238441d1be
  Author: Grand Philippe <address@hidden>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    M htdocs/langs/zh_CN/members.lang

  Log Message:
  -----------
  fix error translation


  Commit: 3fc8dffadf31e62b44355a0a24f938e44e21c6d1
      
https://github.com/Dolibarr/dolibarr/commit/3fc8dffadf31e62b44355a0a24f938e44e21c6d1
  Author: Grand Philippe <address@hidden>
  Date:   2013-03-23 (Sat, 23 Mar 2013)

  Changed paths:
    M htdocs/admin/pdf.php
    M htdocs/core/class/commonobject.class.php
    A htdocs/core/class/html.formcron.class.php
    A htdocs/core/lib/cron.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/core/modules/modCron.class.php
    M htdocs/cron/admin/cron.php
    A htdocs/cron/card.php
    M htdocs/cron/class/cronjob.class.php
    R htdocs/cron/functions_cron.lib.php
    R htdocs/cron/index.php
    A htdocs/cron/info.php
    A htdocs/cron/list.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_cronjob.sql
    M htdocs/install/mysql/tables/llx_societe.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/install/pgsql/functions/functions.sql
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/bills.lang
    M htdocs/langs/ca_ES/companies.lang
    M htdocs/langs/ca_ES/compta.lang
    A htdocs/langs/ca_ES/cron.lang
    M htdocs/langs/ca_ES/main.lang
    M htdocs/langs/ca_ES/sendings.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/bills.lang
    M htdocs/langs/es_ES/companies.lang
    M htdocs/langs/es_ES/compta.lang
    A htdocs/langs/es_ES/cron.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/sendings.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/cron.lang
    M htdocs/public/cron/cron_run_jobs.php
    A htdocs/theme/amarok/img/cron.png
    A htdocs/theme/amarok/img/object_cron.png
    M htdocs/theme/amarok/style.css.php
    A htdocs/theme/auguria/img/cron.png
    A htdocs/theme/auguria/img/object_cron.png
    A htdocs/theme/bureau2crea/img/cron.png
    A htdocs/theme/bureau2crea/img/object_cron.png
    A htdocs/theme/cameleo/img/cron.png
    A htdocs/theme/cameleo/img/object_cron.png
    A htdocs/theme/eldy/img/menus/cron.png
    A htdocs/theme/eldy/img/menus/object_cron.png
    A scripts/cron/cron_run_jobs.php

  Log Message:
  -----------
  Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop


  Commit: 7f61061805e963ef30f072cb6ecc7ee59e785c2f
      
https://github.com/Dolibarr/dolibarr/commit/7f61061805e963ef30f072cb6ecc7ee59e785c2f
  Author: Grand Philippe <address@hidden>
  Date:   2013-03-23 (Sat, 23 Mar 2013)

  Changed paths:
    M htdocs/compta/bank/rappro.php

  Log Message:
  -----------
  fix : wrong URL


  Commit: 2c718b740e7fb867743b408c6e472394e933b2eb
      
https://github.com/Dolibarr/dolibarr/commit/2c718b740e7fb867743b408c6e472394e933b2eb
  Author: Grand Philippe <address@hidden>
  Date:   2013-03-23 (Sat, 23 Mar 2013)

  Changed paths:
    M ChangeLog
    M htdocs/admin/company.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contrat/fiche.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/install/mysql/data/llx_c_revenuestamp.sql
    M htdocs/install/mysql/data/llx_c_tva.sql
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_c_tva.sql
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/societe/class/societe.class.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop


  Commit: d54b0d139d0f9f35701fb7ed7a6c54159333500b
      
https://github.com/Dolibarr/dolibarr/commit/d54b0d139d0f9f35701fb7ed7a6c54159333500b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-23 (Sat, 23 Mar 2013)

  Changed paths:
    M htdocs/compta/bank/rappro.php
    M htdocs/langs/zh_CN/members.lang

  Log Message:
  -----------
  Merge pull request #771 from grandoc/develop

fix error translation


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c3589e978569...d54b0d139d0f