Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1

This commit is contained in:
Laurent Destailleur 2012-01-01 22:45:42 +01:00
commit 9d674ad044
5 changed files with 13 additions and 2 deletions

View File

@ -85,6 +85,7 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 1
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 14, 1, '5.5','0','VAT reduced rate (France hors DOM-TOM)',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 15, 1, '0','0','VAT Rate 0 ou non applicable',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 16, 1, '2.1','0','VAT super-reduced rate',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 17, 1, '7','0','VAT reduced rate',1);
-- GERMANY (id country=5)
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 51, 5, '19','0','VAT standard rate',1);

View File

@ -247,10 +247,12 @@ Bytes=Bytes
KiloBytes=Kilobytes
MegaBytes=Megabytes
GigaBytes=Gigabytes
TeraBytes=Terabytes
b=b.
Kb=Kb
Mb=Mb
Gb=Gb
Tb=Tb
Cut=Tallar
Copy=Copiar
Paste=Pegar
@ -596,6 +598,8 @@ IM=Missatgeria instantània
NewAttribute=Nou atribut
AttributeCode=Codi atribut
OptionalFieldsSetup=Configuració dels atributs opcionals
URLPhoto=Url de la foto/logo
SetLinkToThirdParty=Vincular a un altre tercer
# Week day
Monday=Dilluns

View File

@ -599,6 +599,7 @@ NewAttribute=New attribute
AttributeCode=Attribute code
OptionalFieldsSetup=Extra attributes setup
URLPhoto=Url of photo/logo
SetLinkToThirdParty=Link to another third party
# Week day
Monday=Monday

View File

@ -1,4 +1,4 @@
# Dolibarr language file - es_ES - main
# Dolibarr language file - es_ES - main
CHARSET=UTF-8
DIRECTION=ltr
SeparatorDecimal=,
@ -247,10 +247,12 @@ Bytes=Bytes
KiloBytes=Kilobytes
MegaBytes=Megabytes
GigaBytes=Gigabytes
TeraBytes=Terabytes
b=b.
Kb=Kb
Mb=Mb
Gb=Gb
Tb=Tb
Cut=Cortar
Copy=Copiar
Paste=Pegar
@ -596,6 +598,8 @@ IM=Mensajería instantánea
NewAttribute=Nuevo atributo
AttributeCode=Código atributo
OptionalFieldsSetup=Configuración de los atributos opcionales
URLPhoto=Url de la foto/logo
SetLinkToThirdParty=Vincular a otro tercero
# Week day
Monday=Lunes
@ -625,4 +629,4 @@ ShortWednesday=Mi
ShortThursday=J
ShortFriday=V
ShortSaturday=S
ShortSunday=D
ShortSunday=D

View File

@ -599,6 +599,7 @@ NewAttribute=Nouvel attribut
AttributeCode=Code de l'attribut
OptionalFieldsSetup=Configuration des attributs complémentaires
URLPhoto=Url vers photo/logo
SetLinkToThirdParty=Lier vers un autre tiers
# Week day
Monday=Lundi