verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
Conversation 0 Commits 490 Files Changed 557 -6
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e1864fec09 - Show all commits

6
loopback/locale/es.json
View File

@ -278,11 +278,6 @@
"Added observation": "{{user}} añadió esta observacion: {{text}}", "Added observation": "{{user}} añadió esta observacion: {{text}}",
"Comment added to client": "Observación añadida al cliente {{clientFk}}", "Comment added to client": "Observación añadida al cliente {{clientFk}}",
"Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen", "Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
<<<<<<< HEAD
"The first two values are letters": "The first two values are letters",
"NIF no valido por VIES": "NIF no valido por VIES"
}
=======
"company": "Compañía", "company": "Compañía",
"country": "País", "country": "País",
"clientId": "Id cliente", "clientId": "Id cliente",
@ -296,4 +291,3 @@
"comercialId": "Id comercial", "comercialId": "Id comercial",
"comercialName": "Comercial" "comercialName": "Comercial"
} }
>>>>>>> 7f8f65567f4eb53637a1ff0c2cdbd3a93447e1ac