[Dolibarr-git] [Dolibarr/dolibarr] ac57e5: Fix translation

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ac57e527ce5e26a62abaa57ee634e27af6153ea2
      
https://github.com/Dolibarr/dolibarr/commit/ac57e527ce5e26a62abaa57ee634e27af6153ea2
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-12 (Mon, 12 Aug 2019)

  Changed paths:
    M htdocs/website/index.php

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


  Commit: f4e58aab228aa0cf179cb23ca64d578bbe625f2e
      
https://github.com/Dolibarr/dolibarr/commit/f4e58aab228aa0cf179cb23ca64d578bbe625f2e
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-13 (Tue, 13 Aug 2019)

  Changed paths:
    M htdocs/admin/website.php

  Log Message:
  -----------
  FIX Enable web site


  Commit: 77c96a49e1a3754c79c32c3242fc15daf8d36dd6
      
https://github.com/Dolibarr/dolibarr/commit/77c96a49e1a3754c79c32c3242fc15daf8d36dd6
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-13 (Tue, 13 Aug 2019)

  Changed paths:
    M htdocs/install/doctemplates/websites/website_template-corporate.zip

  Log Message:
  -----------
  Update website template


  Commit: 8e0a0232701fafab8ccd3866ac3b4b9f643cb3e9
      
https://github.com/Dolibarr/dolibarr/commit/8e0a0232701fafab8ccd3866ac3b4b9f643cb3e9
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-13 (Tue, 13 Aug 2019)

  Changed paths:
    M htdocs/core/website.inc.php
    M htdocs/langs/en_US/website.lang

  Log Message:
  -----------
  FIX Disabling a website does not put it offline


  Commit: 52d34edb03a052a405612d315d31818a953b68ae
      
https://github.com/Dolibarr/dolibarr/commit/52d34edb03a052a405612d315d31818a953b68ae
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-13 (Tue, 13 Aug 2019)

  Changed paths:
    M htdocs/website/index.php

  Log Message:
  -----------
  FIX USEDOLIBARREDITOR not always set


  Commit: 99473097a911227964667fb514067b86dfee3476
      
https://github.com/Dolibarr/dolibarr/commit/99473097a911227964667fb514067b86dfee3476
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-13 (Tue, 13 Aug 2019)

  Changed paths:
    M htdocs/core/lib/website.lib.php
    M htdocs/core/website.inc.php
    M htdocs/website/index.php

  Log Message:
  -----------
  FIX Add log and type of content in dolWebsiteOutput and
dolWebsiteReplacementOfLinks

Conflicts:
        htdocs/website/index.php


  Commit: b443b1b37284812af0d7fb16ec5d3fb7ae659542
      
https://github.com/Dolibarr/dolibarr/commit/b443b1b37284812af0d7fb16ec5d3fb7ae659542
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-13 (Tue, 13 Aug 2019)

  Changed paths:
    M htdocs/fichinter/class/api_interventions.class.php

  Log Message:
  -----------
  FIX permission check on API intervention


  Commit: e1ab5089d7b8f27f7e28d4aa1937c897539fbcca
      
https://github.com/Dolibarr/dolibarr/commit/e1ab5089d7b8f27f7e28d4aa1937c897539fbcca
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-14 (Wed, 14 Aug 2019)

  Changed paths:
    M htdocs/core/lib/website.lib.php

  Log Message:
  -----------
  FIX Missing some replacements in website module

Conflicts:
        htdocs/website/index.php


  Commit: 6de2118f11b8843a3aba20ed987ddf6be3c9a59b
      
https://github.com/Dolibarr/dolibarr/commit/6de2118f11b8843a3aba20ed987ddf6be3c9a59b
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-14 (Wed, 14 Aug 2019)

  Changed paths:
    M htdocs/core/lib/files.lib.php
    M htdocs/website/class/website.class.php
    M htdocs/website/index.php

  Log Message:
  -----------
  FIX Bad error management in zip compress and web site export

Conflicts:
        htdocs/website/index.php


  Commit: 4a20c996569f9e145e706dff77b89a8fcf5818cf
      
https://github.com/Dolibarr/dolibarr/commit/4a20c996569f9e145e706dff77b89a8fcf5818cf
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-14 (Wed, 14 Aug 2019)

  Changed paths:
    M htdocs/website/index.php

  Log Message:
  -----------
  FIX Content send before header warning


  Commit: fbf6cbe091be3ff4fe1fb688e5b5ee8525afaed2
      
https://github.com/Dolibarr/dolibarr/commit/fbf6cbe091be3ff4fe1fb688e5b5ee8525afaed2
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-14 (Wed, 14 Aug 2019)

  Changed paths:
    M htdocs/core/lib/files.lib.php
    M htdocs/master.inc.php

  Log Message:
  -----------
  FIX Option to use ZipArchive instead of PclZip bugged with large files.


  Commit: 12bebdefbb7eb09f2fd7f632120d62cd6d1f8150
      
https://github.com/Dolibarr/dolibarr/commit/12bebdefbb7eb09f2fd7f632120d62cd6d1f8150
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-14 (Wed, 14 Aug 2019)

  Changed paths:
    M htdocs/core/lib/files.lib.php

  Log Message:
  -----------
  Fix can replace PclZip with ZipArchive


  Commit: bb4618e2cf792130e7bd24bcda6b0b17f4cc0673
      
https://github.com/Dolibarr/dolibarr/commit/bb4618e2cf792130e7bd24bcda6b0b17f4cc0673
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-14 (Wed, 14 Aug 2019)

  Changed paths:
    M htdocs/fichinter/class/api_interventions.class.php
    M htdocs/install/doctemplates/websites/website_template-corporate.zip
    M htdocs/website/index.php

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

Conflicts:
        htdocs/core/lib/website.lib.php
        htdocs/website/index.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f1c6f1b375ca...bb4618e2cf79