[Dolibarr-git] [Dolibarr/dolibarr] c1dae5: Fix: Bad translation (to pick to 3.4)

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c1dae58055b136945ccce13febfcfaaba3c8895a
      
https://github.com/Dolibarr/dolibarr/commit/c1dae58055b136945ccce13febfcfaaba3c8895a
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M htdocs/core/menus/standard/auguria_menu.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/fr_FR/main.lang

  Log Message:
  -----------
  Fix: Bad translation (to pick to 3.4)


  Commit: 9da5f7f47a5a1de803b676459c2e6b658e33551e
      
https://github.com/Dolibarr/dolibarr/commit/9da5f7f47a5a1de803b676459c2e6b658e33551e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M htdocs/adherents/canvas/actions_adherentcard_common.class.php
    M htdocs/core/boxes/box_ficheinter.php
    M htdocs/core/class/dolprintipp.class.php
    M htdocs/core/class/html.formcron.class.php
    M htdocs/core/lib/cron.lib.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/json.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/modCron.class.php
    M htdocs/core/modules/modHoliday.class.php
    M htdocs/core/modules/modMargin.class.php
    M htdocs/core/modules/modOpenSurvey.class.php
    M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
    M htdocs/core/modules/project/task/mod_task_simple.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/cron/card.php
    M htdocs/cron/info.php
    M htdocs/cron/list.php
    M htdocs/ecm/ajax/ecmdatabase.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/opensurvey/adminstuds_preview.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/opensurvey/fonctions.php
    M htdocs/printipp/admin/printipp.php
    M htdocs/product/stock/lib/replenishment.lib.php
    M htdocs/public/cron/cron_run_jobs.php
    M htdocs/theme/eldy/style.css.php
    M scripts/cron/cron_run_jobs.php

  Log Message:
  -----------
  Qual: Doxygen


  Commit: 75bd05d212f9ca71528e1bcdc1d1bcd446758471
      
https://github.com/Dolibarr/dolibarr/commit/75bd05d212f9ca71528e1bcdc1d1bcd446758471
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/core/tpl/objectline_add.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/exports/class/export.class.php
    M htdocs/fourn/ajax/getSupplierPrices.php
    M htdocs/fourn/fiche.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fd759ade76e9...75bd05d212f9