Resolving conflicts with master

1 files changed, 18 insertions, 0 deletions

diff --git a/web/l10n/fr.json b/web/l10n/fr.json
index 06ce9cb..95a0100 100644
--- a/web/l10n/fr.json
+++ b/web/l10n/fr.json
@@ -8,6 +8,8 @@
     "sharedEdit": "Editer",
     "sharedRemove": "Effacer",
     "sharedRemoveConfirm": "Effacer objet?",
+    "sharedYes": "Yes",
+    "sharedNo": "No",
     "sharedKm": "km",
     "sharedMi": "mi",
     "sharedNmi": "nmi",
@@ -63,6 +65,7 @@
     "sharedRequired": "Requis",
     "sharedPreferences": "Préférences",
     "sharedPermissions": "Permissions",
+    "sharedConnections": "Connections",
     "sharedExtra": "Extra",
     "sharedTypeString": "Chaîne de caractères",
     "sharedTypeNumber": "Nombre",
@@ -73,15 +76,20 @@
     "sharedSavedCommands": "Commandes sauvegardées ",
     "sharedNew": "Nouveau",
     "sharedShowAddress": "Montrer adresse",
+    "sharedShowDetails": "More Details",
     "sharedDisabled": "Désactivé",
     "sharedMaintenance": "Entretien",
     "sharedDeviceAccumulators": "Accumulateurs",
     "sharedAlarms": "Alarmes",
+    "sharedLocation": "Location",
+    "sharedImport": "Import",
     "attributeSpeedLimit": "Limite de vitesse",
     "attributePolylineDistance": "Distance polyligne",
     "attributeReportIgnoreOdometer": "Rapport: Ignorer l'odomètre",
     "attributeWebReportColor": "Web: couleur du rapport",
     "attributeDevicePassword": "Mot de passe de l'appareil",
+    "attributeDeviceInactivityStart": "Device Inactivity Start",
+    "attributeDeviceInactivityPeriod": "Device Inactivity Period",
     "attributeProcessingCopyAttributes": "En cours: Copie des attributs",
     "attributeColor": "Couleur",
     "attributeWebLiveRouteLength": "Web: Longueur de route en temps réel",
@@ -106,6 +114,7 @@
     "attributeUiDisableCalendars": "UI: Désactiver les calendiers",
     "attributeUiDisableMaintenance": "UI/ Désactiver l'entretien",
     "attributeUiHidePositionAttributes": "UI: Cacher Attributs de Position",
+    "attributeNotificationTokens": "Notification Tokens",
     "errorTitle": "Erreur",
     "errorGeneral": "Paramètres invalides ou violation de contrainte",
     "errorConnection": "Erreur de connexion",
@@ -229,6 +238,7 @@
     "serverRegistration": "Inscription",
     "serverReadonly": "Lecture seule",
     "serverForceSettings": "Forcer les paramètres",
+    "serverAnnouncement": "Announcement",
     "mapTitle": "Carte",
     "mapLayer": "Couche cartographique",
     "mapCustom": "Personnalisé (XYZ)",
@@ -244,6 +254,9 @@
     "mapYandexMap": "Yandex Map",
     "mapYandexSat": "Yandex Satelitte",
     "mapWikimedia": "Wikimedia",
+    "mapMapboxStreets": "Mapbox Streets",
+    "mapMapboxOutdoors": "Mapbox Outdoors",
+    "mapMapboxSatellite": "Mapbox Satellite",
     "mapShapePolygon": "Polygone",
     "mapShapeCircle": "Cercle",
     "mapShapePolyline": "Polyligne",
@@ -266,6 +279,7 @@
     "commandEngineResume": "Démarrage moteur",
     "commandAlarmArm": "Activer l'alarme",
     "commandAlarmDisarm": "Désactiver l'alarme",
+    "commandAlarmDismiss": "Dismiss Alarm",
     "commandSetTimezone": "Régler le fuseau horaire",
     "commandRequestPhoto": "Demander une photo",
     "commandPowerOff": "Eteindre l'appareil",
@@ -304,6 +318,7 @@
     "eventDeviceOnline": "Statut: en ligne",
     "eventDeviceUnknown": "Statut: inconnu",
     "eventDeviceOffline": "Statut: hors ligne",
+    "eventDeviceInactive": "Device inactive",
     "eventDeviceMoving": "Appareil en mouvement",
     "eventDeviceStopped": "Appareil arrêté",
     "eventDeviceOverspeed": "Vitesse limite dépassée",
@@ -365,11 +380,13 @@
     "notificatorSms": "SMS",
     "notificatorFirebase": "Firebase",
     "notificatorTraccar": "Traccar",
+    "reportReplay": "Replay",
     "reportRoute": "Route",
     "reportEvents": "Évènements",
     "reportTrips": "Trajets",
     "reportStops": "Arrêts",
     "reportSummary": "Résumé",
+    "reportDaily": "Daily Summary",
     "reportChart": "Graphique",
     "reportConfigure": "Configurer",
     "reportEventTypes": "Types d'évènements",
@@ -390,6 +407,7 @@
     "reportMaximumSpeed": "Vitesse maximum",
     "reportEngineHours": "Heures du moteur",
     "reportDuration": "Durée",
+    "reportStartDate": "Start Date",
     "reportStartTime": "Date de départ",
     "reportStartAddress": "Adresse de départ",
     "reportEndTime": "Date de fin",