Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
Joan Sanchez 2018-08-02 11:21:55 +02:00
commit fa8585e92d
3 changed files with 2 additions and 8 deletions

View File

@ -31,9 +31,9 @@
"Choose a company": "Selecciona una empresa",
"Se debe rellenar el campo de texto": "Se debe rellenar el campo de texto",
"Description should have maximum of 45 characters": "La descripción debe tener maximo 45 caracteres",
"Cannot be blank": "Cannot be blank",
"Cannot be blank": "El campo no puede estar en blanco",
"The grade must be an integer greater than or equal to zero": "El grade debe ser un entero mayor o igual a cero",
"Sample type cannot be blank": "El tipo de plantilla no puede quedar en blanco",
"Description cannot be blank": "Se debe rellenar el campo de texto",
"You can't create an order for a frozen client": "You can't create an order for a frozen client"
"You don't have enough privileges to change the state of this ticket": "No tienes permisos para cambiar el estado de este ticket"
}

View File

@ -1,3 +0,0 @@
{
"You don't have enough privileges to change the state of this ticket": "You don't have enough privileges to change the state of this ticket"
}

View File

@ -1,3 +0,0 @@
{
"You don't have enough privileges to change the state of this ticket": "No tienes permisos para cambiar el estado de este ticket"
}