Commit Graph

3 Commits

Author SHA1 Message Date
eldy
6207b9262b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	dev/translation/langAutoParser.class.php
	htdocs/langs/tr_TR/agenda.lang
	htdocs/langs/tr_TR/boxes.lang
	htdocs/langs/tr_TR/install.lang
	htdocs/langs/tr_TR/other.lang
2011-10-10 15:10:14 +02:00
eldy
f419df68a9 Trans: Maxi fix of translations 2011-10-10 13:11:05 +02:00
Laurent Destailleur
8ba659f24c Fix: Use correct translation code 2011-03-29 09:50:12 +00:00