Commit Graph

13 Commits

Author SHA1 Message Date
Raphaël Doursenaud
e07e86b824 Deduplicated lines of the reference language files
Used the new deduplicatefilelinesrecursively.sh script
2014-03-27 12:04:03 +01:00
Laurent Destailleur
63bb09fbdf Fix: Removed duplicate translation 2014-03-20 00:21:52 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
Christophe Battarel
89a5638908 Fix bad translation on margin config 2013-11-17 12:59:33 +01:00
Laurent Destailleur
086eb125bf Qual: Removed no more required translation entry UTF8 2013-10-23 10:34:48 +02:00
Laurent Destailleur
d8cef10ea3 Make comment generic for all files 2013-05-27 10:38:50 +02:00
Marcos García
a37392e34e Removed conflict with margins module name and description (already set in admin.lang) 2013-05-12 12:19:26 +02:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
simnandez
d8651ca830 Trad: Add missing margins translations 2012-12-01 15:47:28 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
commits !
2012-12-01 15:45:05 +01:00
simnandez
dda12c3d70 Trad: Add missing margins translations 2012-11-30 17:58:12 +01:00
Christophe Battarel
951b98a963 add option to select contact type associated to commercial agents for margin and commission modules 2012-09-18 09:44:34 +02:00
Christophe Battarel
37b166024d add en_US language files for commissions and margins modules 2012-09-11 15:20:00 +02:00