verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

fix conflicts: refs #6276

This commit is contained in:
Jorge Penadés 2024-01-02 09:42:41 +01:00
parent 767894b128
commit 92b4908b35
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
loopback/locale/es.json
View File

@ -330,10 +330,6 @@
"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima", "quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
"Cannot past travels with entries": "No se pueden pasar envíos con entradas", "Cannot past travels with entries": "No se pueden pasar envíos con entradas",
"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}", "It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
<<<<<<< HEAD "The line could not be marked": "The line could not be marked",
"The line could not be marked": "The line could not be marked"
}
=======
"This user does not have an assigned tablet": "Este usuario no tiene tablet asignada" "This user does not have an assigned tablet": "Este usuario no tiene tablet asignada"
} }
>>>>>>> 0101dcda3ac950c1add6c3c426c4f745389805c1