lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

461 Commits

Author SHA1 Message Date
Laurent Destailleur
354ceddb87 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/contracts.lang
	htdocs/langs/es_ES/exports.lang
	htdocs/langs/es_ES/mails.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/langs/es_ES/stocks.lang
 2014-05-30 18:17:52 +02:00
Juanjo Menent
8e3f36e9cc Trad: Update es_ES from transifex 2014-05-30 16:48:41 +02:00
Laurent Destailleur
d219916f0a Transifex sync 2014-05-30 16:47:24 +02:00
Laurent Destailleur
584ddde5aa Sync transifex 2014-05-10 15:33:34 +02:00
Laurent Destailleur
48bab56697 Transifex sync 2014-05-05 19:12:52 +02:00
Laurent Destailleur
dfb81e7997 Sync transifex 2014-05-02 16:52:32 +02:00
Juanjo Menent
3b97e1ae1c Trad: Update es_ES from transifex 2014-05-01 09:42:38 +02:00
Juanjo Menent
cdf5155d87 Trad: Update es_ES from transifex 2014-05-01 09:22:31 +02:00
Laurent Destailleur
a96f762f40 Sync from transifex. 2014-04-07 09:23:50 +02:00
Laurent Destailleur
897a9b7446 Sync from transifex. 2014-03-31 19:01:28 +02:00
Juanjo Menent
334455f8dd Update es_ES from transifex 2014-03-22 10:28:24 +01:00
Laurent Destailleur
302bcc2fd5 Translation: Sync from transifex.com 2014-03-17 16:15:00 +01:00
Simnandez
4e73e4e7c7 Update es_ES from transifex 2014-03-15 16:49:18 +01:00
Simnandez
5216a14e37 Trad: Update es_ES from transifex 2014-03-15 16:36:25 +01:00
Laurent Destailleur
dd3169e1ed Sync from transifex 2014-03-05 20:47:22 +01:00
simnandez
36bc225208 Trad: es_ES Sync from transifex 2014-02-21 12:49:24 +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
simnandez
34e73e1b7c Trad: es_ES Sync from transifex 2014-02-07 18:12:30 +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
Laurent Destailleur
9e5e74cb58 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/fourn/commande/fiche.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
 2013-12-19 21:03:15 +01:00
simnandez
1d4cf1a255 Trad: Update es_ES translations 
Conflicts:
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/stocks.lang
 2013-12-19 10:48:55 +01:00
simnandez
3b3b66e612 Trad: Update es_ES translations 2013-12-19 10:29:34 +01:00
Laurent Destailleur
7af5cc18bc Sync from transifex 2013-12-14 03:09:51 +01:00
Marcos García de La Fuente
02036af782 Added missing translations for permissions of margins module 2013-12-08 21:18:01 +02:00
simnandez
058578c5b3 Trad: Fix bad source file 2013-11-12 10:19:12 +01:00
simnandez
3af6f683d9 Trad: Update admin.lang es_ES 2013-11-12 10:16:52 +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
94716c5314 Removed not used key 2013-10-23 14:05:26 +02:00
simnandez
057df6df85 Trad: Update ca_ES and es_ES admin.lang 2013-08-09 11:50:12 +02:00
simnandez
16eba64568 Trad: Add missing modules info 2013-08-05 17:05:59 +02:00
simnandez
9111226761 Trad: Update ca_ES and es_ES admin.lang 2013-08-05 10:00:34 +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
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
66ce0582a1 Trad: Fix missing = into es_ES admin.lang 2013-07-03 16:42:53 +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
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
f9093e00bb Missing es_ES translations 2013-05-06 18:14:16 +02:00
Marcos García
a5009fd555 Corrected es_ES translations 2013-05-04 19:35:38 +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
be5fcfdce3 Improved es_ES translations + replaced lang key in margins module admin page 2013-04-27 12:56:57 +02:00
Marcos García
36574771a6 Translation of barcode internal engine string 2013-04-27 12:49:19 +02:00
Marcos García
5784cb120a Moved GenbarcodeLocation from products.lang to admin.lang 2013-04-27 12:32:20 +02:00
fhenry
c988944f1a PDF admin : Add option to hide num TVA intra into adress of customer 2013-04-26 13:25:51 +02:00
fhenry
d9551abb70 Fix trad for Extrafield from table 2013-04-24 17:32:08 +02:00
Laurent Destailleur
89ad634230 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang
 2013-04-22 01:39:49 +02:00
