Commit Graph

28 Commits

Author SHA1 Message Date
Laurent Destailleur
66e941d0c1 Fix: Some translation were lost 2013-10-25 11:22:56 +02:00
Laurent Destailleur
94716c5314 Removed not used key 2013-10-23 14:05:26 +02:00
Laurent Destailleur
3378855694 New: Can cancel holidays that were previously validated 2013-09-24 18:06:07 +02:00
Laurent Destailleur
012228aca7 Another try to sync with transifex 2013-07-31 16:35:57 +02:00
Cédric Salvador
8cf90c38a7 fixed fr translation 2013-07-23 16:29:46 +02:00
Laurent Destailleur
570275cd76 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/opensurvey/public/index.php
2013-06-21 15:37:17 +02:00
Florian Henry
835b8e9d7e Fix trad holidays 2013-06-19 11:23:43 +02:00
Marcos García
9f537cedd1 Replaced "Jours" with DurationDays translation key 2013-05-06 17:48:20 +02:00
Marcos García
b830c1dd8c Removed "event" word from event description and changed ActionTypeCP to Description 2013-05-06 17:04:04 +02:00
Marcos García
d7a7f316d3 Replaced "Jours" with DurationDays translation key 2013-05-06 16:51:08 +02:00
simnandez
15ede98fe7 New: [ task #877 ] Reorganize menus. Init works
Add migration script 3.4 to 3.5
2013-05-04 01:22:09 +02:00
Marcos García
da9cbc6e58 Corrected translation key 2013-04-29 18:02:18 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
2013-04-28 01:24:58 +02:00
simnandez
d982148b7b Fix: [ bug #855 ] Holiday approval email in French 2013-04-27 17:20:02 +02:00
Marcos García
bd2b363e40 Modified traslation keys to reflect expected translation 2013-04-27 14:50:14 +02:00
Laurent Destailleur
89ad634230 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang
2013-04-22 01:39:49 +02:00
Marcos García
40a9ab9772 Added missing translations 2013-04-20 00:08:09 +02:00
Marcos García
0ac7696bc0 Improved holidays module translations
Conflicts:
	htdocs/holiday/fiche.php
	htdocs/langs/fr_FR/holiday.lang
2013-04-15 09:29:26 +02:00
Marcos García
6d896a8558 Improved holidays module translations 2013-04-15 00:53:06 +02:00
frederic34
8c0fbe62f5 fix language holiday 2013-02-19 16:30:51 +01:00
Laurent Destailleur
da7b5e352f Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	
New: Add function dol_set_focus('#xxx')
2013-02-18 15:01:00 +01:00
Laurent Destailleur
b5260e4ab1 Fix: Translation 2013-02-18 14:13:02 +01:00
Laurent Destailleur
d6e907b69b Fix: Nb of holidays was not using correct user 2013-02-17 19:26:33 +01:00
Laurent Destailleur
2bad9c0d9a Fix: Nb of holidays was not using correct user 2013-02-17 19:25:55 +01:00
Laurent Destailleur
4cc44292e7 Fix: Maxi debug of holiday module 2012-12-18 13:12:11 +01:00
Laurent Destailleur
6d8ea8dcd5 Update trans 2012-10-03 13:04:18 +02:00
Laurent Destailleur
7d83fdce5b Fix: Several fixes into date functions
Qual: Add PHPUnit tests
2012-09-24 21:37:19 +02:00
Laurent Destailleur
246f3b5bb8 New: Add the holiday module (provided by teclib with permission to add
it by default).
2012-09-05 03:26:57 +02:00