Laurent Destailleur 71b61fc1f5 Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: htdocs/core/class/html.formfile.class.php htdocs/langs/fr_FR/mails.lang htdocs/user/logout.php		2013-06-18 09:51:37 +02:00
..
admin.lang	- New: [ task #926 ] Add extrafield feature on order lines	2013-06-10 16:05:41 +02:00
agenda.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
banks.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
bills.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
bookmarks.lang	merge	2013-06-06 18:31:33 +02:00
boxes.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
cashdesk.lang	Fix: Miscellaneous fixes into cachdesk module:	2013-06-07 15:59:47 +02:00
categories.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
commercial.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
companies.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
compta.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
contracts.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
cron.lang	Start to debug/fix module IPP	2013-06-12 11:35:30 +02:00
deliveries.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
dict.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
donations.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
ecm.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
errors.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
exports.lang	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-18 09:51:37 +02:00
externalsite.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
ftp.lang	merge	2013-06-06 18:31:33 +02:00
help.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
holiday.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
install.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
interventions.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
languages.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
ldap.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
mailmanspip.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
mails.lang	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-18 09:51:37 +02:00
main.lang	Trans: Add missing entries	2013-06-11 10:06:22 +02:00
margins.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
members.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
opensurvey.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
orders.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
oscommerce.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
other.lang	merge	2013-06-06 18:31:33 +02:00
paybox.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
paypal.lang	merge	2013-06-06 18:31:33 +02:00
printipp.lang	Start to debug/fix module IPP	2013-06-12 11:35:30 +02:00
products.lang	New: Clone product/service composition	2013-06-10 00:11:25 +02:00
projects.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
propal.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
sendings.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
shop.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
sms.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
stocks.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
suppliers.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
trips.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
users.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
withdrawals.lang	Make comment generic for all files	2013-05-27 10:38:50 +02:00
workflow.lang	Sync with transifex: After this commit, all langs files use same order	2013-05-27 23:53:06 +02:00