Laurent Destailleur 01aad8516d Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php

2015-05-31 03:30:38 +02:00

..

accountancy.lang

Sync language files

2015-05-31 03:07:17 +02:00

admin.lang

Sync language files

2015-05-31 03:07:17 +02:00

agenda.lang

Sync language files

2015-05-31 03:07:17 +02:00

banks.lang

Sync transifex

2015-04-22 14:58:06 +02:00

bills.lang

Sync language files

2015-05-31 03:07:17 +02:00

bookmarks.lang

Removed not used key

2013-10-23 14:05:26 +02:00

boxes.lang

Sync transifex

2015-04-22 14:58:06 +02:00

cashdesk.lang

Sync from transifex

2014-08-08 14:38:20 +02:00

categories.lang

Sync language files

2015-05-31 03:07:17 +02:00

commercial.lang

Sync transifex

2015-04-22 14:58:06 +02:00

companies.lang

Sync transifex

2014-10-11 14:33:22 +02:00

compta.lang

Sync from transifex

2015-02-13 21:26:43 +01:00

contracts.lang

Sync transifex

2015-04-22 14:58:06 +02:00

cron.lang

Sync transifex

2015-04-22 14:58:06 +02:00

deliveries.lang

Sync from transifex

2014-08-08 14:38:20 +02:00

dict.lang

Sync transifex

2015-04-22 14:58:06 +02:00

donations.lang

Sync language files

2015-05-31 03:07:17 +02:00

ecm.lang

Sync transifex

2015-04-22 14:58:06 +02:00

errors.lang

Sync language files

2015-05-31 03:07:17 +02:00

exports.lang

Sync from transifex

2014-12-15 10:31:40 +01:00

externalsite.lang

Sync from transifex

2014-11-30 16:20:58 +01:00

ftp.lang

Removed not used key

2013-10-23 14:05:26 +02:00

google.lang

Removed not used key

2013-10-23 14:05:26 +02:00

help.lang

Sync with transifex

2014-01-26 23:12:25 +01:00

holiday.lang

Sync from transifex

2014-11-30 16:20:58 +01:00

incoterm.lang

Sync transifex

2015-03-18 15:27:27 +01:00

install.lang

Sync transifex

2015-04-22 14:58:06 +02:00

interventions.lang

Sync transifex

2015-04-22 14:58:06 +02:00

languages.lang

Sync transifex

2015-04-22 14:58:06 +02:00

ldap.lang

Removed not used key

2013-10-23 14:05:26 +02:00

link.lang

Sync from transifex

2014-08-08 14:38:20 +02:00

mailmanspip.lang

Sync from transifex

2013-11-27 14:59:02 +01:00

mails.lang

Sync transifex

2015-04-22 14:58:06 +02:00

main.lang

Sync transifex

2015-04-22 14:58:06 +02:00

margins.lang

Sync transifex

2015-04-22 14:58:06 +02:00

members.lang

Sync transifex

2015-04-22 14:58:06 +02:00

opensurvey.lang

Sync from transifex

2014-08-08 14:38:20 +02:00

orders.lang

Sync language files

2015-05-31 03:07:17 +02:00

other.lang

Sync language files

2015-05-31 03:07:17 +02:00

paybox.lang

Sync from transifex

2014-11-30 16:20:58 +01:00

paypal.lang

Sync from transifex

2014-08-08 14:38:20 +02:00

printing.lang

Sync transifex

2015-03-18 15:27:27 +01:00

printipp.lang

Sync transifex

2015-04-22 14:58:06 +02:00

productbatch.lang

Sync transifex

2015-04-22 14:58:06 +02:00

products.lang

Sync transifex

2015-04-22 14:58:06 +02:00

projects.lang

Sync transifex

2015-04-22 14:58:06 +02:00

propal.lang

Sync from transifex

2013-11-27 14:59:02 +01:00

resource.lang

Sync transifex

2015-04-22 14:58:06 +02:00

salaries.lang

Sync transifex

2015-03-13 22:02:53 +01:00

sendings.lang

Sync from transifex

2015-04-02 13:28:20 +02:00

sms.lang

Removed not used key

2013-10-23 14:05:26 +02:00

stocks.lang

Sync transifex

2015-04-22 14:58:06 +02:00

suppliers.lang

Sync transifex

2015-04-22 14:58:06 +02:00

trips.lang

Sync transifex

2015-04-22 14:58:06 +02:00

users.lang

Sync transifex

2015-04-22 14:58:06 +02:00

withdrawals.lang

Sync from transifex

2015-02-13 21:26:43 +01:00

workflow.lang

Sync transifex

2015-04-22 14:58:06 +02:00