Laurent Destailleur 4f4ebfaed3 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/printipp/admin/printipp.php

2015-05-04 12:09:39 +02:00

..

accountancy.lang

…

admin.lang

Sync transifex

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

agenda.lang

Sync from transifex

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

banks.lang

Sync transifex

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

bills.lang

Sync from transifex

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

bookmarks.lang

…

boxes.lang

Sync transifex

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

cashdesk.lang

…

categories.lang

Sync from transifex

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

commercial.lang

…

companies.lang

…

compta.lang

…

contracts.lang

…

cron.lang

Sync from transifex

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

deliveries.lang

…

dict.lang

…

donations.lang

Sync from transifex

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

ecm.lang

…

errors.lang

Sync transifex

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

exports.lang

…

externalsite.lang

…

ftp.lang

…

help.lang

…

holiday.lang

…

incoterm.lang

…

install.lang

…

interventions.lang

Sync transifex

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

languages.lang

…

ldap.lang

…

link.lang

…

mailmanspip.lang

…

mails.lang

Sync from transifex

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

main.lang

Sync transifex

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

margins.lang

…

members.lang

…

opensurvey.lang

…

orders.lang

Sync transifex

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

other.lang

Sync translation

2015-05-03 15:37:15 +02:00

paybox.lang

…

paypal.lang

…

printing.lang

…

printipp.lang

…

productbatch.lang

Sync transifex

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

products.lang

Sync from transifex

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

projects.lang

Sync transifex

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

propal.lang

…

resource.lang

…

salaries.lang

…

sendings.lang

Sync from transifex

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

sms.lang

…

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

…

withdrawals.lang

…

workflow.lang

…