[Dolibarr-git] [Dolibarr/dolibarr] 2483f0: Fix: Trans

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2483f044c5f41db749a96abcd8b8bf2da929fb87
      
https://github.com/Dolibarr/dolibarr/commit/2483f044c5f41db749a96abcd8b8bf2da929fb87
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M htdocs/product/liste.php

  Log Message:
  -----------
  Fix: Trans


  Commit: 706b0d562f31cdeb16a265bff3528d37ce165023
      
https://github.com/Dolibarr/dolibarr/commit/706b0d562f31cdeb16a265bff3528d37ce165023
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M htdocs/adherents/admin/adherent.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/exports/export.php
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/agenda.lang
    M htdocs/langs/tr_TR/banks.lang
    M htdocs/langs/tr_TR/bills.lang
    M htdocs/langs/tr_TR/bookmarks.lang
    M htdocs/langs/tr_TR/boxes.lang
    M htdocs/langs/tr_TR/cashdesk.lang
    M htdocs/langs/tr_TR/categories.lang
    M htdocs/langs/tr_TR/commercial.lang
    M htdocs/langs/tr_TR/companies.lang
    M htdocs/langs/tr_TR/compta.lang
    M htdocs/langs/tr_TR/contracts.lang
    A htdocs/langs/tr_TR/cron.lang
    M htdocs/langs/tr_TR/deliveries.lang
    M htdocs/langs/tr_TR/dict.lang
    M htdocs/langs/tr_TR/donations.lang
    M htdocs/langs/tr_TR/ecm.lang
    M htdocs/langs/tr_TR/errors.lang
    M htdocs/langs/tr_TR/exports.lang
    M htdocs/langs/tr_TR/externalsite.lang
    M htdocs/langs/tr_TR/ftp.lang
    M htdocs/langs/tr_TR/help.lang
    M htdocs/langs/tr_TR/holiday.lang
    M htdocs/langs/tr_TR/install.lang
    M htdocs/langs/tr_TR/interventions.lang
    M htdocs/langs/tr_TR/languages.lang
    M htdocs/langs/tr_TR/ldap.lang
    M htdocs/langs/tr_TR/mailmanspip.lang
    M htdocs/langs/tr_TR/mails.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/langs/tr_TR/margins.lang
    M htdocs/langs/tr_TR/members.lang
    A htdocs/langs/tr_TR/opensurvey.lang
    M htdocs/langs/tr_TR/orders.lang
    M htdocs/langs/tr_TR/oscommerce.lang
    M htdocs/langs/tr_TR/other.lang
    M htdocs/langs/tr_TR/paybox.lang
    M htdocs/langs/tr_TR/paypal.lang
    M htdocs/langs/tr_TR/products.lang
    M htdocs/langs/tr_TR/projects.lang
    M htdocs/langs/tr_TR/propal.lang
    M htdocs/langs/tr_TR/sendings.lang
    M htdocs/langs/tr_TR/shop.lang
    M htdocs/langs/tr_TR/sms.lang
    M htdocs/langs/tr_TR/stocks.lang
    M htdocs/langs/tr_TR/suppliers.lang
    M htdocs/langs/tr_TR/trips.lang
    M htdocs/langs/tr_TR/users.lang
    M htdocs/langs/tr_TR/withdrawals.lang
    M htdocs/langs/tr_TR/workflow.lang
    M htdocs/main.inc.php
    M htdocs/product/admin/product_tools.php
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/element.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php

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


  Commit: 8410ad1933d785927eab9c5640c285adb55e8b92
      
https://github.com/Dolibarr/dolibarr/commit/8410ad1933d785927eab9c5640c285adb55e8b92
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Fix: CSS


  Commit: 91068a4476f14ed0e04909cae07e68c62e563edf
      
https://github.com/Dolibarr/dolibarr/commit/91068a4476f14ed0e04909cae07e68c62e563edf
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix: Pb into form output

Conflicts:
        htdocs/core/class/html.formfile.class.php


  Commit: 8b73b2b4f3db50378712ff11f245a161e7b72465
      
https://github.com/Dolibarr/dolibarr/commit/8b73b2b4f3db50378712ff11f245a161e7b72465
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M htdocs/user/logout.php

  Log Message:
  -----------
  Fix: Solve some problem of redirect when logout

Conflicts:
        htdocs/user/logout.php


  Commit: 562fa43d9dc6901d3463fe8ced32b95ea76b9a26
      
https://github.com/Dolibarr/dolibarr/commit/562fa43d9dc6901d3463fe8ced32b95ea76b9a26
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/fr_FR/mails.lang

  Log Message:
  -----------
  Fix: Message is not clear enough.
Fix: Var was not initialized.


  Commit: e8e710fd0c82e7b9d96cb8126f1bed8a4518eb26
      
https://github.com/Dolibarr/dolibarr/commit/e8e710fd0c82e7b9d96cb8126f1bed8a4518eb26
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M htdocs/langs/en_US/exports.lang
    M htdocs/langs/fr_FR/exports.lang

  Log Message:
  -----------
  Fix: Translation


  Commit: 71b61fc1f573eb9b2009ba31d2e3cc2efecdf530
      
https://github.com/Dolibarr/dolibarr/commit/71b61fc1f573eb9b2009ba31d2e3cc2efecdf530
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/langs/en_US/exports.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/fr_FR/exports.lang
    M htdocs/langs/fr_FR/mails.lang
    M htdocs/product/liste.php
    M htdocs/user/logout.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into develop

Conflicts:
        htdocs/core/class/html.formfile.class.php
        htdocs/langs/fr_FR/mails.lang
        htdocs/user/logout.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f0c8c1805f63...71b61fc1f573