[Dolibarr-git] [Dolibarr/dolibarr] 25eeff: first commit to fix issue #2584 - checks for dupli...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 25eeff4f199a0d63b003fbe7d1e1fd666c2fd3f0
      
https://github.com/Dolibarr/dolibarr/commit/25eeff4f199a0d63b003fbe7d1e1fd666c2fd3f0
  Author: Tommaso Basilici <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    A dev/translation/sanity_check_en_langfiles.php

  Log Message:
  -----------
  first commit to fix issue #2584 - checks for duplicate lang strings across 
all en_US lang files


  Commit: 82a269f2336f054a2ff7f9cf5f30082bc7d64e1f
      
https://github.com/Dolibarr/dolibarr/commit/82a269f2336f054a2ff7f9cf5f30082bc7d64e1f
  Author: Tommaso Basilici <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M dev/translation/sanity_check_en_langfiles.php

  Log Message:
  -----------
  issue #2584 - also finds duplicates on same file


  Commit: 9a3b5305fee543131764c7d3cd6a6df2015625e5
      
https://github.com/Dolibarr/dolibarr/commit/9a3b5305fee543131764c7d3cd6a6df2015625e5
  Author: faust <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/printing.lang
    M htdocs/langs/en_US/trips.lang

  Log Message:
  -----------
  fix duplicate lines


  Commit: fb57cced55d5d25926bc01d0afd9a3bc9221507f
      
https://github.com/Dolibarr/dolibarr/commit/fb57cced55d5d25926bc01d0afd9a3bc9221507f
  Author: faust <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/cron.lang

  Log Message:
  -----------
  en_US: fix typos and errors


  Commit: b7fb3d7d9e45fce2a598955cb82ab1489f705da0
      
https://github.com/Dolibarr/dolibarr/commit/b7fb3d7d9e45fce2a598955cb82ab1489f705da0
  Author: faust <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/askpricesupplier.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/workflow.lang

  Log Message:
  -----------
  en_US: 'opened' is not an adjective...


  Commit: 4bb83de1461eab20cb66704f23a1147934c7afa6
      
https://github.com/Dolibarr/dolibarr/commit/4bb83de1461eab20cb66704f23a1147934c7afa6
  Author: faust <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/stocks.lang

  Log Message:
  -----------
  en_US: fix lang


  Commit: fcbb4a5328a325a9f2a63dbcf1eb2ce1c739a857
      
https://github.com/Dolibarr/dolibarr/commit/fcbb4a5328a325a9f2a63dbcf1eb2ce1c739a857
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    A dev/translation/sanity_check_en_langfiles.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/askpricesupplier.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/printing.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/trips.lang
    M htdocs/langs/en_US/workflow.lang

  Log Message:
  -----------
  Merge branch 'langtool' of https://github.com/Diciannove/dolibarr into 
Diciannove-langtool

Conflicts:
        htdocs/langs/en_US/main.lang
        htdocs/langs/en_US/orders.lang
        htdocs/langs/en_US/stocks.lang


  Commit: 8140e331785685fe3abe4d3dd031f8b56cc4dbad
      
https://github.com/Dolibarr/dolibarr/commit/8140e331785685fe3abe4d3dd031f8b56cc4dbad
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    A dev/translation/sanity_check_en_langfiles.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/askpricesupplier.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/printing.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/trips.lang
    M htdocs/langs/en_US/workflow.lang

  Log Message:
  -----------
  git push origin developMerge branch 'Diciannove-langtool' into develop


  Commit: b3fc8d2940735b6248cc7c943b55ebad29c43c44
      
https://github.com/Dolibarr/dolibarr/commit/b3fc8d2940735b6248cc7c943b55ebad29c43c44
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M .editorconfig
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/card.php
    M htdocs/admin/dict.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/facture.php
    M htdocs/compta/stats/index.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/memory.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/tpl/resource_view.tpl.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    A htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/livraison/card.php
    M htdocs/opensurvey/card.php
    M htdocs/product/admin/product.php
    A htdocs/product/class/propalmergepdfproduct.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/document.php
    M htdocs/product/stock/valo.php
    M htdocs/projet/note.php
    M htdocs/resource/element_resource.php
    M htdocs/societe/canvas/company/tpl/card_view.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
    M htdocs/societe/consumption.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
    M htdocs/webservices/demo_wsclient_category.php-NORUN
    M htdocs/webservices/demo_wsclient_invoice.php-NORUN
    M htdocs/webservices/demo_wsclient_other.php-NORUN
    M htdocs/webservices/demo_wsclient_productorservice.php-NORUN
    M htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
    M scripts/contracts/email_expire_services_to_representatives.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php

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

Conflicts:
        htdocs/langs/en_US/products.lang


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f7b2b00ebd27...b3fc8d294073