Laurent Destailleur f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into ...

GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang

2014-10-13 00:50:51 +02:00

..

accountancy.lang

Sync transifex

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

admin.lang

Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into

2014-10-13 00:50:51 +02:00

agenda.lang

Sync transifex

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

banks.lang

Transifex sync for 3.6

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

bills.lang

Sync transifex

2014-09-08 11:58:45 +02:00

bookmarks.lang

Removed not used key

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

boxes.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

cashdesk.lang

Transifex sync

2014-05-30 16:47:24 +02:00

categories.lang

Sync transifex

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

commercial.lang

Sync from transifex

2014-08-08 14:38:20 +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

Sync from transifex

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

cron.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

deliveries.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

dict.lang

Transifex sync

2014-05-30 16:47:24 +02:00

domains.lang

Removed not used key

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

donations.lang

Sync transifex

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

ecm.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

errors.lang

Sync transifex

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

exports.lang

Sync transifex

2014-09-08 11:58:45 +02:00

externalsite.lang

Transifex sync

2014-05-30 16:47:24 +02:00

ftp.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

help.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

holiday.lang

Sync transifex

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

install.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

interventions.lang

Sync transifex

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

languages.lang

Sync from transifex

2014-08-08 14:38:20 +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

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

mails.lang

Sync from transifex

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

main.lang

Sync from transifex

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

margins.lang

Transifex sync

2014-05-30 16:47:24 +02:00

members.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

opensurvey.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

orders.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

oscommerce.lang

Removed not used key

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

other.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

paybox.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

paypal.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

products.lang

Sync transifex

2014-09-08 11:58:45 +02:00

projects.lang

Sync transifex

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

propal.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

salaries.lang

Transifex sync

2014-05-30 16:47:24 +02:00

sendings.lang

Sync transifex

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

sms.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

stocks.lang

Sync from transifex

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

suppliers.lang

Sync transifex

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

trips.lang

Sync transifex

2014-09-08 11:58:45 +02:00

users.lang

Sync from transifex

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

withdrawals.lang

Fix: restore fa_IR integrity

2014-05-31 14:22:05 +02:00

workflow.lang

Transifex sync

2014-05-30 16:47:24 +02:00