Resolving conflicts with master

1 files changed, 18 insertions, 0 deletions

diff --git a/web/l10n/pt_BR.json b/web/l10n/pt_BR.json
index c081f478..13a0e071 100644
--- a/web/l10n/pt_BR.json
+++ b/web/l10n/pt_BR.json
@@ -8,6 +8,8 @@
     "sharedEdit": "Editar",
     "sharedRemove": "Remover",
     "sharedRemoveConfirm": "Remover item?",
+    "sharedYes": "Yes",
+    "sharedNo": "No",
     "sharedKm": "Km",
     "sharedMi": "Mi",
     "sharedNmi": "Milhas Náuticas",
@@ -63,6 +65,7 @@
     "sharedRequired": "Necessário",
     "sharedPreferences": "Preferências",
     "sharedPermissions": "Permissões",
+    "sharedConnections": "Connections",
     "sharedExtra": "Adicional",
     "sharedTypeString": "Texto",
     "sharedTypeNumber": "Número",
@@ -73,15 +76,20 @@
     "sharedSavedCommands": "Comandos Salvos",
     "sharedNew": "Novo...",
     "sharedShowAddress": "Mostrar Endereço",
+    "sharedShowDetails": "More Details",
     "sharedDisabled": "Desativado",
     "sharedMaintenance": "Manutenção",
     "sharedDeviceAccumulators": "Bateria",
     "sharedAlarms": "Alarmes",
+    "sharedLocation": "Location",
+    "sharedImport": "Import",
     "attributeSpeedLimit": "Limite de Velocidade",
     "attributePolylineDistance": "Distância da Polilinha",
     "attributeReportIgnoreOdometer": "Relatório: Ignorar Odômetro",
     "attributeWebReportColor": "Web: Cor do Relatório",
     "attributeDevicePassword": "Senha do Dispositivo",
+    "attributeDeviceInactivityStart": "Início de inatividade do dispositivo",
+    "attributeDeviceInactivityPeriod": "Período de inatividade do dispositivo",
     "attributeProcessingCopyAttributes": "Processamento: Copiar Atributos",
     "attributeColor": "Cor",
     "attributeWebLiveRouteLength": "Web: Comprimento da Rota ao Vivo",
@@ -106,6 +114,7 @@
     "attributeUiDisableCalendars": "UI: Desativar Calendários",
     "attributeUiDisableMaintenance": "UI: Desativar Manutenção",
     "attributeUiHidePositionAttributes": "UI: Ocultar os atributos de posição",
+    "attributeNotificationTokens": "Notification Tokens",
     "errorTitle": "Erro",
     "errorGeneral": "Parâmetros inválidos ou violação de restrições",
     "errorConnection": "Erro de conexão",
@@ -229,6 +238,7 @@
     "serverRegistration": "Registro",
     "serverReadonly": "Somente leitura",
     "serverForceSettings": "Forçar configurações",
+    "serverAnnouncement": "Anúncio",
     "mapTitle": "Mapa",
     "mapLayer": "Camada de Mapa",
     "mapCustom": "Custom (XYZ)",
@@ -244,6 +254,9 @@
     "mapYandexMap": "Mapa Yandex",
     "mapYandexSat": "Satélite Yandex",
     "mapWikimedia": "Wikimedia",
+    "mapMapboxStreets": "Mapbox Streets",
+    "mapMapboxOutdoors": "Mapbox Outdoors",
+    "mapMapboxSatellite": "Mapbox Satellite",
     "mapShapePolygon": "Polígono",
     "mapShapeCircle": "Círculo",
     "mapShapePolyline": "Polilinha",
@@ -266,6 +279,7 @@
     "commandEngineResume": "Religar Motor",
     "commandAlarmArm": "Ativar Alarme",
     "commandAlarmDisarm": "Desativar Alarme",
+    "commandAlarmDismiss": "Dismiss Alarm",
     "commandSetTimezone": "Definir fuso horário",
     "commandRequestPhoto": "Pegar foto",
     "commandPowerOff": "Desligar o Dispositivo",
@@ -304,6 +318,7 @@
     "eventDeviceOnline": "Status online",
     "eventDeviceUnknown": "Status desconhecido",
     "eventDeviceOffline": "Status offline",
+    "eventDeviceInactive": "Dispositivo inativo",
     "eventDeviceMoving": "Dispositivo movendo",
     "eventDeviceStopped": "Dispositivo parado",
     "eventDeviceOverspeed": "Excedido o limite de velocidade",
@@ -365,11 +380,13 @@
     "notificatorSms": "SMS",
     "notificatorFirebase": "Firebase",
     "notificatorTraccar": "Traccar",
+    "reportReplay": "Replay",
     "reportRoute": "Rota",
     "reportEvents": "Eventos",
     "reportTrips": "Viagens",
     "reportStops": "Paradas",
     "reportSummary": "Resumo",
+    "reportDaily": "Daily Summary",
     "reportChart": "Gráfico",
     "reportConfigure": "Configurar",
     "reportEventTypes": "Tipos de Eventos",
@@ -390,6 +407,7 @@
     "reportMaximumSpeed": "Velocidade Máxima",
     "reportEngineHours": "Horas ligado",
     "reportDuration": "Duração",
+    "reportStartDate": "Start Date",
     "reportStartTime": "Hora inicial",
     "reportStartAddress": "Endereço inicial",
     "reportEndTime": "Hora final",