fhenry
d6514e1cd6 Add extrafield select from table 2013-04-21 17:36:23 +02:00
Marcos García
651b1ae7ce Refactor + es_ES translations improvement + minor stetic change 2013-04-20 12:55:31 +02:00
Marcos García
95ca8db9eb Improved es_ES translations 2013-04-20 00:34:03 +02:00
Marcos García
40a9ab9772 Added missing translations 2013-04-20 00:08:09 +02:00
Marcos García
458b1cdf60 Improved dictionary translations + minor bug fix 2013-04-19 23:33:54 +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
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
 2013-04-14 01:46:33 +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
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
fhenry
893fed9284 [ task #783 ] Add checkbox and radio into extrafield feature 2013-04-02 11:56:53 +02:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
fhenry
1e04ff8bbf Add Cron spanish translation (provided by david@luminososmarmenor.com) 2013-03-23 20:36:32 +01:00
simnandez
e9cbf94e06 Trad: Add es_ES and ca_ES missing translations 2013-03-22 17:31:43 +01:00
fhenry
e71103ed02 task #768: 
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144 
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144
 2013-03-16 09:23:34 +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
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
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
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
Laurent Destailleur
5f99488c99 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/langs/es_ES/admin.lang
 2013-01-05 16:41:08 +01:00
Marcos García
5bf93ca41a Added missing es_ES translation & fixed typo 2013-01-04 23:56:22 +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
simnandez
a585d8b455 Trad: Add missing ca_ES and es_ES translations 2013-01-04 20:54:31 +01:00
simnandez
b9ec558501 Trad: Add missing ca_ES and es_ES translations 2013-01-04 16:13:03 +01:00
Marcos García
674034e648 Translated some strings in the code 2012-12-31 05:55:06 +01:00
Laurent Destailleur
35a9fbda59 Merge pull request #556 from marcosgdf/3.3 
Improved translations
 2012-12-29 07:29:29 -08:00
Marcos García
7ff5db3385 Improved and added missing es_ES translations 2012-12-29 00:21:50 +01:00
Laurent Destailleur
2bec26c32a Fix: Some fix into menu translation 2012-12-28 19:18:04 +01:00
Laurent Destailleur
78a1354a52 Fix: Solve phpunit regression. 
Include an option to support local tax of type 7 (need more time to
validate this type).
 2012-12-19 18:51:49 +01:00
simnandez
4f2f56fced New: [ task #314 ] Can define if prof id are mandatory or not 2012-12-01 15:47:33 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Laurent Destailleur
d30b74e69e Merge pull request #508 from simnandez/develop 
Fix: Add to areas not working if we navigate with shownavref
 2012-12-01 02:56:11 -08:00
simnandez
6487baa081 New: [ task #314 ] Can define if prof id are mandatory or not 2012-11-30 18:46:05 +01:00
simnandez
f70bbded5f Trad: Add ca_ES and es_ES missing translations 2012-11-28 18:12:18 +01:00
simnandez
4a0336759e Trad: Add ca_ES and es_ES missing translations 2012-10-26 09:21:08 +02:00
Marcos García
fed3c20548 Minor changes to es_ES translations 2012-10-08 11:44:55 +02:00
simnandez
0e5cc34b1f Trad: Add ca_ES and es_ES translations 2012-10-05 18:50:30 +02:00
Regis Houssin
8c17266ed4 Merge pull request #425 from marcosgdf/translations 
Added missing & improved es_ES translations
 2012-10-01 01:11:30 -07:00
Marcos García
a4b0f7e521 Fixed es_ES typo 2012-10-01 04:17:17 +02:00
simnandez
6bbcb376b1 Trad: Add missing translations 2012-09-28 15:55:50 +02:00
simnandez
b65c23576a Trad: Add ca_ES and es_ES translations 2012-09-18 15:28:38 +02:00
Marcos García
cb4044755b Fixed export translations 
Added missing strings
Corrected some translations
 2012-09-12 19:11:03 +02:00
Marcos García
f7fff8ecb3 Added missing translations removed in PR #371 2012-09-11 12:40:08 +02:00
Marcos García
b3235887d3 Improved translations of menu edit 2012-09-10 23:50:46 +02:00
Marcos García
f0803a7713 Improved es_ES translations 2012-09-10 11:15:54 +02:00
Marcos García
5536fecc3b Missing translations & improved es_ES translations 2012-09-10 01:15:57 +02:00
simnandez
99946d828c Trad: Add missing translations 2012-09-05 16:39:01 +02:00
Marcos García
f9eb3873b0 Improved and added missing es_ES translations 2012-08-29 00:32:57 +02:00
Marcos García
1a676b5b4b Added missing permission translations 2012-08-29 00:32:16 +02:00
Marcos García
44cc4ae949 Some strings weren't being translated 
Thanks to @grandoc and I.D & L (idl-mp.com) for the french translations
 2012-08-23 08:46:22 +02:00
Marcos García
66eabbe4a9 Improved es_ES translations 2012-08-23 08:33:18 +02:00
Marcos García
19bf4ab8df Improvements to translations 
Some available translations weren't being translated
Also corrected wrong translation key
Improved es_ES translation string
 2012-08-23 08:29:38 +02:00
Marcos García
12282a8a20 Added missing permission translation 2012-08-18 17:27:12 +02:00
simnandez
4fdf38b51c Trad: Improve ca_ES and es_ES translations 2012-08-18 12:12:17 +02:00
Marcos García
8d6d9e8f8c PoS permission number was incorrect in admin.lang 2012-08-17 07:56:54 +02:00
Marcos García
8ab7a5e276 Improved es_ES translations 2012-08-17 07:55:28 +02:00
Marcos García
f320ed92cc Translated and upper-cased export formats, improved es_ES translations 
fr_FR exports translations were made by @fhenry and Manuel Pintor (contact@idl-mp.com)
Little refactor too
 2012-08-16 13:07:12 +02:00
Marcos García
b6cd8b632b Improved es_ES translations 2012-08-15 19:32:26 +02:00
Marcos García
1b817e79b9 Improved some es_ES translations & fixed untranslated string 2012-08-13 06:26:56 +02:00
Laurent Destailleur
3b2ffb8cc0 Fix: Removed key of external modules 2012-08-11 02:06:34 +02:00
Laurent Destailleur
855bcf1b24 Fix: missing or duplicate key 2012-08-11 01:59:45 +02:00
Marcos García
c76cdd74e7 es_ES typos and missing translation 2012-08-04 14:52:44 +02:00
Marcos García
a71840bbd9 Revert "Moved FeaturesSupported string from other.lang to admin.lang as it is only used in admin pages" 
This reverts commit 0e952521e1.
 2012-07-30 20:29:54 +02:00
Marcos García
fb95a0ed16 Made corrections that @hregis told me 2012-07-30 20:29:39 +02:00
Marcos García
7bbfe9c29b Fixed es_ES typo 2012-07-30 20:09:35 +02:00
Marcos García
0e952521e1 Moved FeaturesSupported string from other.lang to admin.lang as it is only used in admin pages 2012-07-30 19:45:51 +02:00
Marcos García
8f678cebec Added missing translation 2012-07-30 17:33:32 +02:00
Marcos García
c627e73c9d Realized that es_ES looks better this way 2012-07-30 03:21:33 +02:00
Marcos García
d1cbf4f944 Fixed BIG es_ES translation problem with donations module 
Fixed some es_ES and en_US typos
There was a string that wasn't available for translation
 2012-07-30 03:18:17 +02:00
Marcos García
8910fa46da Corrected English translation and added Spanish missing translation 2012-07-29 22:40:11 +02:00
Marcos García
be388b4418 Fixed some typos in es_ES and en_US translations 
Allowed MailmanSPIP module configuration to be translated into other languages
Moved MailmanSPIP-related strings to mailmanspip.lang file
 2012-07-29 22:23:51 +02:00
simnandez
8a19946e4a Trad: Commissions and margins 
Conflicts:
	htdocs/langs/fr_FR/margins.lang
 2012-07-28 20:22:38 +02:00
Marcos García
de7595922e Fixed some typos in es_ES and allowed some strings to be translated 2012-07-28 19:53:13 +02:00
Marcos García
2204c09e5a Applied commits 16-22 2012-07-27 23:04:05 +02:00
Marcos García
a6c8838b8f Applied patches 9-15 2012-07-27 21:27:03 +02:00
Marcos García
5fd7fcb6c4 Applied commits 1-8 2012-07-27 18:40:06 +02:00
Laurent Destailleur
66ea44886b Fix: Permissions when using web services. 2012-07-22 02:33:21 +02:00
Marcos García
6039c6f420 Added missing translation and fixed some typos 2012-07-19 23:44:02 +02:00
Marcos García
8233a26422 Fixed some spanish & catalan translations 2012-07-19 23:43:41 +02:00
simnandez
b8338425f4 Trad: Add missing translations 2012-07-13 15:46:42 +02:00
Regis Houssin
6935598ced Fix: optimization 2012-07-11 12:05:43 +02:00
Regis Houssin
d1e80afe62 Fix: move "classify billed propal with order" in workflow manager 2012-07-08 13:19:13 +02:00
juanjo
b2ad2decad [ task #407 ] Manage PDF hidden items 2012-05-21 16:20:19 +02:00
simnandez
67ba805d90 [ task #297 ] Add a installer for external modules 2012-04-27 09:11:03 +02:00
simnandez
5b7ff51ffc [ task #297 ] Add a installer for external modules. Init works 2012-04-25 12:41:00 +02:00
Laurent Destailleur
8b15847742 New: Add link to dolistore into help message 2012-04-08 14:14:56 +02:00
simnandez
4a34a34ea5 Trad: Add link to promote dolicloud and dolibox into about page. 2012-04-04 15:38:25 +01:00
Laurent Destailleur
2dcd966046 Add link to promote dolicloud and dolibox into about page. 2012-03-31 16:24:34 +02:00
simnandez
ae37a5bf86 Trad: Fix missing translation for products attributs 2012-03-29 10:19:52 +01:00