Laurent Destailleur 314d45a9ee Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/it_IT/admin.lang
	htdocs/langs/nb_NO/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/pt_BR/admin.lang
	htdocs/langs/pt_PT/admin.lang
	htdocs/langs/sl_SI/admin.lang
	htdocs/langs/zh_TW/admin.lang

2013-06-28 00:52:09 +02:00

..

admin.lang

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

2013-06-28 00:52:09 +02:00

agenda.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

banks.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

bills.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

bookmarks.lang

merge

2013-06-06 18:31:33 +02:00

boxes.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

cashdesk.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

categories.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

commercial.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

companies.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

compta.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

contracts.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

cron.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

deliveries.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

dict.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

donations.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

ecm.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

errors.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

exports.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

externalsite.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

ftp.lang

merge

2013-06-06 18:31:33 +02:00

help.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

holiday.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

install.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

interventions.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

languages.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

ldap.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

mailmanspip.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

mails.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

main.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

margins.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

members.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

opensurvey.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

orders.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

oscommerce.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

other.lang

merge

2013-06-06 18:31:33 +02:00

paybox.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

paypal.lang

merge

2013-06-06 18:31:33 +02:00

products.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

projects.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

propal.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

sendings.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

shop.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

sms.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

stocks.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

suppliers.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

trips.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

users.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

withdrawals.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00

workflow.lang

Sync with transifex: After this commit, all langs files use same order

2013-05-27 23:53:06 +02:00