[Dolibarr-git] [Dolibarr/dolibarr] 72f0ca: Fix: Solve conflict of translation

[Laurent Destailleur]

  Branch: refs/heads/3.3
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 72f0ca194cdf087c884088dbfdd958cade1932da
      
https://github.com/Dolibarr/dolibarr/commit/72f0ca194cdf087c884088dbfdd958cade1932da
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nl_BE/admin.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_TW/admin.lang

  Log Message:
  -----------
  Fix: Solve conflict of translation


  Commit: 43d4bb6155d877b8d25ee6ca53a6c4f99c6955e4
      
https://github.com/Dolibarr/dolibarr/commit/43d4bb6155d877b8d25ee6ca53a6c4f99c6955e4
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M htdocs/admin/commande.php
    M htdocs/admin/propal.php
    M htdocs/admin/syslog.php
    M htdocs/core/modules/mailings/contacts2.modules.php
    M htdocs/install/mysql/migration/3.2.0-3.3.0.sql

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c4d0c4c3e50e...43d4bb6155d8