[Dolibarr-git] [Dolibarr/dolibarr] c14d9c: Typo in es_ES translation

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c14d9ce13b2bf24884f164e3da26216d30a75631
      
https://github.com/Dolibarr/dolibarr/commit/c14d9ce13b2bf24884f164e3da26216d30a75631
  Author: Marcos García <address@hidden>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/products.lang

  Log Message:
  -----------
  Typo in es_ES translation


  Commit: f9dbc6d9be62eaa66eaec3ac6bd85761554836b8
      
https://github.com/Dolibarr/dolibarr/commit/f9dbc6d9be62eaa66eaec3ac6bd85761554836b8
  Author: Marcos García <address@hidden>
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
    M ChangeLog
    M dev/codesniffer/ruleset.xml
    M htdocs/adherents/admin/mailman.php
    M htdocs/adherents/liste.php
    M htdocs/admin/ihm.php
    M htdocs/admin/system/index.php
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/edit.php
    M htdocs/categories/fiche.php
    M htdocs/categories/index.php
    M htdocs/categories/photos.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/list.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/fiche.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/mailmanspip.lib.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/lib/treeview.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modDeplacement.class.php
    M htdocs/core/modules/modFicheinter.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modPropale.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/modStock.class.php
    M htdocs/core/modules/societe/modules_societe.class.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/liste.php
    M htdocs/install/mysql/data/llx_10_c_regions.sql
    M htdocs/install/mysql/data/llx_20_c_departements.sql
    M htdocs/langs/ar_SA/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/es_ES/companies.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/interventions.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/es_ES/products.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/ro_RO/install.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/product/fiche.php
    M htdocs/product/index.php
    M htdocs/product/traduction.php
    M htdocs/societe/soc.php
    M htdocs/user/param_ihm.php
    M htdocs/user/perms.php

  Log Message:
  -----------
  Merge branch 'develop' into typo-spanish-translation

Conflicts:
        htdocs/langs/es_ES/products.lang


  Commit: e7a994360e17ad34d44d83c2bef696974ab5c32e
      
https://github.com/Dolibarr/dolibarr/commit/e7a994360e17ad34d44d83c2bef696974ab5c32e
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/products.lang

  Log Message:
  -----------
  Merge pull request #266 from marcosgdf/typo-spanish-translation

Typo in es_ES translation


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1dd14d35f774...e7a994360e17