diff options
| author | Ashutosh Bishnoi <mail2bishnoi@gmail.com> | 2020-11-10 13:02:20 +0530 |
|---|---|---|
| committer | Ashutosh Bishnoi <mail2bishnoi@gmail.com> | 2020-11-10 13:02:20 +0530 |
| commit | a948981184f4f2884b7a35b67b2389ddcd1f52a8 (patch) | |
| tree | 9187834b5246734da8549735f64d2e5546c60e1e /web/l10n/en.json | |
| parent | 5a116350b3e402ef123a75451737c268a9ebddff (diff) | |
| parent | 1af1545dc7ba3cfdf73a58031b37bea0ecff2e54 (diff) | |
| download | etbsa-traccar-web-a948981184f4f2884b7a35b67b2389ddcd1f52a8.tar.gz etbsa-traccar-web-a948981184f4f2884b7a35b67b2389ddcd1f52a8.tar.bz2 etbsa-traccar-web-a948981184f4f2884b7a35b67b2389ddcd1f52a8.zip | |
Resolving conflicts with master
Diffstat (limited to 'web/l10n/en.json')
| -rw-r--r-- | web/l10n/en.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/web/l10n/en.json b/web/l10n/en.json index dceba5f..2b24cf2 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -82,6 +82,7 @@ "sharedDeviceAccumulators": "Accumulators", "sharedAlarms": "Alarms", "sharedLocation": "Location", + "sharedImport": "Import", "attributeSpeedLimit": "Speed Limit", "attributePolylineDistance": "Polyline Distance", "attributeReportIgnoreOdometer": "Report: Ignore Odometer", @@ -253,6 +254,9 @@ "mapYandexMap": "Yandex Map", "mapYandexSat": "Yandex Satellite", "mapWikimedia": "Wikimedia", + "mapMapboxStreets": "Mapbox Streets", + "mapMapboxOutdoors": "Mapbox Outdoors", + "mapMapboxSatellite": "Mapbox Satellite", "mapShapePolygon": "Polygon", "mapShapeCircle": "Circle", "mapShapePolyline": "Polyline", @@ -376,6 +380,7 @@ "notificatorSms": "SMS", "notificatorFirebase": "Firebase", "notificatorTraccar": "Traccar", + "reportReplay": "Replay", "reportRoute": "Route", "reportEvents": "Events", "reportTrips": "Trips", |