Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

modules/zone/back/locale/zone-event/en.yml

@@ -1,14 +1,14 @@
-name: zone event
+name: event
 columns:
     id: id
     zoneFk: zone
     type: type
     dated: dated
-    started: started
+    started: starts
-    ended: ended
+    ended: ends
     weekDays: week days
     hour: hour
     travelingDays: traveling days
     price: price
     bonus: bonus
-    m3Max: max m3
+    m3Max: max. m3

modules/zone/back/locale/zone-event/es.yml

@@ -1,11 +1,11 @@
-name: evento zona
+name: evento
 columns:
     id: id
     zoneFk: zona
     type: tipo
     dated: fecha
-    started: comenzado
+    started: empieza
-    ended: terminado
+    ended: termina
     weekDays: días semana
     hour: hora
     travelingDays: días de viaje

modules/zone/back/locale/zone-exclusion/en.yml

@@ -1,5 +1,5 @@
-name: zone exclusion
+name: exclusion
 columns:
     id: id
-    dated: dated
+    dated: date
     zoneFk: zone

modules/zone/back/locale/zone-exclusion/es.yml

@@ -1,4 +1,4 @@
-name: zone exclusion
+name: exclusión
 columns:
     id: id
     dated: fecha

modules/zone/back/locale/zone-included/en.yml

@@ -1,5 +1,7 @@
-name: zone included
+name: inclusion
 columns:
     id: id
     dated: dated
     zoneFk: zone
+    isIncluded: incluida
+    geoFk: localización

modules/zone/back/locale/zone-included/es.yml

@@ -1,5 +1,7 @@
-name: zona incluida
+name: inclusión
 columns:
     id: id
     dated: fecha
     zoneFk: zona
+    isIncluded: incluida
+    geoFk: localización

modules/zone/back/locale/zone-warehouse/en.yml

@@ -1,4 +1,4 @@
-name: zone warehouse
+name: warehouse
 columns:
     id: id
     warehouseFk: warehouse

modules/zone/back/locale/zone-warehouse/es.yml

@@ -1,4 +1,4 @@
-name: almacén zona
+name: almacén
 columns:
     id: id
     warehouseFk: almacén