Laurent Destailleur 0dc82cddf1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ...

develop

Conflicts:
	htdocs/langs/es_ES/accountancy.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/es_ES/categories.lang
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/compta.lang
	htdocs/langs/es_ES/donations.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/holiday.lang
	htdocs/langs/es_ES/interventions.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/es_ES/sendings.lang
	htdocs/langs/es_ES/suppliers.lang

2014-10-11 14:42:45 +02:00

..

accountancy.lang

Sync transifex

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

admin.lang

Sync transifex

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

agenda.lang

Sync transifex

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

banks.lang

Sync transifex

2014-05-10 15:33:34 +02:00

bills.lang

Trad: Syncro from transifex

2014-09-11 19:42:46 +02:00

bookmarks.lang

Removed not used key

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

boxes.lang

Trad: es_ES Sync from transifex

2014-02-07 18:12:30 +01:00

cashdesk.lang

Translation: Sync from transifex.com

2014-03-17 16:15:00 +01:00

categories.lang

Sync transifex

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

commercial.lang

Trad: Syncro from transifex

2014-09-11 19:42:46 +02:00

companies.lang

Sync transifex

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

compta.lang

Sync transifex

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

contracts.lang

Trad: Update es_ES from transifex

2014-05-30 16:48:41 +02:00

cron.lang

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

2014-10-11 14:42:45 +02:00

deliveries.lang

Update es_ES from transifex

2014-03-22 09:41:14 +01:00

dict.lang

Trad: Syncro es_ES from transifex

2014-09-19 09:04:45 +02:00

donations.lang

Sync transifex

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

ecm.lang

Trans: Add usbek language

2013-11-11 22:25:32 +01:00

errors.lang

Sync transifex

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

exports.lang

Trad: Syncro from transifex

2014-09-11 19:42:46 +02:00

externalsite.lang

Removed not used key

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

ftp.lang

Removed not used key

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

help.lang

Fix: Missing some languages into the transifex sync script.

2013-12-31 12:03:37 +01:00

holiday.lang

Sync transifex

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

install.lang

Trad: Update es_ES from transifex

2014-05-10 17:33:23 +02:00

interventions.lang

Sync transifex

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

languages.lang

Transifex sync for 3.6

2014-07-18 20:16:46 +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

Removed not used key

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

mails.lang

Trad: Update es_ES from transifex

2014-05-30 16:48:41 +02:00

main.lang

Trad: Syncro es_ES from transifex

2014-09-19 09:04:45 +02:00

margins.lang

Sync from transifex.

2014-04-07 09:23:50 +02:00

members.lang

Trad: Update es_ES from transifex

2014-05-01 09:22:31 +02:00

opensurvey.lang

Update es_ES from transifex

2014-03-22 09:41:14 +01:00

orders.lang

Sync from transifex

2014-05-18 12:25:20 +02:00

oscommerce.lang

Removed not used key

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

other.lang

Trad: Syncro from transifex

2014-09-11 19:42:46 +02:00

paybox.lang

Removed not used key

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

paypal.lang

Trad: Update es_ES from transifex

2014-05-01 09:22:31 +02:00

printipp.lang

Removed not used key

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

products.lang

Trad: Syncro from transifex

2014-09-11 19:42:46 +02:00

projects.lang

Sync transifex

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

propal.lang

Trad: Update es_ES from transifex

2014-03-15 16:36:25 +01:00

salaries.lang

Trad: Syncro es_ES from transifex

2014-09-19 09:04:45 +02:00

sendings.lang

Sync transifex

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

shop.lang

Transifex sync for 3.6

2014-07-18 20:16:46 +02:00

sms.lang

Removed not used key

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

stocks.lang

Transifex sync for 3.6

2014-07-18 20:16:46 +02:00

suppliers.lang

Sync transifex

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

trips.lang

Trad: Syncro from transifex

2014-09-11 19:42:46 +02:00

users.lang

Trad: Syncro es_ES from transifex

2014-09-19 09:04:45 +02:00

withdrawals.lang

Sync from transifex.

2014-03-31 19:01:28 +02:00

workflow.lang

Trad: Update es_ES from transifex

2014-03-15 16:36:25 +01:00