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
..
admin.lang	Moved GenbarcodeLocation from products.lang to admin.lang	2013-04-27 12:32:20 +02:00
agenda.lang
banks.lang
bills.lang	fix trad	2013-03-15 12:13:23 +01:00
bookmarks.lang
boxes.lang
cashdesk.lang
categories.lang
commercial.lang
companies.lang
compta.lang
contracts.lang
deliveries.lang
dict.lang
donations.lang
ecm.lang
errors.lang	fix : language error	2013-03-30 14:31:10 +01:00
exports.lang
externalsite.lang
ftp.lang
help.lang
holiday.lang	Modified traslation keys to reflect expected translation	2013-04-27 14:50:14 +02:00
install.lang	fix : trad error	2013-03-24 07:11:44 +01:00
interventions.lang
languages.lang
ldap.lang
mailmanspip.lang
mails.lang
main.lang	Qual: Work to prepare usage of jquery data plugins.	2013-04-18 19:37:50 +02:00
members.lang	Merge	2013-03-22 17:10:17 +01:00
orders.lang
oscommerce.lang
other.lang	fix : trad error	2013-03-24 07:11:44 +01:00
paybox.lang
paypal.lang
products.lang	Moved GenbarcodeLocation from products.lang to admin.lang	2013-04-27 12:32:20 +02:00
projects.lang
propal.lang
sendings.lang
shop.lang
sms.lang
stocks.lang
suppliers.lang	Fix: Removed duplictae key	2012-11-25 21:00:51 +01:00
trips.lang
users.lang
withdrawals.lang
workflow.lang