UI: Change units models

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -3931,7 +3931,7 @@
         "kelvin": "Kelvin",
         "rankine": "Rankine",
         "fahrenheit": "Fahrenheit",
-        "percentage": "Percentage",
+        "percent": "Percent",
         "meter-per-second": "Meter per Second",
         "kilometer-per-hour": "Kilometer per Hour",
         "foot-per-second": "Foot per Second",
@@ -4099,7 +4099,6 @@
         "millimole": "Millimole",
         "kilomole": "Kilomole",
         "mole-per-cubic-meter": "Mole per Cubic Meter",
-        "battery": "Battery",
         "rssi": "RSSI",
         "ppm": "Parts Per Million",
         "ppb": "Parts Per Billion",

ui-ngx/src/assets/model/units.json

@@ -1106,9 +1106,9 @@
             "tags": ["concentration","amount of substance","mole per cubic meter","mol/m³"]
         },
         {
-            "name": "unit.battery",
+            "name": "unit.percent",
             "symbol": "%",
-            "tags": ["power source","state of charge (SoC)","battery","battery level","level","humidity","moisture",
+            "tags": ["power source","state of charge (SoC)","battery","battery level","level","humidity","moisture","percentage",
                 "relative humidity","water content","soil moisture","irrigation","water in soil","soil water content","VWC",
                 "Volumetric Water Content","Total Harmonic Distortion","THD","power quality","UV Transmittance","%"]
         },
@@ -1453,11 +1453,6 @@
             "symbol": "richter",
             "tags": ["earthquake","seismic activity","richter"]
         },
-        {
-            "name": "unit.percentage",
-            "symbol": "%",
-            "tags": ["percentage"]
-        },
         {
             "name": "unit.second",
             "symbol": "s",