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

…

banks.lang

Trad: Best ca_ES and es_ES translations

2013-01-16 18:19:48 +01:00

bills.lang

Trad: Add es_ES and ca_ES missing translations

2013-03-22 17:31:43 +01:00

bookmarks.lang

Fix bug into script that fix CRLF into LF

2013-06-12 11:59:55 +02:00

boxes.lang

Fix: Spelling es_ES boxes lang

2013-04-17 17:06:19 +02:00

cashdesk.lang

Trad: Update cashdesk ca_ES and es_ES to spanish rule RD1619/2012

2012-12-28 11:41:53 +01:00

categories.lang

Fix: Trad categories more accurate

2013-05-28 15:20:14 +02:00

commercial.lang

RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50

2012-12-01 15:45:05 +01: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

Trad: Add es_ES and ca_ES missing translations

2013-03-22 17:31:43 +01: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

…

dict.lang

…

donations.lang

…

ecm.lang

…

errors.lang

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

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

exports.lang

…

externalsite.lang

…

ftp.lang

Fix bug into script that fix CRLF into LF

2013-06-12 11:59:55 +02:00

help.lang

…

holiday.lang

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

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

install.lang

fix : trad error

2013-03-24 07:11:44 +01:00

interventions.lang

[ task #731 ] Uniformize ref generation. Interventions

2013-03-10 13:58:32 +01:00

languages.lang

RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50

2012-12-01 15:45:05 +01:00

ldap.lang

…

mailmanspip.lang

…

mails.lang

Trad: Update ca_ES and es_ES translations

2013-04-12 10:46:33 +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

Removed conflict with margins module name and description (already set in admin.lang)

2013-05-12 12:19:26 +02:00

members.lang

Trad: Update ca_ES and es_ES translations

2013-04-12 10:46:33 +02:00

opensurvey.lang

Add missing lang files

2013-05-27 12:02:31 +02:00

orders.lang

Trad: Fix: A better fix for status/list of orders.

2013-03-16 22:32:03 +01:00

oscommerce.lang

…

other.lang

New: TODO il faut incrementer le stock si on supprime une expedition

2013-06-20 18:37:23 +02:00

paybox.lang

Fix bug into script that fix CRLF into LF

2013-06-12 11:59:55 +02:00

paypal.lang

…

products.lang

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

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

projects.lang

RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50

2012-12-01 15:45:05 +01:00

propal.lang

[ task #731 ] Uniformize ref generation. Propals

2013-03-02 15:57:26 +01:00

sendings.lang

Trad: Add es_ES and ca_ES missing translations

2013-03-22 17:31:43 +01:00

shop.lang

…

sms.lang

…

stocks.lang

…

suppliers.lang

Trad: Update ca_ES and es_ES translations

2013-04-12 10:46:33 +02:00

trips.lang

…

users.lang

Trad: Add missing translations

2013-03-10 12:31:56 +01:00

withdrawals.lang

RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50

2012-12-01 15:45:05 +01:00

workflow.lang

…