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
Laurent Destailleur
b3bdc76da3
Trans: More complete examples
2013-06-26 00:05:00 +02:00
Laurent Destailleur
5d1dfdc7c1
Upgrade tcpdf to 6.0
2013-06-08 16:29:59 +02:00
Cédric Salvador
b747b0349d
merge
2013-06-06 18:31:33 +02:00
Laurent Destailleur
4c3dcec7b8
Sync with transifex: After this commit, all langs files use same order
...
of keys than source file (en_US).
Note: Please continue to prefer commiting your change into language
files into git. For the moment transifex does not support conflict
management, diff, versionning, ...
2013-05-27 23:53:06 +02:00
Laurent Destailleur
dee7ac2823
Add missing lang files
2013-05-27 12:02:31 +02:00
Marcos García
0a5bb491d3
Corrected translation key BuyingPrice from lang files
2013-05-19 12:24:19 +02:00
Marcos García
08b234ed01
Corrected translation key BuyingPrice from lang files
2013-05-19 12:08:18 +02:00
Marcos García
5784cb120a
Moved GenbarcodeLocation from products.lang to admin.lang
2013-04-27 12:32:20 +02:00
Laurent Destailleur
a880a8c51e
Qual: Work to prepare usage of jquery data plugins.
2013-04-18 19:37:50 +02:00
Laurent Destailleur
72f0ca194c
Fix: Solve conflict of translation
2013-04-10 19:28:54 +02:00
Laurent Destailleur
6702386b8b
Some fix into chineese language files
2013-03-29 14:54:07 +01:00
Grand Philippe
c5e742278e
fix : trad error
2013-03-24 07:11:44 +01:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Laurent Destailleur
33a7692fbc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/exports/class/export.class.php
2013-03-16 17:07:35 +01:00
Grand Philippe
36e99e100b
fix trad
2013-03-15 12:13:23 +01:00
Laurent Destailleur
277784af25
New: Start to work on a cron module
2013-03-13 19:55:21 +01:00
Laurent Destailleur
6c8b00b82f
Fix: Removed duplictae key
2012-11-25 21:00:51 +01:00
Laurent Destailleur
e76ef823b8
New: Add a tab into members statistics to count members by nature.
2012-11-21 23:01:36 +01:00
Laurent Destailleur
6a97a45111
Qual: Rename translation key
2012-11-20 11:27:50 +01:00
Wind Chen
b083c3b692
Added new language zh_TW
...
1.Added zh_TW directory into /htdoc/langs/
2.Added Language_zh_TW= Traditional Chinese into
/htdoc/langs/en_US/languages.lang
2012-11-01 23:08:24 +08:00
