Commit Graph

917 Commits

Author SHA1 Message Date
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
simnandez
4cb6072f03 New: [ task #707 ] Create option ProfIdx are mandatory to validate a
invoice
2013-02-21 11:03:14 +01:00
simnandez
df0f281efd Fix: Translation 2013-02-19 12:11:44 +01:00
simnandez
15f6f7c335 Fix: Translation 2013-02-18 17:07:20 +01:00
simnandez
a9de14c145 Trad: Add missing translations 2013-02-01 17:49:41 +01:00
simnandez
7134ab5594 Trad: Add missing translations 2013-02-01 09:28:02 +01:00
Laurent Destailleur
2b8aa54f68 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-17 10:32:49 +01:00
simnandez
e820e62c03 Trad: Best ca_ES and es_ES translations 2013-01-16 18:19:48 +01:00
Laurent Destailleur
5c51905f63 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-09 19:15:51 +01:00
Marcos García
ae98ebc793 There is no need to warn the user as the picto already does 2013-01-08 12:14:11 +01:00
Marcos García
d27519338a Added missing translations
Reverted removal of strings in PR #570
Added missing strings to en_US
2013-01-04 22:34:55 +01:00