From 1edfec60e54b26f3cd7970075b58bb69920b37f7 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 6 Sep 2017 13:28:48 +0500
Subject: Move units to attributes and add volume units

---
 web/l10n/en.json | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'web/l10n/en.json')

diff --git a/web/l10n/en.json b/web/l10n/en.json
index 894ae2e..596e213 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -42,6 +42,10 @@
     "sharedSecondAbbreviation": "s",
     "sharedVoltAbbreviation": "V",
     "sharedLiterAbbreviation": "l",
+    "sharedGallonAbbreviation": "gal",
+    "sharedLiter": "Liter",
+    "sharedImpGallon": "Imp. Gallon",
+    "sharedUsGallon": "U.S. Gallon",
     "sharedLiterPerHourAbbreviation": "l/h",
     "sharedGetMapState": "Get Map State",
     "sharedComputedAttribute": "Computed Attribute",
@@ -64,6 +68,7 @@
     "sharedTypeNumber": "Number",
     "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
+    "sharedVolumeUnit": "Volume",
     "sharedInfoTitle": "Info",
     "attributeSpeedLimit": "Speed Limit",
     "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
-- 
cgit v1.2.3


From ae877a48698f28beae82753feae9b4a8e0993ca2 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 6 Sep 2017 16:51:44 +0500
Subject: Add "Unit" to strings

---
 web/app/store/CommonUserAttributes.js | 4 ++--
 web/l10n/en.json                      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'web/l10n/en.json')

diff --git a/web/app/store/CommonUserAttributes.js b/web/app/store/CommonUserAttributes.js
index d000909..1ba223f 100644
--- a/web/app/store/CommonUserAttributes.js
+++ b/web/app/store/CommonUserAttributes.js
@@ -60,7 +60,7 @@ Ext.define('Traccar.store.CommonUserAttributes', {
         valueType: 'boolean'
     }, {
         key: 'distanceUnit',
-        name: Strings.sharedDistance,
+        name: Strings.settingsDistanceUnit,
         valueType: 'string',
         dataType: 'distanceUnit'
     }, {
@@ -70,7 +70,7 @@ Ext.define('Traccar.store.CommonUserAttributes', {
         dataType: 'speedUnit'
     }, {
         key: 'volumeUnit',
-        name: Strings.sharedVolumeUnit,
+        name: Strings.settingsVolumeUnit,
         valueType: 'string',
         dataType: 'volumeUnit'
     }, {
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 596e213..2769698 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -68,7 +68,6 @@
     "sharedTypeNumber": "Number",
     "sharedTypeBoolean": "Boolean",
     "sharedTimezone": "Timezone",
-    "sharedVolumeUnit": "Volume",
     "sharedInfoTitle": "Info",
     "attributeSpeedLimit": "Speed Limit",
     "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
@@ -141,7 +140,9 @@
     "settingsGroups": "Groups",
     "settingsServer": "Server",
     "settingsUsers": "Users",
-    "settingsSpeedUnit": "Speed",
+    "settingsDistanceUnit": "Distance Unit",
+    "settingsSpeedUnit": "Speed Unit",
+    "settingsVolumeUnit": "Volume Unit",
     "settingsTwelveHourFormat": "12-hour Format",
     "settingsCoordinateFormat": "Coordinates Format",
     "reportTitle": "Reports",
-- 
cgit v1.2.3