style: refs #6321 i18n es
This commit is contained in:
parent
4f4071f13b
commit
d8bc37b627
|
@ -215,7 +215,6 @@ ticketList:
|
|||
toLines: Ir a lineas
|
||||
addressNickname: Alias consignatario
|
||||
ref: Referencia
|
||||
<<<<<<< HEAD
|
||||
negative:
|
||||
hour: 'Hora'
|
||||
id: 'Id Articulo'
|
||||
|
@ -291,11 +290,9 @@ negative:
|
|||
newTicket: Ticket nuevo
|
||||
status: Estado
|
||||
message: Mensaje
|
||||
=======
|
||||
rounding: Redondeo
|
||||
noVerifiedData: Sin datos comprobados
|
||||
purchaseRequest: Petición de compra
|
||||
notVisible: No visible
|
||||
clientFrozen: Cliente congelado
|
||||
componentLack: Faltan componentes
|
||||
>>>>>>> a338dbed70ac0386f410ac76c5a8ff64228f3251
|
||||
|
|
Loading…
Reference in New Issue