Laurent Destailleur e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php

2013-04-14 01:46:33 +02:00

..

admin.lang

Merge remote-tracking branch 'origin/3.3' into develop

2013-04-14 01:46:33 +02:00

agenda.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

banks.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

bills.lang

Missing dict translation because of translated key

2012-08-17 23:43:08 +02:00

bookmarks.lang

Moved bookmark translations from other.lang to bookmarks.lang, also

2012-07-22 16:44:16 +02:00

boxes.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

categories.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

commercial.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

companies.lang

Qual: Enhance mailmanspip module.

2012-06-10 21:49:19 +02:00

compta.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

contracts.lang

Removed BOM from UTF-8 files

2012-07-28 19:04:50 +02:00

deliveries.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

dict.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

donations.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

ecm.lang

Renamed ECMNoDirecotyYet to ECMNoDirectoryYet

2012-08-15 16:06:53 +02:00

errors.lang

New: Support synchro of field job/title.

2012-10-24 21:19:10 +02:00

exports.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

ftp.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

help.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

install.lang

fix : trad error

2013-03-24 07:11:44 +01:00

interventions.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

languages.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

ldap.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

mails.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

main.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

members.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

orders.lang

Fix: trad

2012-03-14 09:21:05 +01:00

oscommerce.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

other.lang

fix : trad error

2013-03-24 07:11:44 +01:00

paybox.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

paypal.lang

Trans: Update language files

2012-03-22 23:52:02 +01:00

products.lang

Update trans

2012-01-06 15:07:33 +01:00

projects.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

propal.lang

Fix: trad

2012-03-14 09:21:05 +01:00

sendings.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

shop.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

stocks.lang

New: Can choose warehouse for stock change on supplier approbation or

2011-11-09 22:10:58 +01:00

suppliers.lang

Fix: Removed duplictae key

2012-11-25 21:00:51 +01:00

trips.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

users.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00

withdrawals.lang

Fix: chmod 644

2011-11-03 18:03:52 +01:00