[Dolibarr-git] [Dolibarr/dolibarr] d21991: Transifex sync

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d219916f0a33cbcb2fecc0b54fb3d84d2f5d1b17
      
https://github.com/Dolibarr/dolibarr/commit/d219916f0a33cbcb2fecc0b54fb3d84d2f5d1b17
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-30 (Fri, 30 May 2014)

  Changed paths:
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ar_SA/contracts.lang
    M htdocs/langs/ar_SA/exports.lang
    M htdocs/langs/ar_SA/holiday.lang
    M htdocs/langs/ar_SA/mails.lang
    M htdocs/langs/ar_SA/main.lang
    M htdocs/langs/ar_SA/products.lang
    M htdocs/langs/ar_SA/stocks.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/bg_BG/contracts.lang
    M htdocs/langs/bg_BG/exports.lang
    M htdocs/langs/bg_BG/holiday.lang
    M htdocs/langs/bg_BG/mails.lang
    M htdocs/langs/bg_BG/main.lang
    M htdocs/langs/bg_BG/products.lang
    M htdocs/langs/bg_BG/stocks.lang
    M htdocs/langs/bs_BA/admin.lang
    M htdocs/langs/bs_BA/contracts.lang
    M htdocs/langs/bs_BA/exports.lang
    M htdocs/langs/bs_BA/holiday.lang
    M htdocs/langs/bs_BA/mails.lang
    M htdocs/langs/bs_BA/main.lang
    M htdocs/langs/bs_BA/products.lang
    M htdocs/langs/bs_BA/stocks.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/contracts.lang
    M htdocs/langs/ca_ES/exports.lang
    M htdocs/langs/ca_ES/holiday.lang
    M htdocs/langs/ca_ES/mails.lang
    M htdocs/langs/ca_ES/main.lang
    M htdocs/langs/ca_ES/products.lang
    M htdocs/langs/ca_ES/stocks.lang
    M htdocs/langs/cs_CZ/admin.lang
    M htdocs/langs/cs_CZ/contracts.lang
    M htdocs/langs/cs_CZ/exports.lang
    M htdocs/langs/cs_CZ/holiday.lang
    M htdocs/langs/cs_CZ/mails.lang
    M htdocs/langs/cs_CZ/main.lang
    M htdocs/langs/cs_CZ/products.lang
    M htdocs/langs/cs_CZ/stocks.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/da_DK/contracts.lang
    M htdocs/langs/da_DK/exports.lang
    M htdocs/langs/da_DK/holiday.lang
    M htdocs/langs/da_DK/mails.lang
    M htdocs/langs/da_DK/main.lang
    M htdocs/langs/da_DK/products.lang
    M htdocs/langs/da_DK/stocks.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/contracts.lang
    M htdocs/langs/de_DE/exports.lang
    M htdocs/langs/de_DE/holiday.lang
    M htdocs/langs/de_DE/mails.lang
    M htdocs/langs/de_DE/main.lang
    M htdocs/langs/de_DE/products.lang
    M htdocs/langs/de_DE/stocks.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/bills.lang
    M htdocs/langs/el_GR/contracts.lang
    M htdocs/langs/el_GR/exports.lang
    M htdocs/langs/el_GR/holiday.lang
    M htdocs/langs/el_GR/interventions.lang
    M htdocs/langs/el_GR/mails.lang
    M htdocs/langs/el_GR/main.lang
    M htdocs/langs/el_GR/products.lang
    M htdocs/langs/el_GR/sms.lang
    M htdocs/langs/el_GR/stocks.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/contracts.lang
    M htdocs/langs/es_ES/exports.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/es_ES/mails.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/es_ES/stocks.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/et_EE/contracts.lang
    M htdocs/langs/et_EE/exports.lang
    M htdocs/langs/et_EE/holiday.lang
    M htdocs/langs/et_EE/mails.lang
    M htdocs/langs/et_EE/main.lang
    M htdocs/langs/et_EE/products.lang
    M htdocs/langs/et_EE/stocks.lang
    M htdocs/langs/eu_ES/admin.lang
    M htdocs/langs/eu_ES/contracts.lang
    M htdocs/langs/eu_ES/exports.lang
    M htdocs/langs/eu_ES/holiday.lang
    M htdocs/langs/eu_ES/mails.lang
    M htdocs/langs/eu_ES/main.lang
    M htdocs/langs/eu_ES/products.lang
    M htdocs/langs/eu_ES/stocks.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fa_IR/agenda.lang
    M htdocs/langs/fa_IR/banks.lang
    M htdocs/langs/fa_IR/bills.lang
    M htdocs/langs/fa_IR/boxes.lang
    M htdocs/langs/fa_IR/cashdesk.lang
    M htdocs/langs/fa_IR/categories.lang
    M htdocs/langs/fa_IR/commercial.lang
    M htdocs/langs/fa_IR/companies.lang
    M htdocs/langs/fa_IR/compta.lang
    M htdocs/langs/fa_IR/contracts.lang
    M htdocs/langs/fa_IR/cron.lang
    M htdocs/langs/fa_IR/deliveries.lang
    M htdocs/langs/fa_IR/dict.lang
    M htdocs/langs/fa_IR/donations.lang
    M htdocs/langs/fa_IR/ecm.lang
    M htdocs/langs/fa_IR/errors.lang
    M htdocs/langs/fa_IR/exports.lang
    M htdocs/langs/fa_IR/externalsite.lang
    M htdocs/langs/fa_IR/ftp.lang
    M htdocs/langs/fa_IR/help.lang
    M htdocs/langs/fa_IR/holiday.lang
    M htdocs/langs/fa_IR/install.lang
    M htdocs/langs/fa_IR/interventions.lang
    M htdocs/langs/fa_IR/languages.lang
    M htdocs/langs/fa_IR/mailmanspip.lang
    M htdocs/langs/fa_IR/mails.lang
    M htdocs/langs/fa_IR/main.lang
    M htdocs/langs/fa_IR/margins.lang
    M htdocs/langs/fa_IR/members.lang
    M htdocs/langs/fa_IR/opensurvey.lang
    M htdocs/langs/fa_IR/orders.lang
    M htdocs/langs/fa_IR/other.lang
    M htdocs/langs/fa_IR/paybox.lang
    M htdocs/langs/fa_IR/paypal.lang
    M htdocs/langs/fa_IR/products.lang
    M htdocs/langs/fa_IR/projects.lang
    M htdocs/langs/fa_IR/propal.lang
    M htdocs/langs/fa_IR/salaries.lang
    M htdocs/langs/fa_IR/sendings.lang
    M htdocs/langs/fa_IR/sms.lang
    M htdocs/langs/fa_IR/stocks.lang
    M htdocs/langs/fa_IR/suppliers.lang
    M htdocs/langs/fa_IR/trips.lang
    M htdocs/langs/fa_IR/users.lang
    M htdocs/langs/fa_IR/withdrawals.lang
    M htdocs/langs/fa_IR/workflow.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fi_FI/contracts.lang
    M htdocs/langs/fi_FI/exports.lang
    M htdocs/langs/fi_FI/holiday.lang
    M htdocs/langs/fi_FI/mails.lang
    M htdocs/langs/fi_FI/main.lang
    M htdocs/langs/fi_FI/products.lang
    M htdocs/langs/fi_FI/stocks.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/contracts.lang
    M htdocs/langs/fr_FR/exports.lang
    M htdocs/langs/fr_FR/holiday.lang
    M htdocs/langs/fr_FR/mails.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/langs/fr_FR/stocks.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/he_IL/contracts.lang
    M htdocs/langs/he_IL/exports.lang
    M htdocs/langs/he_IL/holiday.lang
    M htdocs/langs/he_IL/mails.lang
    M htdocs/langs/he_IL/main.lang
    M htdocs/langs/he_IL/products.lang
    M htdocs/langs/he_IL/stocks.lang
    M htdocs/langs/hr_HR/admin.lang
    M htdocs/langs/hr_HR/contracts.lang
    M htdocs/langs/hr_HR/exports.lang

  Log Message:
  -----------
  Transifex sync


  Commit: 354ceddb874a01d7907a6d487aa3486bde10ac85
      
https://github.com/Dolibarr/dolibarr/commit/354ceddb874a01d7907a6d487aa3486bde10ac85
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-30 (Fri, 30 May 2014)

  Changed paths:
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/contracts.lang
    M htdocs/langs/es_ES/exports.lang
    M htdocs/langs/es_ES/mails.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/es_ES/stocks.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/contracts.lang
    M htdocs/langs/pt_BR/exports.lang
    M htdocs/langs/pt_BR/holiday.lang
    M htdocs/langs/pt_BR/mails.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_BR/stocks.lang

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

Conflicts:
        htdocs/langs/es_ES/admin.lang
        htdocs/langs/es_ES/contracts.lang
        htdocs/langs/es_ES/exports.lang
        htdocs/langs/es_ES/mails.lang
        htdocs/langs/es_ES/main.lang
        htdocs/langs/es_ES/products.lang
        htdocs/langs/es_ES/stocks.lang


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8e3f36e9cc8a...354ceddb874a