Commit Graph

427 Commits

Author SHA1 Message Date
Juanjo Menent
e421741fc4 Trad: More accurate trad of holidays. Update form transifex 2014-11-06 17:33:05 +01:00
Juanjo Menent
c422024cb9 Trad: More accurate trad of notifications. Update form transifex 2014-11-06 11:55:26 +01:00
Juanjo Menent
eadb10e71e Trad: update es_ES from transifex 2014-11-05 22:31:23 +01:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
2014-10-13 00:50:51 +02:00
Juanjo Menent
2f3abd3774 Trad: Syncro es_ES from transifex 2014-10-10 21:50:05 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
aspangaro
6d26a7a46d Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-20 06:36:31 +02:00
Juanjo Menent
d16a1e587e Trad: Syncro es_ES from transifex 2014-09-19 09:04:45 +02:00
aspangaro
ab9226aab6 Delete elements have a link with old module ventilation - Replace today by module Accounting Expert 2014-09-19 05:55:54 +02:00
Juanjo Menent
08a4713101 Trad: Syncro from transifex 2014-09-11 19:42:46 +02:00
Laurent Destailleur
2f6493dabd Sync transifex 2014-09-08 11:58:45 +02:00
Laurent Destailleur
bd29d3c7f4 Sync from transifex 2014-08-08 14:38:20 +02:00
Laurent Destailleur
80e8ff8db3 Sync from transifex 2014-08-01 02:01:51 +02:00
Laurent Destailleur
e94ffceac9 Transifex sync for 3.6 2014-07-18 20:16:46 +02:00
Laurent Destailleur
dae7f8643b Transifex sync 2014-06-22 23:37:20 +02:00
Laurent Destailleur
e04822a7c4 Sync from transifex 2014-06-10 02:22:50 +02:00
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