Commit Graph

6 Commits

Author SHA1 Message Date
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
2013-07-24 15:25:00 +02:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
Laurent Destailleur
6a97a45111 Qual: Rename translation key 2012-11-20 11:27:50 +01:00
Laurent Destailleur
e4a5a67b47 Update languages files 2012-02-29 17:51:21 +01:00
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