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
af4651f1a2
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/perl/virtualmin/dolibarr.pl
htdocs/core/lib/files.lib.php
htdocs/langs/en_US/projects.lang
htdocs/langs/fr_FR/projects.lang
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/webservices/server_other.php
2013-06-25 23:22:00 +02:00
Laurent Destailleur
8359a34545
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/class/facture-rec.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
2013-06-25 21:31:24 +02:00
simnandez
ba6b5d27a5
New: TODO il faut incrementer le stock si on supprime une expedition
...
validee
2013-06-20 18:37:23 +02:00
Marcos García
76d9ba6a43
Fixed es_ES translation typo
2013-06-19 10:24:24 +02:00
Marcos García
13bcb5daaa
Merge branch 'develop' into clone-composition
...
Conflicts:
ChangeLog
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2013-06-12 16:39:23 +02:00
Laurent Destailleur
a50cd7b698
Fix bug into script that fix CRLF into LF
2013-06-12 11:59:55 +02:00
Marcos García
e727100cf0
New: Clone product/service composition
2013-06-10 00:11:25 +02:00
Laurent Destailleur
51d11ff190
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture/stats/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.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/includes/tcpdf/tcpdf.php
htdocs/langs/el_GR/other.lang
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/en_US/main.lang
htdocs/langs/es_ES/products.lang
htdocs/main.inc.php
test/phpunit/NumberingModulesTest.php
2013-06-09 16:49:47 +02:00
Marcos García
17efbd41c7
Improved es_ES translation
2013-06-08 20:18:09 +02:00
Marcos García
000de9530d
Fixed wrong translation key and and improved es_ES translations
2013-06-08 20:15:48 +02:00
simnandez
0219242484
Fix: Trad categories more accurate
2013-05-28 15:20:14 +02:00
simnandez
485c7bc477
Fix: Trad categories more accurate
2013-05-28 15:19:24 +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
simnandez
1470b75e5c
Trad: Fix Catalan words into Spanish
2013-05-20 18:44:41 +02:00
simnandez
3f1dabb4e2
Trad: Fix Catalan words into Spanish
2013-05-20 18:43:21 +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
Laurent Destailleur
ee890a87a3
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/prelevement/ligne.php
htdocs/langs/en_US/admin.lang
2013-05-14 01:15:05 +02:00
Laurent Destailleur
dc28335ed5
Merge pull request #948 from marcosgdf/translations
...
Improved translations
2013-05-13 16:07:22 -07:00
simnandez
0c853b3ebd
Fix: Some bugs on withdrawal rejects
2013-05-13 17:35:30 +02:00
simnandez
5fe70e0bee
Fix: Some bugs on withdrawal rejects
2013-05-13 17:15:23 +02:00
simnandez
050ca946e9
Fix: Debug of withdrawals rejects
2013-05-13 16:30:52 +02:00
Marcos García
a37392e34e
Removed conflict with margins module name and description (already set in admin.lang)
2013-05-12 12:19:26 +02:00
Laurent Destailleur
6c4e47514d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/holiday/fiche.php
2013-05-11 15:26:24 +02:00
simnandez
7358faeb96
New: [ task #812 ] Add more Scripts. expire contract services ordered by
...
date end
2013-05-09 09:41:32 +02:00
simnandez
1af8057158
Trad: Spanish predefined mail content still more friendly
2013-05-08 18:50:30 +02:00
Marcos García
e86a742383
Added missing translations
2013-05-08 17:56:32 +02:00
Juanjo Menent
278d2c6cb1
Merge pull request #935 from marcosgdf/translations-develop
...
Corrected translations of info tooltips in document models description
2013-05-08 08:54:44 -07:00
simnandez
a91dc0e32a
Trad: Spanish predefined mail content more friendly
2013-05-08 17:52:08 +02:00
Marcos García
e18eb3a6b3
Added missing translations
2013-05-08 17:20:20 +02:00
Marcos García
edfcfb9bbd
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop
...
Conflicts:
htdocs/admin/commande.php
htdocs/admin/expedition.php
htdocs/admin/facture.php
htdocs/admin/fichinter.php
htdocs/admin/livraison.php
htdocs/admin/supplier_invoice.php
htdocs/admin/supplier_order.php
htdocs/societe/admin/societe.php
2013-05-08 15:37:41 +02:00
simnandez
b9583d389e
Trad: Add products missing translations
2013-05-08 12:24:50 +02:00
Marcos García
54a2d3ca72
Corrected translations of info tooltips in document models description
2013-05-07 22:04:08 +02:00
simnandez
46c1b87b32
New: [ task #812 ] Add more Scripts. expire contract services to
...
representatives and customers
2013-05-07 17:43:54 +02:00
simnandez
ca9a2b281a
New: [ task #812 ] Add more Scripts. expire contract services to
...
representatives
2013-05-07 12:52:14 +02:00
Marcos García
f9093e00bb
Missing es_ES translations
2013-05-06 18:14:16 +02:00
Marcos García
9f537cedd1
Replaced "Jours" with DurationDays translation key
2013-05-06 17:48:20 +02:00
Marcos García
b830c1dd8c
Removed "event" word from event description and changed ActionTypeCP to Description
2013-05-06 17:04:04 +02:00
Marcos García
d7a7f316d3
Replaced "Jours" with DurationDays translation key
2013-05-06 16:51:08 +02:00
Marcos García
12971fa139
Corrected es_ES translations
2013-05-06 16:11:42 +02:00
Marcos García
a5009fd555
Corrected es_ES translations
2013-05-04 19:35:38 +02:00
simnandez
15ede98fe7
New: [ task #877 ] Reorganize menus. Init works
...
Add migration script 3.4 to 3.5
2013-05-04 01:22:09 +02:00
Laurent Destailleur
fc0d5abd14
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/fiche-stat.php
htdocs/contact/class/contact.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modSociete.class.php
htdocs/projet/fiche.php
test/phpunit/FilesLibTest.php
2013-05-03 00:15:02 +02:00
Marcos García
95f63a8171
Corrected some es_ES translations and fixed problems with translations not being translated
2013-05-01 20:43:08 +02:00
Marcos García
da9cbc6e58
Corrected translation key
2013-04-29 18:02:18 +02:00
simnandez
00adb1b9ab
Fix: [ bug #855 ] Holiday approval email in French
2013-04-29 12:46:07 +02:00
Laurent Destailleur
80e470a4ce
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture.php
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/syslog/mod_syslog_file.php
htdocs/fourn/facture/impayees.php
htdocs/holiday/class/holiday.class.php
htdocs/holiday/fiche.php
2013-04-28 01:24:58 +02:00
Laurent Destailleur
4c9a728799
Merge pull request #890 from marcosgdf/translations
...
Improved translations
2013-04-27 12:53:15 -07:00
