Laurent Destailleur
a084887442
Merge branch 'project-translations' of
...
https://github.com/marcosgdf/dolibarr into
marcosgdf-project-translations
Conflicts:
ChangeLog
2014-03-01 13:38:50 +01:00
Marcos García de La Fuente
968b5771db
Corrected project contact types translation
2014-02-25 02:42:10 +01:00
simnandez
c2db656c86
Fix: Action event SHIPPING_VALIDATE is not implemented
2014-02-19 17:33:22 +01:00
simnandez
7511f626b3
Fix: Action event SHIPPING_VALIDATE is not implemented
2014-02-19 17:32:20 +01:00
Laurent Destailleur
492dec0854
Sync from transifex
2014-02-11 23:19:22 +01:00
Laurent Destailleur
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
e22e4fc4d7
Sync from transifex
2014-02-05 23:10:44 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
9cf745b127
Sync with transifex
2014-01-26 23:12:25 +01:00
simnandez
714be2cd62
Trad: Add missing ca_ES and es_ES files
2014-01-23 17:05:51 +01:00
simnandez
21d6e22f03
Trad: Add missing ca_ES and es_ES files
2014-01-23 17:05:07 +01:00
simnandez
2866deb3c4
Thousand separator must be space into Spain
2014-01-23 12:18:57 +01:00
simnandez
35051f8c77
Thousand separator must be space into Spain
2014-01-23 12:18:15 +01:00
Marcos García de La Fuente
4f57e82975
Removed odd messages
2014-01-05 09:36:35 +01:00
Marcos García de La Fuente
fba3c63050
Starting to make survey creation a user-only access page
2014-01-05 07:28:04 +01:00
Marcos García de La Fuente
dd8d8e8e42
Removed unused translation strings
2014-01-05 04:59:15 +01:00
Laurent Destailleur
f44a45feb2
Fix: Missing some languages into the transifex sync script.
...
Trans: Sync language files from transifex.
2013-12-31 12:03:37 +01:00
Laurent Destailleur
0ed2f4b891
Trans: Add usbek language
2013-11-11 22:25:32 +01:00
Florian Henry
f512ef344a
Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE
...
use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used
2013-10-30 12:24:51 +01:00
Laurent Destailleur
19ae524ad9
Fix: Local for SeparatorDecimal and SeparatorThousand were lost during
...
transifex synchro.
2013-10-25 12:27:13 +02:00
Laurent Destailleur
94716c5314
Removed not used key
2013-10-23 14:05:26 +02:00
Laurent Destailleur
abe7946883
Synchro with transifex
2013-09-28 19:54:28 +02:00
Laurent Destailleur
7544c7e5a4
Synchro with transifex
2013-09-28 18:10:42 +02:00
simnandez
f7299f1a28
[ task #1063 ] Allow edit localtaxes rate for thirds
2013-09-17 18:06:06 +02:00
simnandez
6ae3603549
Trad: Add missing translations
2013-09-03 18:16:30 +02:00
simnandez
614f376392
Trad: Fix bad descriptor
2013-09-03 09:25:14 +02:00
simnandez
2a8aa50163
Fix: Intervention box links to contracts id
...
Conflicts:
htdocs/core/boxes/box_ficheinter.php
2013-08-29 12:12:02 +02:00
simnandez
a796337fc6
Trad: Add ca_ES and es_ES boxes translations
2013-08-26 12:41:35 +02:00
simnandez
a9772edeff
Trad: Add ca_ES and es_ES boxes translations
2013-08-26 12:31:41 +02:00
simnandez
8fa9e3251e
Trad: Update ca_ES and es_ES translations
2013-08-26 12:17:11 +02:00
simnandez
68b4278ec6
Add ca_ES and es_ES workflow translations
2013-08-26 12:03:17 +02:00
simnandez
f5947abc71
Trad: Add ca_ES and es_ES boxes translations
2013-08-26 11:49:22 +02:00
simnandez
ee107a64b4
Trad: Update ca_ES dict.lang
2013-08-09 15:33:31 +02:00
simnandez
23be083637
Trad: Update ca_ES exports.lang
2013-08-09 15:31:40 +02:00
simnandez
2ae3af7851
Trad: Update ca_ES other.lang
2013-08-09 15:29:30 +02:00
simnandez
1b1f44edbb
Trad: Update ca_ES commercial.lang
2013-08-09 15:27:48 +02:00
simnandez
b54fc29a07
Trad: Update ca_ES suppliers.lang
2013-08-09 15:25:55 +02:00
simnandez
f0445cd7a0
Trad: Update ca_ES languages.lang
2013-08-09 15:23:41 +02:00
simnandez
7eecf88c8c
Trad: Update ca_ES ftp.lang
2013-08-09 15:21:22 +02:00
simnandez
25e970757e
Trad: Update ca_ES paypal.lang
2013-08-09 15:18:06 +02:00
simnandez
911b4965a2
Trad: Update ca_ES donations.lang
2013-08-09 15:16:04 +02:00
simnandez
e2cc4a9545
Trad: Update ca_ES externalsite.lang
2013-08-09 15:12:44 +02:00
simnandez
a2005ed603
Trad: Update ca_ES mailmanspip.lang
2013-08-09 15:10:10 +02:00
simnandez
057df6df85
Trad: Update ca_ES and es_ES admin.lang
2013-08-09 11:50:12 +02:00
simnandez
868571061b
Trad: Update ca_ES and es_ES bills.lang
2013-08-09 11:44:12 +02:00
simnandez
728edd0ab3
Trad: Update ca_ES and es_ES companies.lang
2013-08-09 11:41:27 +02:00
simnandez
a79cb97235
Trad: Update ca_ES and es_ES main.lang
2013-08-09 11:37:39 +02:00
simnandez
e762f76d86
Trad: Update ca_ES and es_ES users.lang
2013-08-09 11:32:35 +02:00
simnandez
372ef135d5
Trad: Update ca_ES and es_ES commercial.lang
2013-08-09 11:28:24 +02:00
simnandez
f853039b2f
Trad: Update ca_ES and es_ES ecm.lang
2013-08-09 11:26:12 +02:00
simnandez
55436940e1
Trad: Update ca_ES and es_ES holiday.lang
2013-08-09 11:19:59 +02:00
simnandez
a7431c1165
Trad: Update ca_ES and es_ES banks.lang
2013-08-09 11:10:52 +02:00
simnandez
3aa9de7cfa
Trad: Update ca_ES and es_ES interventions.lang
2013-08-09 10:57:41 +02:00
simnandez
6b1484c2ea
Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count
2013-08-08 17:11:54 +02:00
Laurent Destailleur
fe3e59ed12
Fix: Use reserved word None when we don't want thousand separator.
2013-08-08 01:47:22 +02:00
simnandez
16eba64568
Trad: Add missing modules info
2013-08-05 17:05:59 +02:00
simnandez
a16b3b6e73
Trad: Add missing translation
2013-08-05 16:32:35 +02:00
simnandez
2e3db5e7e3
Trad: Add ca_ES and es_ES printipp.lang
2013-08-05 16:14:50 +02:00
simnandez
b9d9044208
Trad: Update ca_ES and es_ES cron.lang
2013-08-05 16:07:54 +02:00
simnandez
f6fe439766
Trad: Update ca_ES and es_ES boxes.lang
2013-08-05 15:59:08 +02:00
simnandez
5dd17bbe0a
Trad: Update ca_ES and es_ES projects.lang
2013-08-05 15:48:33 +02:00
simnandez
2867641ebb
Trad: Update ca_ES and es_ES mails.lang
2013-08-05 12:54:50 +02:00
simnandez
438badce02
Trad: Update ca_ES and es_ES products.lang
2013-08-05 12:50:36 +02:00
simnandez
10e0c528a5
Trad: Update ca_ES and es_ES propal.lang
2013-08-05 12:46:26 +02:00
simnandez
4c7798ff98
Trad: Update suppliers.lang
2013-08-05 12:40:55 +02:00
simnandez
25a7bb994d
Trad: Update ca_ES and es_ES compta.lang
2013-08-05 12:24:12 +02:00
simnandez
4ca8852eaf
Trad: Update ca_ES and es_ES sendings.lang
2013-08-05 12:10:42 +02:00
simnandez
06228569ef
Trad: Update ca_ES and es_ES orders.lang
2013-08-05 12:04:19 +02:00
simnandez
fd475f385f
Trad: Update ca_ES and es_ES stocks.lang
2013-08-05 11:55:33 +02:00
simnandez
def59df002
Trad: Update ca_ES and es_ES agenda.lang
2013-08-05 11:47:24 +02:00
simnandez
ef6a063cfb
Trad: Update ca_ES and es_ES categories.lang
2013-08-05 11:38:43 +02:00
simnandez
00943410cd
Trad: Update ca_ES and es_ES contracts.lang
2013-08-05 11:32:11 +02:00
simnandez
7a47e910ff
Trad: Update ca_ES and es_ES errors.lang
2013-08-05 11:26:48 +02:00
simnandez
86156746cf
Trad: Update ca_ES and es_ES bills.lang
2013-08-05 11:14:53 +02:00
simnandez
673b6f21a0
Trad: Update ca_ES and es_ES languages.lang
2013-08-05 10:32:56 +02:00
simnandez
9111226761
Trad: Update ca_ES and es_ES admin.lang
2013-08-05 10:00:34 +02:00
Laurent Destailleur
447d0063af
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/ca_ES/withdrawals.lang
htdocs/langs/es_ES/withdrawals.lang
htdocs/langs/fr_FR/withdrawals.lang
htdocs/langs/ja_JP/compta.lang
htdocs/langs/ja_JP/contracts.lang
htdocs/langs/sl_SI/withdrawals.lang
htdocs/langs/zh_CN/admin.lang
htdocs/langs/zh_CN/agenda.lang
htdocs/langs/zh_CN/bills.lang
htdocs/langs/zh_CN/boxes.lang
htdocs/langs/zh_CN/commercial.lang
htdocs/langs/zh_CN/companies.lang
htdocs/langs/zh_CN/compta.lang
htdocs/langs/zh_CN/contracts.lang
htdocs/langs/zh_CN/errors.lang
htdocs/langs/zh_CN/exports.lang
htdocs/langs/zh_CN/install.lang
htdocs/langs/zh_CN/interventions.lang
htdocs/langs/zh_CN/mails.lang
htdocs/langs/zh_CN/main.lang
htdocs/langs/zh_CN/members.lang
htdocs/langs/zh_CN/orders.lang
htdocs/langs/zh_CN/other.lang
htdocs/langs/zh_CN/products.lang
htdocs/langs/zh_CN/propal.lang
htdocs/langs/zh_CN/stocks.lang
htdocs/langs/zh_CN/suppliers.lang
htdocs/langs/zh_CN/users.lang
htdocs/langs/zh_TW/admin.lang
htdocs/langs/zh_TW/agenda.lang
htdocs/langs/zh_TW/banks.lang
htdocs/langs/zh_TW/boxes.lang
htdocs/langs/zh_TW/companies.lang
htdocs/langs/zh_TW/compta.lang
htdocs/langs/zh_TW/contracts.lang
htdocs/langs/zh_TW/errors.lang
htdocs/langs/zh_TW/exports.lang
htdocs/langs/zh_TW/install.lang
htdocs/langs/zh_TW/interventions.lang
htdocs/langs/zh_TW/mails.lang
htdocs/langs/zh_TW/members.lang
htdocs/langs/zh_TW/orders.lang
htdocs/langs/zh_TW/propal.lang
htdocs/langs/zh_TW/suppliers.lang
2013-08-03 16:24:52 +02:00
Laurent Destailleur
4ec86717be
Fix: Bad char %
2013-08-03 15:51:32 +02:00
simnandez
283d9eb064
Text for invoices numbering modules more clear. Update ChangeLog
2013-08-02 15:27:37 +02:00
simnandez
6d1a021382
New: [ task #1005 ] Update mercure module with replacement invoices.
2013-08-02 12:11:14 +02:00
Laurent Destailleur
012228aca7
Another try to sync with transifex
2013-07-31 16:35:57 +02:00
simnandez
7efacecb08
New: [ task #1005 ] Adapting to Spanish legislation bill numbering
2013-07-26 12:46:34 +02:00
Laurent Destailleur
bf9b255c92
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_opensuse.spec
2013-07-24 15:25:00 +02:00
simnandez
442ca8ea35
Trad: Fix ca_ES and es_ES missing translation
2013-07-11 11:51:13 +02:00
simnandez
11bf611618
Trad: Fix ca_ES and es_ES missing translation
2013-07-11 11:50:31 +02:00
Laurent Destailleur
7c163f7be3
Fix: Running fixdosfile onto all project
2013-07-07 13:17:48 +02:00
Laurent Destailleur
5385d87995
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/ca_ES/admin.lang
htdocs/langs/ca_ES/errors.lang
htdocs/langs/ca_ES/main.lang
htdocs/langs/ca_ES/opensurvey.lang
htdocs/langs/ca_ES/paybox.lang
htdocs/langs/ca_ES/products.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/errors.lang
htdocs/langs/es_ES/main.lang
htdocs/langs/es_ES/products.lang
2013-07-05 21:56:54 +02:00
simnandez
64a04ef150
Trad: Add missing trans before 3.4 final release
2013-07-03 12:14:37 +02:00
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
simnandez
ba6b5d27a5
New: TODO il faut incrementer le stock si on supprime une expedition
...
validee
2013-06-20 18:37:23 +02:00
Laurent Destailleur
a50cd7b698
Fix bug into script that fix CRLF into LF
2013-06-12 11:59:55 +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
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
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
simnandez
7358faeb96
New: [ task #812 ] Add more Scripts. expire contract services ordered by
...
date end
2013-05-09 09:41:32 +02:00
simnandez
191fc8eb45
Trad: Added missing translations
2013-05-08 18:04:22 +02:00
simnandez
bbb4fcad28
Trad: Added missing translations
2013-05-08 18:00:15 +02:00
simnandez
5e059fb15d
Trad: Added missing translations
2013-05-08 17:59:16 +02:00
simnandez
b9583d389e
Trad: Add products missing translations
2013-05-08 12:24:50 +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
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
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
Marcos García
bf36376215
Corrected ca_ES translations
...
Translations made by Juanjo Menent (simnandez)
2013-04-29 18:05:11 +02:00
simnandez
00adb1b9ab
Fix: [ bug #855 ] Holiday approval email in French
2013-04-29 12:46:07 +02:00
Laurent Destailleur
4c9a728799
Merge pull request #890 from marcosgdf/translations
...
Improved translations
2013-04-27 12:53:15 -07:00
simnandez
823b716042
Trad: Add ca_ES holiday translations
2013-04-27 17:52:14 +02:00
Marcos García
5784cb120a
Moved GenbarcodeLocation from products.lang to admin.lang
2013-04-27 12:32:20 +02:00
fhenry
d9551abb70
Fix trad for Extrafield from table
2013-04-24 17:32:08 +02:00
fhenry
d6514e1cd6
Add extrafield select from table
2013-04-21 17:36:23 +02:00
Laurent Destailleur
a880a8c51e
Qual: Work to prepare usage of jquery data plugins.
2013-04-18 19:37:50 +02:00
simnandez
c9074231b5
Fix: Spelling es_ES boxes lang
...
Trad: Add ca_ES missing translations
2013-04-17 17:06:19 +02:00
simnandez
ae09d2fa3f
Improved margins ca_ES translation
2013-04-15 09:11:58 +02:00
simnandez
e27e5e9c44
Improved margins ca_ES translation
2013-04-14 13:53:48 +02:00
fhenry
00fb40e073
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/langs/ca_ES/admin.lang
htdocs/langs/es_ES/admin.lang
Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
2013-04-14 09:40:01 +02:00
fhenry
cc497490eb
[ task #814 ] Add extrafield feature into Project/project tasks module
2013-04-12 11:09:53 +02:00
simnandez
2e9a8369a7
Trad: Update ca_ES and es_ES translations
2013-04-12 10:46:33 +02:00
Laurent Destailleur
72f0ca194c
Fix: Solve conflict of translation
2013-04-10 19:28:54 +02:00
simnandez
50548601ce
Resolve conflicts
2013-04-06 08:20:57 +02:00
fhenry
893fed9284
[ task #783 ] Add checkbox and radio into extrafield feature
2013-04-02 11:56:53 +02:00
Grand Philippe
ee7490a30a
fix : language error
2013-03-30 14:31:10 +01:00
Grand Philippe
c5e742278e
fix : trad error
2013-03-24 07:11:44 +01:00
fhenry
8971e6fe15
[ task #710 ] Envoi de mail
2013-03-23 14:39:23 +01:00
simnandez
e9cbf94e06
Trad: Add es_ES and ca_ES missing translations
2013-03-22 17:31:43 +01:00
Laurent Destailleur
a3435ab889
Merge remote-tracking branch 'origin/3.3' into develop
2013-03-20 15:32:32 +01:00
Christophe Battarel
e2f28b6c51
remove experimental commissions module
2013-03-18 15:40:56 +01:00
simnandez
54f963f8ae
Trad: Fix: A better fix for status/list of orders.
...
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
2013-03-16 22:32:03 +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
Laurent Destailleur
013b7eca10
Fix: A better fix for status/list of orders.
...
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules
2013-03-16 17:02:13 +01:00
simnandez
c0e5cacafc
Fix: Bad orders list viewstatut filter if expeditons module is disabled
2013-03-15 16:18:14 +01:00
Laurent Destailleur
277784af25
New: Start to work on a cron module
2013-03-13 19:55:21 +01:00
simnandez
8114249fca
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
...
Supplier order
2013-03-12 15:06:38 +01:00
simnandez
f79a26fe65
[ task #731 ] Uniformize ref generation. Interventions
...
[ task #748 ] Add a link "Dolibarr" into left menu
2013-03-10 13:58:32 +01:00
simnandez
ca0144d647
Trad: Add missing translations
2013-03-10 12:49:56 +01:00
simnandez
59cd4b7825
Trad: Add missing translations
2013-03-10 12:31:56 +01:00
simnandez
a811121daf
[ task #731 ] Uniformize ref generation
2013-03-02 16:50:36 +01:00
simnandez
7d9d575e40
[ task #731 ] Uniformize ref generation. Propals
2013-03-02 15:57:26 +01:00
simnandez
8e6cde61c0
Trad: Update translations
2013-02-21 18:44:11 +01:00
