Resolving conflicts with master

1 files changed, 23 insertions, 5 deletions

diff --git a/web/l10n/es.json b/web/l10n/es.json
index feae1f63..304592ce 100644
--- a/web/l10n/es.json
+++ b/web/l10n/es.json
@@ -8,6 +8,8 @@
     "sharedEdit": "Editar",
     "sharedRemove": "Eliminar",
     "sharedRemoveConfirm": "¿Eliminar elemento?",
+    "sharedYes": "Si",
+    "sharedNo": "No",
     "sharedKm": "Km",
     "sharedMi": "MI",
     "sharedNmi": "nmi",
@@ -63,6 +65,7 @@
     "sharedRequired": "Obligatorio",
     "sharedPreferences": "Preferencias",
     "sharedPermissions": "Permisos",
+    "sharedConnections": "Conexiones",
     "sharedExtra": "Extra",
     "sharedTypeString": "Cadena",
     "sharedTypeNumber": "Número",
@@ -73,15 +76,20 @@
     "sharedSavedCommands": "Comandos guardados",
     "sharedNew": "Nuevo...",
     "sharedShowAddress": "Mostrar Dirección",
+    "sharedShowDetails": "Más detalles",
     "sharedDisabled": "Deshabilitado",
     "sharedMaintenance": "Mantenimientos",
     "sharedDeviceAccumulators": "Acumulador",
     "sharedAlarms": "Alarmas",
+    "sharedLocation": "Ubicación",
+    "sharedImport": "Import",
     "attributeSpeedLimit": "Límite de velocidad",
     "attributePolylineDistance": "Distancia de polilínea",
     "attributeReportIgnoreOdometer": "Reporte: Ignorar el odómetro",
     "attributeWebReportColor": "Web: Color de reporte",
     "attributeDevicePassword": "Contraseña de dispositivo",
+    "attributeDeviceInactivityStart": "Device Inactivity Start",
+    "attributeDeviceInactivityPeriod": "Device Inactivity Period",
     "attributeProcessingCopyAttributes": "Procesando: Copia de atributos",
     "attributeColor": "Color",
     "attributeWebLiveRouteLength": "Web: Longitud de la ruta en vivo",
@@ -95,7 +103,7 @@
     "attributeMailSmtpSslTrust": "Correo: SMTP SSL de confianza",
     "attributeMailSmtpSslProtocols": "Correo: SMTP SSL protocolos",
     "attributeMailSmtpFrom": "Correo: SMTP desde",
-    "attributeMailSmtpAuth": "Correo: Habilitación de autenticación SMTP",
+    "attributeMailSmtpAuth": "Correo: Habilitar autenticación SMTP",
     "attributeMailSmtpUsername": "Correo: Nombre de usuario SMTP",
     "attributeMailSmtpPassword": "Correo: Contraseña SMTP",
     "attributeUiDisableReport": "UI: Deshabilitar reporte",
@@ -106,6 +114,7 @@
     "attributeUiDisableCalendars": "UI: Deshabilitar Calendario",
     "attributeUiDisableMaintenance": "UI: Deshabilitar Mantenimiento",
     "attributeUiHidePositionAttributes": "UI: Ocultar Atributos de Posición",
+    "attributeNotificationTokens": "Notification Tokens",
     "errorTitle": "Error",
     "errorGeneral": "Parámetros inválidos o violación de restricciónes",
     "errorConnection": "Error de Conexión",
@@ -229,9 +238,10 @@
     "serverRegistration": "Registro",
     "serverReadonly": "Sólo lectura",
     "serverForceSettings": "Forzar Valores",
+    "serverAnnouncement": "Announcement",
     "mapTitle": "Mapa",
     "mapLayer": "Capa de Mapa",
-    "mapCustom": "Custom (XYZ)",
+    "mapCustom": "Personalizado (XYZ)",
     "mapCustomArcgis": "ArcGIS Personalizado",
     "mapCustomLabel": "Mapa Personalizado",
     "mapCarto": "Mapas base Carto",
@@ -244,6 +254,9 @@
     "mapYandexMap": "Mapa Yandex",
     "mapYandexSat": "Yandex Satélite",
     "mapWikimedia": "Wikimedia",
+    "mapMapboxStreets": "Mapbox Streets",
+    "mapMapboxOutdoors": "Mapbox Outdoors",
+    "mapMapboxSatellite": "Mapbox Satellite",
     "mapShapePolygon": "Polígono",
     "mapShapeCircle": "Círculo",
     "mapShapePolyline": "Polilínea",
@@ -266,6 +279,7 @@
     "commandEngineResume": "Desbloquear Encendido de Motor",
     "commandAlarmArm": "Armar Alarma",
     "commandAlarmDisarm": "Desarmar Alarma",
+    "commandAlarmDismiss": "Dismiss Alarm",
     "commandSetTimezone": "Establecer zona horaria",
     "commandRequestPhoto": "Solicitar Foto",
     "commandPowerOff": "Dispositivo apagado",
@@ -304,6 +318,7 @@
     "eventDeviceOnline": "El Dispositivo Esta en Línea",
     "eventDeviceUnknown": "El Estado del Dispositivo es Desconocido ",
     "eventDeviceOffline": "El Dispositivo esta Fuera de Línea",
+    "eventDeviceInactive": "Dispositivo inactivo",
     "eventDeviceMoving": "El Dispositivo esta en Movimiento ",
     "eventDeviceStopped": "El Dispositivo se ha Detenido ",
     "eventDeviceOverspeed": "El Dispositivo ha Excedido el Limite de Velocidad ",
@@ -365,11 +380,13 @@
     "notificatorSms": "SMS",
     "notificatorFirebase": "Firebase",
     "notificatorTraccar": "Traccar",
+    "reportReplay": "Replay",
     "reportRoute": "Ruta",
     "reportEvents": "Eventos",
     "reportTrips": "Viajes",
     "reportStops": "Paradas",
     "reportSummary": "Resumen",
+    "reportDaily": "Resumen diario",
     "reportChart": "Gráfica",
     "reportConfigure": "Configurar",
     "reportEventTypes": "Tipos de evento",
@@ -390,11 +407,12 @@
     "reportMaximumSpeed": "Velocidad Máxima",
     "reportEngineHours": "Horas Motor",
     "reportDuration": "Duración",
+    "reportStartDate": "Fecha de inicio",
     "reportStartTime": "Hora de Inicio",
     "reportStartAddress": "Dirección de Inicio",
     "reportEndTime": "Hora de Fin",
     "reportEndAddress": "Dirección de Fin",
-    "reportSpentFuel": "Combustible utilizado",
+    "reportSpentFuel": "Combustible consumido",
     "reportStartOdometer": "Odómetro inical",
     "reportEndOdometer": "Odómetro final",
     "statisticsTitle": "Estadísticas",
@@ -410,7 +428,7 @@
     "categoryDefault": "Prederminado",
     "categoryAnimal": "Animal",
     "categoryBicycle": "Bicicleta",
-    "categoryBoat": "Bote",
+    "categoryBoat": "Barco",
     "categoryBus": "Autobús",
     "categoryCar": "Automóvil",
     "categoryCrane": "Grúa",
@@ -426,7 +444,7 @@
     "categoryTram": "Tranvía",
     "categoryTrolleybus": "Trolebús",
     "categoryTruck": "Camión",
-    "categoryVan": "Van",
+    "categoryVan": "Furgoneta",
     "categoryScooter": "Moto",
     "maintenanceStart": "Iniciar",
     "maintenancePeriod": "Período"