diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp
index 34c59d499..9ef7577b2 100644
--- a/radio/src/lua/api_general.cpp
+++ b/radio/src/lua/api_general.cpp
@@ -364,8 +364,7 @@ bool luaFindFieldByName(const char * name, LuaField & field, unsigned int flags)
   field.desc[0] = '\0';
   for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) {
     if (isTelemetryFieldAvailable(i)) {
-      char sensorName[TELEM_LABEL_LEN+1];
-      int len = zchar2str(sensorName, g_model.telemetrySensors[i].label, TELEM_LABEL_LEN);
+      const char* sensorName = g_model.telemetrySensors[i].label;
       if (!strncmp(sensorName, name, len)) {
         if (name[len] == '\0') {
           field.id = MIXSRC_FIRST_TELEM + 3*i;
diff --git a/radio/src/lua/api_model.cpp b/radio/src/lua/api_model.cpp
index 5e8a4bb74..9af0f8b5c 100644
--- a/radio/src/lua/api_model.cpp
+++ b/radio/src/lua/api_model.cpp
@@ -1558,7 +1558,7 @@ static int luaModelGetSensor(lua_State *L)
     TelemetrySensor & sensor = g_model.telemetrySensors[idx];
     lua_newtable(L);
     lua_pushtableinteger(L, "type", sensor.type);
-    lua_pushtablezstring(L, "name", sensor.label);
+    lua_pushtablestring(L, "name", sensor.label);
     lua_pushtableinteger(L, "unit", sensor.unit);
     lua_pushtableinteger(L, "prec", sensor.prec);
     if (sensor.type == TELEM_TYPE_CUSTOM) {
diff --git a/radio/src/lua/interface.cpp b/radio/src/lua/interface.cpp
index 774839300..755c67150 100644
--- a/radio/src/lua/interface.cpp
+++ b/radio/src/lua/interface.cpp
@@ -841,7 +841,7 @@ void luaError(lua_State * L, uint8_t error, bool acknowledge)
     warningType = WARNING_TYPE_INFO;
     popupFunc = displayAcknowledgeLuaError;
 #else
-    POPUP_WARNING(errorTitle, lua_warning_info);
+    displayLuaError(errorTitle);
 #endif
   }
   else {
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index bd913b40d..75057c6c8 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -438,13 +438,6 @@ extern InactivityData inactivity;
 #define ZCHAR_MAX (LEN_STD_CHARS + LEN_SPECIAL_CHARS)
 #endif
 
-char hex2zchar(uint8_t hex);
-char zchar2char(int8_t idx);
-char char2lower(char c);
-int8_t char2zchar(char c);
-void str2zchar(char *dest, const char *src, int size);
-int zchar2str(char *dest, const char *src, int size);
-
 #include "keys.h"
 #include "pwr.h"
 
diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp
index 162a38c98..7777b7335 100644
--- a/radio/src/strhelpers.cpp
+++ b/radio/src/strhelpers.cpp
@@ -29,6 +29,11 @@ char hex2zchar(uint8_t hex)
   return (hex >= 10 ? hex-9 : 27+hex);
 }
 
+char hex2char(uint8_t hex)
+{
+  return (hex >= 10 ? hex-9+'A' : hex+'0');
+}
+
 char zchar2char(int8_t idx)
 {
   if (idx == 0) return ' ';
diff --git a/radio/src/strhelpers.h b/radio/src/strhelpers.h
index 54481a75f..de39c8867 100644
--- a/radio/src/strhelpers.h
+++ b/radio/src/strhelpers.h
@@ -23,6 +23,14 @@
 
 #include "opentx_types.h"
 
+char hex2zchar(uint8_t hex);
+char hex2char(uint8_t hex);
+char zchar2char(int8_t idx);
+char char2lower(char c);
+int8_t char2zchar(char c);
+void str2zchar(char *dest, const char *src, int size);
+int zchar2str(char *dest, const char *src, int size);
+
 char * strAppend(char * dest, const char * source, int len = 0);
 char * strAppendUnsigned(char * dest, uint32_t value, uint8_t digits = 0, uint8_t radix = 10);
 char * strAppendSigned(char * dest, int32_t value, uint8_t digits = 0, uint8_t radix = 10);
diff --git a/radio/src/telemetry/crossfire.cpp b/radio/src/telemetry/crossfire.cpp
index 56ae0e536..2aedd9d50 100644
--- a/radio/src/telemetry/crossfire.cpp
+++ b/radio/src/telemetry/crossfire.cpp
@@ -34,7 +34,7 @@ const CrossfireSensor crossfireSensors[] = {
   {BATTERY_ID,     0, STR_SENSOR_BATT,          UNIT_VOLTS,             1},
   {BATTERY_ID,     1, STR_SENSOR_CURR,          UNIT_AMPS,              1},
   {BATTERY_ID,     2, STR_SENSOR_CAPACITY,      UNIT_MAH,               0},
-  {BATTERY_ID,     3, ZSTR_BATT_PERCENT,  UNIT_PERCENT,           0},
+  {BATTERY_ID,     3, STR_BATT_PERCENT,         UNIT_PERCENT,           0},
   {GPS_ID,         0, STR_SENSOR_GPS,           UNIT_GPS_LATITUDE,      0},
   {GPS_ID,         0, STR_SENSOR_GPS,           UNIT_GPS_LONGITUDE,     0},
   {GPS_ID,         2, STR_SENSOR_GSPD,          UNIT_KMH,               1},
diff --git a/radio/src/telemetry/flysky_ibus.cpp b/radio/src/telemetry/flysky_ibus.cpp
index 4f0fc4450..440a28311 100644
--- a/radio/src/telemetry/flysky_ibus.cpp
+++ b/radio/src/telemetry/flysky_ibus.cpp
@@ -122,8 +122,8 @@ const FlySkySensor flySkySensors[] = {
   {AFHDS2A_ID_FLIGHT_MODE,     STR_SENSOR_FLIGHT_MODE, UNIT_RAW,               0},  // 2 bytes index
   {AFHDS2A_ID_PRES,     STR_SENSOR_PRES,               UNIT_RAW,               2},  // 4 bytes In fact Temperature + Pressure -> Altitude
   {AFHDS2A_ID_PRES | 0x100,    STR_SENSOR_TEMP2,       UNIT_CELSIUS,           1},  // 2 bytes Temperature
-  {AFHDS3_FRM_TEMP,             ZSTR_TEMP2,             UNIT_CELSIUS,                1},  // 2 bytes temperature
-  {AFHDS3_FRM_EXT_V,            ZSTR_TXV,               UNIT_VOLTS,                  2},  // 2 bytes voltage
+  {AFHDS3_FRM_TEMP,             STR_TEMP2,             UNIT_CELSIUS,                1},  // 2 bytes temperature
+  {AFHDS3_FRM_EXT_V,            STR_TXV,               UNIT_VOLTS,                  2},  // 2 bytes voltage
   {AFHDS2A_ID_ODO1,     STR_SENSOR_ODO1,               UNIT_METERS,            2},  // 2 bytes Odometer1 -- some magic with 330 needed
   {AFHDS2A_ID_ODO2,     STR_SENSOR_ODO2,               UNIT_METERS,            2},  // 2 bytes Odometer2 -- some magic with 330 needed
   {AFHDS2A_ID_SPE,             STR_SENSOR_ASPD,        UNIT_KMH,               2},  // 2 bytes Speed km/h -- some magic with 330 needed
@@ -132,8 +132,8 @@ const FlySkySensor flySkySensors[] = {
   {AFHDS2A_ID_GPS_LON,         STR_SENSOR_GPS,         UNIT_RAW,               7},  // 4 bytes signed WGS84 in degrees * 1E7
   {AFHDS2A_ID_GPS_ALT,         STR_SENSOR_GPSALT,      UNIT_METERS,            2},  // 4 bytes signed GPS alt m*100
   {AFHDS2A_ID_ALT,             STR_SENSOR_ALT,         UNIT_METERS,            2},  // 4 bytes signed Alt m*100
-  {AFHDS2A_ID_RX_SIG_AFHDS3,    ZSTR_RX_QUALITY,        UNIT_RAW,                    0},  // RX error rate
-  {AFHDS2A_ID_RX_SNR_AFHDS3,    ZSTR_RX_SNR,            UNIT_DB,                     1},  // RX SNR
+  {AFHDS2A_ID_RX_SIG_AFHDS3,    STR_RX_QUALITY,        UNIT_RAW,                    0},  // RX error rate
+  {AFHDS2A_ID_RX_SNR_AFHDS3,    STR_RX_SNR,            UNIT_DB,                     1},  // RX SNR
   {AFHDS2A_ID_RX_SNR,          STR_SENSOR_RX_SNR,      UNIT_DB,                0},  // RX SNR
   {AFHDS2A_ID_RX_NOISE,        STR_SENSOR_RX_NOISE,    UNIT_DB,                0},  // RX Noise
   {AFHDS2A_ID_RX_RSSI,         STR_SENSOR_RSSI,        UNIT_DB,                0},  // RX RSSI (0xfc)
diff --git a/radio/src/telemetry/frsky_d.cpp b/radio/src/telemetry/frsky_d.cpp
index 9938373d1..caab4ac88 100644
--- a/radio/src/telemetry/frsky_d.cpp
+++ b/radio/src/telemetry/frsky_d.cpp
@@ -328,4 +328,4 @@ void frskyDSetDefault(int index, uint16_t id)
   }
 
   storageDirty(EE_MODEL);
-}
\ No newline at end of file
+}
diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp
index 123945b4c..c4b6cbb0c 100644
--- a/radio/src/telemetry/frsky_sport.cpp
+++ b/radio/src/telemetry/frsky_sport.cpp
@@ -30,7 +30,7 @@ struct FrSkySportSensor {
 };
 
 const FrSkySportSensor sportSensors[] = {
-  { VALID_FRAME_RATE_ID, VALID_FRAME_RATE_ID, 0, ZSTR_VFR, UNIT_PERCENT, 0 },
+  { VALID_FRAME_RATE_ID, VALID_FRAME_RATE_ID, 0, STR_VFR, UNIT_PERCENT, 0 },
   { RSSI_ID, RSSI_ID, 0, STR_SENSOR_RSSI, UNIT_DB, 0 },
 #if defined(MULTIMODULE)
   { TX_RSSI_ID, TX_RSSI_ID, 0, STR_SENSOR_TX_RSSI   , UNIT_DB , 0 },
@@ -85,19 +85,19 @@ const FrSkySportSensor sportSensors[] = {
   { GASSUIT_AVG_FLOW_FIRST_ID, GASSUIT_AVG_FLOW_LAST_ID, 0, STR_SENSOR_GASSUIT_AVG_FLOW, UNIT_MILLILITERS_PER_MINUTE, 0 },
   { SBEC_POWER_FIRST_ID, SBEC_POWER_LAST_ID, 0, STR_SENSOR_SBEC_VOLTAGE, UNIT_VOLTS, 2 },
   { SBEC_POWER_FIRST_ID, SBEC_POWER_LAST_ID, 1, STR_SENSOR_SBEC_CURRENT, UNIT_AMPS, 2 },
-  { RB3040_OUTPUT_FIRST_ID, RB3040_OUTPUT_LAST_ID, 0, ZSTR_RB3040_EXTRA_STATE, UNIT_BITFIELD, 0 },
-  { RB3040_CH1_2_FIRST_ID, RB3040_CH1_2_LAST_ID, 0, ZSTR_RB3040_CHANNEL1, UNIT_AMPS, 2 },
-  { RB3040_CH1_2_FIRST_ID, RB3040_CH1_2_LAST_ID, 1, ZSTR_RB3040_CHANNEL2, UNIT_AMPS, 2 },
-  { RB3040_CH3_4_FIRST_ID, RB3040_CH3_4_LAST_ID, 0, ZSTR_RB3040_CHANNEL3, UNIT_AMPS, 2 },
-  { RB3040_CH3_4_FIRST_ID, RB3040_CH3_4_LAST_ID, 1, ZSTR_RB3040_CHANNEL4, UNIT_AMPS, 2 },
-  { RB3040_CH5_6_FIRST_ID, RB3040_CH5_6_LAST_ID, 0, ZSTR_RB3040_CHANNEL5, UNIT_AMPS, 2 },
-  { RB3040_CH5_6_FIRST_ID, RB3040_CH5_6_LAST_ID, 1, ZSTR_RB3040_CHANNEL6, UNIT_AMPS, 2 },
-  { RB3040_CH7_8_FIRST_ID, RB3040_CH7_8_LAST_ID, 0, ZSTR_RB3040_CHANNEL7, UNIT_AMPS, 2 },
-  { RB3040_CH7_8_FIRST_ID, RB3040_CH7_8_LAST_ID, 1, ZSTR_RB3040_CHANNEL8, UNIT_AMPS, 2 },
-  { SERVO_FIRST_ID, SERVO_LAST_ID, 0, ZSTR_SERVO_CURRENT, UNIT_AMPS, 1 },
-  { SERVO_FIRST_ID, SERVO_LAST_ID, 1, ZSTR_SERVO_VOLTAGE, UNIT_VOLTS, 1 },
-  { SERVO_FIRST_ID, SERVO_LAST_ID, 2, ZSTR_SERVO_TEMPERATURE, UNIT_CELSIUS, 0 },
-  { SERVO_FIRST_ID, SERVO_LAST_ID, 3, ZSTR_SERVO_STATUS, UNIT_TEXT, 0 },
+  { RB3040_OUTPUT_FIRST_ID, RB3040_OUTPUT_LAST_ID, 0, STR_RB3040_EXTRA_STATE, UNIT_BITFIELD, 0 },
+  { RB3040_CH1_2_FIRST_ID, RB3040_CH1_2_LAST_ID, 0, STR_RB3040_CHANNEL1, UNIT_AMPS, 2 },
+  { RB3040_CH1_2_FIRST_ID, RB3040_CH1_2_LAST_ID, 1, STR_RB3040_CHANNEL2, UNIT_AMPS, 2 },
+  { RB3040_CH3_4_FIRST_ID, RB3040_CH3_4_LAST_ID, 0, STR_RB3040_CHANNEL3, UNIT_AMPS, 2 },
+  { RB3040_CH3_4_FIRST_ID, RB3040_CH3_4_LAST_ID, 1, STR_RB3040_CHANNEL4, UNIT_AMPS, 2 },
+  { RB3040_CH5_6_FIRST_ID, RB3040_CH5_6_LAST_ID, 0, STR_RB3040_CHANNEL5, UNIT_AMPS, 2 },
+  { RB3040_CH5_6_FIRST_ID, RB3040_CH5_6_LAST_ID, 1, STR_RB3040_CHANNEL6, UNIT_AMPS, 2 },
+  { RB3040_CH7_8_FIRST_ID, RB3040_CH7_8_LAST_ID, 0, STR_RB3040_CHANNEL7, UNIT_AMPS, 2 },
+  { RB3040_CH7_8_FIRST_ID, RB3040_CH7_8_LAST_ID, 1, STR_RB3040_CHANNEL8, UNIT_AMPS, 2 },
+  { SERVO_FIRST_ID, SERVO_LAST_ID, 0, STR_SERVO_CURRENT, UNIT_AMPS, 1 },
+  { SERVO_FIRST_ID, SERVO_LAST_ID, 1, STR_SERVO_VOLTAGE, UNIT_VOLTS, 1 },
+  { SERVO_FIRST_ID, SERVO_LAST_ID, 2, STR_SERVO_TEMPERATURE, UNIT_CELSIUS, 0 },
+  { SERVO_FIRST_ID, SERVO_LAST_ID, 3, STR_SERVO_STATUS, UNIT_TEXT, 0 },
   { 0, 0, 0, nullptr, UNIT_RAW, 0 } // sentinel
 };
 
diff --git a/radio/src/telemetry/ghost.cpp b/radio/src/telemetry/ghost.cpp
index 8b949b69a..0f7fbfc66 100755
--- a/radio/src/telemetry/ghost.cpp
+++ b/radio/src/telemetry/ghost.cpp
@@ -59,30 +59,30 @@ enum
 };
 
 const GhostSensor ghostSensors[] = {
-  {GHOST_ID_RX_RSSI,         ZSTR_RSSI,             UNIT_DB,                0},
-  {GHOST_ID_RX_LQ,           ZSTR_RX_QUALITY,       UNIT_PERCENT,           0},
-  {GHOST_ID_RX_SNR,          ZSTR_RX_SNR,           UNIT_DB,                0},
+  {GHOST_ID_RX_RSSI,         STR_RSSI,             UNIT_DB,                0},
+  {GHOST_ID_RX_LQ,           STR_RX_QUALITY,       UNIT_PERCENT,           0},
+  {GHOST_ID_RX_SNR,          STR_RX_SNR,           UNIT_DB,                0},
 
-  {GHOST_ID_FRAME_RATE,      ZSTR_FRAME_RATE,       UNIT_RAW,               0},
-  {GHOST_ID_TX_POWER,        ZSTR_TX_POWER,         UNIT_MILLIWATTS,        0},
-  {GHOST_ID_RF_MODE,         ZSTR_RF_MODE,          UNIT_TEXT,              0},
-  {GHOST_ID_TOTAL_LATENCY,   ZSTR_TOTAL_LATENCY,    UNIT_RAW,               0},
+  {GHOST_ID_FRAME_RATE,      STR_FRAME_RATE,       UNIT_RAW,               0},
+  {GHOST_ID_TX_POWER,        STR_TX_POWER,         UNIT_MILLIWATTS,        0},
+  {GHOST_ID_RF_MODE,         STR_RF_MODE,          UNIT_TEXT,              0},
+  {GHOST_ID_TOTAL_LATENCY,   STR_TOTAL_LATENCY,    UNIT_RAW,               0},
 
-  {GHOST_ID_VTX_FREQ,        ZSTR_VTX_FREQ,         UNIT_RAW,               0},
-  {GHOST_ID_VTX_POWER,       ZSTR_VTX_PWR,          UNIT_RAW,               0},
-  {GHOST_ID_VTX_CHAN,        ZSTR_VTX_CHAN,         UNIT_RAW,               0},
-  {GHOST_ID_VTX_BAND,        ZSTR_VTX_BAND,         UNIT_TEXT,              0},
+  {GHOST_ID_VTX_FREQ,        STR_VTX_FREQ,         UNIT_RAW,               0},
+  {GHOST_ID_VTX_POWER,       STR_VTX_PWR,          UNIT_RAW,               0},
+  {GHOST_ID_VTX_CHAN,        STR_VTX_CHAN,         UNIT_RAW,               0},
+  {GHOST_ID_VTX_BAND,        STR_VTX_BAND,         UNIT_TEXT,              0},
 
-  {GHOST_ID_PACK_VOLTS,      ZSTR_BATT,             UNIT_VOLTS,             2},
-  {GHOST_ID_PACK_AMPS,       ZSTR_CURR,             UNIT_AMPS,              2},
-  {GHOST_ID_PACK_MAH,        ZSTR_CAPACITY,         UNIT_MAH,               0},
+  {GHOST_ID_PACK_VOLTS,      STR_BATT,             UNIT_VOLTS,             2},
+  {GHOST_ID_PACK_AMPS,       STR_CURR,             UNIT_AMPS,              2},
+  {GHOST_ID_PACK_MAH,        STR_CAPACITY,         UNIT_MAH,               0},
 
-  {GHOST_ID_GPS_LAT,         ZSTR_GPS,              UNIT_GPS_LATITUDE,      0},
-  {GHOST_ID_GPS_LONG,        ZSTR_GPS,              UNIT_GPS_LONGITUDE,     0},
-  {GHOST_ID_GPS_GSPD,        ZSTR_GSPD,             UNIT_KMH,               1},
-  {GHOST_ID_GPS_HDG,         ZSTR_HDG,              UNIT_DEGREE,            3},
-  {GHOST_ID_GPS_ALT,         ZSTR_ALT,              UNIT_METERS,            0},
-  {GHOST_ID_GPS_SATS,        ZSTR_SATELLITES,       UNIT_RAW,               0},
+  {GHOST_ID_GPS_LAT,         STR_GPS,              UNIT_GPS_LATITUDE,      0},
+  {GHOST_ID_GPS_LONG,        STR_GPS,              UNIT_GPS_LONGITUDE,     0},
+  {GHOST_ID_GPS_GSPD,        STR_GSPD,             UNIT_KMH,               1},
+  {GHOST_ID_GPS_HDG,         STR_HDG,              UNIT_DEGREE,            3},
+  {GHOST_ID_GPS_ALT,         STR_ALT,              UNIT_METERS,            0},
+  {GHOST_ID_GPS_SATS,        STR_SATELLITES,       UNIT_RAW,               0},
 
   {0x00,                     NULL,                  UNIT_RAW,               0},
 };
@@ -101,12 +101,15 @@ void processGhostTelemetryValue(uint8_t index, int32_t value)
   if (!TELEMETRY_STREAMING())
     return;
 
-  const GhostSensor * sensor = getGhostSensor(index);
-  uint16_t id = sensor->id;
-  if (id == GHOST_ID_GPS_LONG) {
-    id = GHOST_ID_GPS_LAT; 
+  const GhostSensor *sensor = getGhostSensor(index);
+  if (sensor) {
+    uint16_t id = sensor->id;
+    if (id == GHOST_ID_GPS_LONG) {
+      id = GHOST_ID_GPS_LAT;
+    }
+    setTelemetryValue(PROTOCOL_TELEMETRY_GHOST, id, 0, 0, value, sensor->unit,
+                      sensor->precision);
   }
-  setTelemetryValue(PROTOCOL_TELEMETRY_GHOST, id, 0, 0, value, sensor->unit, sensor->precision);
 }
 
 void processGhostTelemetryValueString(const GhostSensor * sensor, const char * str)
diff --git a/radio/src/telemetry/hott.cpp b/radio/src/telemetry/hott.cpp
index 6d7020f40..b974096ca 100644
--- a/radio/src/telemetry/hott.cpp
+++ b/radio/src/telemetry/hott.cpp
@@ -108,30 +108,30 @@ const HottSensor hottSensors[] = {
   //HOTT_TELEM_RX
   {HOTT_ID_RX_VOLTAGE,   STR_SENSOR_BATT,               UNIT_VOLTS,             1},  // RX_Batt Voltage
   {HOTT_ID_TEMP1,        STR_SENSOR_TEMP1,              UNIT_CELSIUS,           0},  // Temperature sensor 1
-  {HOTT_ID_TEMP2,        ZSTR_TEMP2,              UNIT_CELSIUS,           0},  // Temperature sensor 2
-  {HOTT_ID_VARIO,        ZSTR_VSPD,               UNIT_METERS_PER_SECOND, 2},  // Vario sensor
-  {HOTT_ID_ALT,          ZSTR_ALT,                UNIT_METERS,            0},  // Alt sensor
-  {HOTT_ID_HDG,          ZSTR_HDG,                UNIT_DEGREE,            0},  // Heading sensor
-  {HOTT_ID_GSPD,         ZSTR_GSPD,               UNIT_KMH,               0},  // Ground speed sensor
-  {HOTT_ID_GPS_LAT_LONG, ZSTR_GPS,                UNIT_GPS,               0},  // GPS position
-  {HOTT_ID_GPS_COUNT,    ZSTR_SATELLITES,         UNIT_RAW,               0},  // GPS sat count
-  {HOTT_ID_VOLT1,        ZSTR_A1,                 UNIT_VOLTS,             1},  // Voltage sensor 1
-  {HOTT_ID_VOLT2,        ZSTR_A2,                 UNIT_VOLTS,             1},  // Voltage sensor 2
-  {HOTT_ID_VOLT3,        ZSTR_A3,                 UNIT_VOLTS,             1},  // Voltage sensor 3
-  {HOTT_ID_AMP1,         ZSTR_CURR,               UNIT_AMPS,              1},  // Amp sensor 1
-  {HOTT_ID_AMP2,         ZSTR_CURR,               UNIT_AMPS,              1},  // Amp sensor 2
-  {HOTT_ID_RPM1,         ZSTR_RPM,                UNIT_RPMS,              0},  // RPM1
-  {HOTT_ID_RPM2,         ZSTR_RPM2,               UNIT_RPMS,              0},  // RPM2
-  {HOTT_ID_ESC_VIN,      ZSTR_ESC_VIN,            UNIT_VOLTS,             1},  // ESC VIN
-  {HOTT_ID_BCAPA,        ZSTR_SMART_BAT_CAPACITY, UNIT_MAH,               0},  // Batt Capa
-  {HOTT_ID_ESC_CUR,      ZSTR_ESC_CUR,            UNIT_AMPS,              1},  // ESC Amp
-  {HOTT_ID_ESC_TBEC,     ZSTR_ESC_TBEC,           UNIT_CELSIUS,           0},  // ESC BEC Temp
-  {HOTT_ID_ESC_BCUR,     ZSTR_ESC_BCUR,           UNIT_AMPS,              1},  // ESC BEC Amp
-  {HOTT_ID_ESC_VBEC,     ZSTR_ESC_VBEC,           UNIT_VOLTS,             1},  // ESC BEC Volt
-  {HOTT_ID_CELS,         ZSTR_CELLS,              UNIT_CELLS,             2},  // Batt cells
-  {HOTT_ID_CELS_H,       ZSTR_CELLS,              UNIT_CELLS,             2},  // Batt H cells
-  {HOTT_ID_AIR_SPEED,    ZSTR_ASPD,               UNIT_KMH,               0},  // Air speed
-  {HOTT_ID_FUEL,         ZSTR_FUEL,               UNIT_PERCENT,           0},  // Fuel
+  {HOTT_ID_TEMP2,        STR_TEMP2,              UNIT_CELSIUS,           0},  // Temperature sensor 2
+  {HOTT_ID_VARIO,        STR_VSPD,               UNIT_METERS_PER_SECOND, 2},  // Vario sensor
+  {HOTT_ID_ALT,          STR_ALT,                UNIT_METERS,            0},  // Alt sensor
+  {HOTT_ID_HDG,          STR_HDG,                UNIT_DEGREE,            0},  // Heading sensor
+  {HOTT_ID_GSPD,         STR_GSPD,               UNIT_KMH,               0},  // Ground speed sensor
+  {HOTT_ID_GPS_LAT_LONG, STR_GPS,                UNIT_GPS,               0},  // GPS position
+  {HOTT_ID_GPS_COUNT,    STR_SATELLITES,         UNIT_RAW,               0},  // GPS sat count
+  {HOTT_ID_VOLT1,        STR_A1,                 UNIT_VOLTS,             1},  // Voltage sensor 1
+  {HOTT_ID_VOLT2,        STR_A2,                 UNIT_VOLTS,             1},  // Voltage sensor 2
+  {HOTT_ID_VOLT3,        STR_A3,                 UNIT_VOLTS,             1},  // Voltage sensor 3
+  {HOTT_ID_AMP1,         STR_CURR,               UNIT_AMPS,              1},  // Amp sensor 1
+  {HOTT_ID_AMP2,         STR_CURR,               UNIT_AMPS,              1},  // Amp sensor 2
+  {HOTT_ID_RPM1,         STR_RPM,                UNIT_RPMS,              0},  // RPM1
+  {HOTT_ID_RPM2,         STR_RPM2,               UNIT_RPMS,              0},  // RPM2
+  {HOTT_ID_ESC_VIN,      STR_ESC_VIN,            UNIT_VOLTS,             1},  // ESC VIN
+  {HOTT_ID_BCAPA,        STR_SMART_BAT_CAPACITY, UNIT_MAH,               0},  // Batt Capa
+  {HOTT_ID_ESC_CUR,      STR_ESC_CUR,            UNIT_AMPS,              1},  // ESC Amp
+  {HOTT_ID_ESC_TBEC,     STR_ESC_TBEC,           UNIT_CELSIUS,           0},  // ESC BEC Temp
+  {HOTT_ID_ESC_BCUR,     STR_ESC_BCUR,           UNIT_AMPS,              1},  // ESC BEC Amp
+  {HOTT_ID_ESC_VBEC,     STR_ESC_VBEC,           UNIT_VOLTS,             1},  // ESC BEC Volt
+  {HOTT_ID_CELS,         STR_CELLS,              UNIT_CELLS,             2},  // Batt cells
+  {HOTT_ID_CELS_H,       STR_CELLS,              UNIT_CELLS,             2},  // Batt H cells
+  {HOTT_ID_AIR_SPEED,    STR_ASPD,               UNIT_KMH,               0},  // Air speed
+  {HOTT_ID_FUEL,         STR_FUEL,               UNIT_PERCENT,           0},  // Fuel
 
   {HOTT_TX_RSSI_ID,      STR_SENSOR_TX_RSSI,            UNIT_DB,                0},  // Pseudo id outside 1 byte range of Hott sensors
   {HOTT_TX_LQI_ID,       STR_SENSOR_TX_QUALITY,         UNIT_RAW,               0},  // Pseudo id outside 1 byte range of Hott sensors
diff --git a/radio/src/telemetry/mlink.cpp b/radio/src/telemetry/mlink.cpp
index a7cdccb92..6d4c217eb 100644
--- a/radio/src/telemetry/mlink.cpp
+++ b/radio/src/telemetry/mlink.cpp
@@ -24,23 +24,23 @@ struct MLinkSensor
 };
 
 const MLinkSensor mlinkSensors[] = {
-  {MLINK_RX_VOLTAGE,      ZSTR_BATT,              UNIT_VOLTS,             1},
-  {MLINK_VOLTAGE,         ZSTR_VFAS,              UNIT_VOLTS,             1},
-  {MLINK_CURRENT,         ZSTR_CURR,              UNIT_AMPS,              1},
-  {MLINK_VARIO,           ZSTR_VSPD,              UNIT_METERS_PER_SECOND, 1},
-  {MLINK_SPEED,           ZSTR_SPEED,             UNIT_KMH,               1},
-  {MLINK_RPM,             ZSTR_RPM,               UNIT_RPMS,              0},
-  {MLINK_TEMP,            ZSTR_TEMP1,             UNIT_CELSIUS,           1},
-  {MLINK_HEADING,         ZSTR_HDG,               UNIT_DEGREE,            1},
-  {MLINK_ALT,             ZSTR_ALT ,              UNIT_METERS,            0},
-  {MLINK_FUEL,            ZSTR_FUEL,              UNIT_PERCENT,           0},
-  {MLINK_CAPACITY,        ZSTR_CAPACITY,          UNIT_MAH,               0},
-  {MLINK_FLOW,            ZSTR_FLOW,              UNIT_MILLILITERS,       0},
-  {MLINK_DISTANCE,        ZSTR_DIST,              UNIT_KM,                1},
-  {MLINK_LQI,             ZSTR_RSSI,              UNIT_RAW,               0},
-  {MLINK_LOSS,            ZSTR_LOSS,              UNIT_RAW,               0},
-  {MLINK_TX_RSSI,         ZSTR_TX_RSSI,           UNIT_RAW,               0},
-  {MLINK_TX_LQI,          ZSTR_TX_QUALITY,        UNIT_RAW,               0},
+  {MLINK_RX_VOLTAGE,      STR_BATT,              UNIT_VOLTS,             1},
+  {MLINK_VOLTAGE,         STR_VFAS,              UNIT_VOLTS,             1},
+  {MLINK_CURRENT,         STR_CURR,              UNIT_AMPS,              1},
+  {MLINK_VARIO,           STR_VSPD,              UNIT_METERS_PER_SECOND, 1},
+  {MLINK_SPEED,           STR_SPEED,             UNIT_KMH,               1},
+  {MLINK_RPM,             STR_RPM,               UNIT_RPMS,              0},
+  {MLINK_TEMP,            STR_TEMP1,             UNIT_CELSIUS,           1},
+  {MLINK_HEADING,         STR_HDG,               UNIT_DEGREE,            1},
+  {MLINK_ALT,             STR_ALT ,              UNIT_METERS,            0},
+  {MLINK_FUEL,            STR_FUEL,              UNIT_PERCENT,           0},
+  {MLINK_CAPACITY,        STR_CAPACITY,          UNIT_MAH,               0},
+  {MLINK_FLOW,            STR_FLOW,              UNIT_MILLILITERS,       0},
+  {MLINK_DISTANCE,        STR_DIST,              UNIT_KM,                1},
+  {MLINK_LQI,             STR_RSSI,              UNIT_RAW,               0},
+  {MLINK_LOSS,            STR_LOSS,              UNIT_RAW,               0},
+  {MLINK_TX_RSSI,         STR_TX_RSSI,           UNIT_RAW,               0},
+  {MLINK_TX_LQI,          STR_TX_QUALITY,        UNIT_RAW,               0},
 };
 
 const MLinkSensor * getMLinkSensor(uint16_t id)
diff --git a/radio/src/telemetry/spektrum.cpp b/radio/src/telemetry/spektrum.cpp
index b3cda5845..3b54f75b8 100644
--- a/radio/src/telemetry/spektrum.cpp
+++ b/radio/src/telemetry/spektrum.cpp
@@ -167,15 +167,15 @@ const SpektrumSensor spektrumSensors[] = {
   {0x1b,             4,  int16,     STR_SENSOR_YAW,               UNIT_DEGREE,                 1},
 
   // {0x20, esc},  Smart ESC telemetry
-  {I2C_ESC,          0,  uint16,    ZSTR_ESC_RPM,           UNIT_RPMS,                   0},
-  {I2C_ESC,          2,  uint16,    ZSTR_ESC_VIN,           UNIT_VOLTS,                  2},
-  {I2C_ESC,          4,  uint16,    ZSTR_ESC_TFET,          UNIT_CELSIUS,                1},
-  {I2C_ESC,          6,  uint16,    ZSTR_ESC_CUR,           UNIT_MAH,                    1},
-  {I2C_ESC,          8,  uint16,    ZSTR_ESC_TBEC,          UNIT_CELSIUS,                1},
-  {I2C_ESC,          10, uint8,     ZSTR_ESC_BCUR,          UNIT_AMPS,                   1},
-  {I2C_ESC,          11, uint8,     ZSTR_ESC_VBEC,          UNIT_VOLTS,                  2},
-  {I2C_ESC,          12, uint8,     ZSTR_ESC_THR,           UNIT_PERCENT,                1},
-  {I2C_ESC,          13, uint8,     ZSTR_ESC_POUT,          UNIT_PERCENT,                1},
+  {I2C_ESC,          0,  uint16,    STR_ESC_RPM,           UNIT_RPMS,                   0},
+  {I2C_ESC,          2,  uint16,    STR_ESC_VIN,           UNIT_VOLTS,                  2},
+  {I2C_ESC,          4,  uint16,    STR_ESC_TFET,          UNIT_CELSIUS,                1},
+  {I2C_ESC,          6,  uint16,    STR_ESC_CUR,           UNIT_MAH,                    1},
+  {I2C_ESC,          8,  uint16,    STR_ESC_TBEC,          UNIT_CELSIUS,                1},
+  {I2C_ESC,          10, uint8,     STR_ESC_BCUR,          UNIT_AMPS,                   1},
+  {I2C_ESC,          11, uint8,     STR_ESC_VBEC,          UNIT_VOLTS,                  2},
+  {I2C_ESC,          12, uint8,     STR_ESC_THR,           UNIT_PERCENT,                1},
+  {I2C_ESC,          13, uint8,     STR_ESC_POUT,          UNIT_PERCENT,                1},
 
   // Dual Cell monitor (0x34)
   {0x34,             0,  int16,     STR_SENSOR_BATT1_CURRENT,     UNIT_AMPS,                   1},
@@ -203,45 +203,45 @@ const SpektrumSensor spektrumSensors[] = {
   {0x40,             2,  int16,     STR_SENSOR_VSPD,              UNIT_METERS_PER_SECOND,      1},
 
   // Smartbat
-  //{I2C_SMART_BAT_REALTIME,        1,  int8,      ZSTR_SMART_BAT_BTMP,    UNIT_CELSIUS,             0},  // disabled because sensor is a duplicate of cells sensors ones
-  {I2C_SMART_BAT_REALTIME,        2,  uint32le,  ZSTR_SMART_BAT_BCUR,    UNIT_MAH,                 0},
-  {I2C_SMART_BAT_REALTIME,        6,  uint16le,  ZSTR_SMART_BAT_BCAP,    UNIT_MAH,                 0},
-  {I2C_SMART_BAT_REALTIME,        8,  uint16le,  ZSTR_SMART_BAT_MIN_CEL, UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_REALTIME,        10,  uint16le, ZSTR_SMART_BAT_MAX_CEL, UNIT_VOLTS,               2},
+  //{I2C_SMART_BAT_REALTIME,        1,  int8,      STR_SMART_BAT_BTMP,    UNIT_CELSIUS,             0},  // disabled because sensor is a duplicate of cells sensors ones
+  {I2C_SMART_BAT_REALTIME,        2,  uint32le,  STR_SMART_BAT_BCUR,    UNIT_MAH,                 0},
+  {I2C_SMART_BAT_REALTIME,        6,  uint16le,  STR_SMART_BAT_BCAP,    UNIT_MAH,                 0},
+  {I2C_SMART_BAT_REALTIME,        8,  uint16le,  STR_SMART_BAT_MIN_CEL, UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_REALTIME,        10,  uint16le, STR_SMART_BAT_MAX_CEL, UNIT_VOLTS,               2},
   //{I2C_SMART_BAT_REALTIME,          12,  uint16le,  "RFU[2]", UNIT_RAW,                 0},   // disabled to save sensors slots
 
-  {I2C_SMART_BAT_CELLS_1_6,       1,  int8,      ZSTR_SMART_BAT_BTMP,   UNIT_CELSIUS,             0},
-  {I2C_SMART_BAT_CELLS_1_6,       2,  uint16le,  ZSTR_CL01,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_1_6,       4,  uint16le,  ZSTR_CL02,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_1_6,       6,  uint16le,  ZSTR_CL03,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_1_6,       8,  uint16le,  ZSTR_CL04,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_1_6,       10,  uint16le,  ZSTR_CL05,            UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_1_6,       12, uint16le,  ZSTR_CL06,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_1_6,       1,  int8,      STR_SMART_BAT_BTMP,   UNIT_CELSIUS,             0},
+  {I2C_SMART_BAT_CELLS_1_6,       2,  uint16le,  STR_CL01,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_1_6,       4,  uint16le,  STR_CL02,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_1_6,       6,  uint16le,  STR_CL03,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_1_6,       8,  uint16le,  STR_CL04,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_1_6,       10,  uint16le,  STR_CL05,            UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_1_6,       12, uint16le,  STR_CL06,             UNIT_VOLTS,               2},
 
-  {I2C_SMART_BAT_CELLS_7_12,      1,  int8,      ZSTR_SMART_BAT_BTMP,   UNIT_CELSIUS,             0},
-  {I2C_SMART_BAT_CELLS_7_12,      2,  uint16le,  ZSTR_CL07,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_7_12,      4,  uint16le,  ZSTR_CL08,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_7_12,      6,  uint16le,  ZSTR_CL09,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_7_12,      8,  uint16le,  ZSTR_CL10,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_7_12,      10,  uint16le,  ZSTR_CL11,            UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_7_12,      12, uint16le,  ZSTR_CL12,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_7_12,      1,  int8,      STR_SMART_BAT_BTMP,   UNIT_CELSIUS,             0},
+  {I2C_SMART_BAT_CELLS_7_12,      2,  uint16le,  STR_CL07,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_7_12,      4,  uint16le,  STR_CL08,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_7_12,      6,  uint16le,  STR_CL09,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_7_12,      8,  uint16le,  STR_CL10,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_7_12,      10,  uint16le,  STR_CL11,            UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_7_12,      12, uint16le,  STR_CL12,             UNIT_VOLTS,               2},
 
-  {I2C_SMART_BAT_CELLS_13_18,     1,  int8,      ZSTR_SMART_BAT_BTMP,   UNIT_CELSIUS,             0},
-  {I2C_SMART_BAT_CELLS_13_18,     2,  uint16le,  ZSTR_CL13,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_13_18,     4,  uint16le,  ZSTR_CL14,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_13_18,     6,  uint16le,  ZSTR_CL15,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_13_18,     8,  uint16le,  ZSTR_CL16,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_13_18,     10, uint16le,  ZSTR_CL17,             UNIT_VOLTS,               2},
-  {I2C_SMART_BAT_CELLS_13_18,     12, uint16le,  ZSTR_CL18,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_13_18,     1,  int8,      STR_SMART_BAT_BTMP,   UNIT_CELSIUS,             0},
+  {I2C_SMART_BAT_CELLS_13_18,     2,  uint16le,  STR_CL13,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_13_18,     4,  uint16le,  STR_CL14,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_13_18,     6,  uint16le,  STR_CL15,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_13_18,     8,  uint16le,  STR_CL16,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_13_18,     10, uint16le,  STR_CL17,             UNIT_VOLTS,               2},
+  {I2C_SMART_BAT_CELLS_13_18,     12, uint16le,  STR_CL18,             UNIT_VOLTS,               2},
 
   //{I2C_SMART_BAT_ID,              1,  uint8,  "chemistery",  UNIT_RAW, 0},   // disabled to save sensors slots
   //{I2C_SMART_BAT_ID,              2,  uint8,  "number of cells",  UNIT_RAW, 0},   // disabled to save sensors slots
   //{I2C_SMART_BAT_ID,              3,  uint8,  "manufacturer code",  UNIT_RAW, 0},   // disabled to save sensors slots
-  {I2C_SMART_BAT_ID,              4,  uint16le,  ZSTR_SMART_BAT_CYCLES,  UNIT_RAW,                 0},
+  {I2C_SMART_BAT_ID,              4,  uint16le,  STR_SMART_BAT_CYCLES,  UNIT_RAW,                 0},
   //{I2C_SMART_BAT_ID,              6,  uint8,  "uniqueID[8]",  UNIT_RAW, 0},   // disabled to save sensors slots
 
   //{I2C_SMART_BAT_LIMITS,          1,  uint8,  "rfu",  UNIT_RAW, 0},   // disabled to save sensors slots
-  {I2C_SMART_BAT_LIMITS,          2,  uint16le,  ZSTR_SMART_BAT_CAPACITY,UNIT_MAH,                 0},
+  {I2C_SMART_BAT_LIMITS,          2,  uint16le,  STR_SMART_BAT_CAPACITY,UNIT_MAH,                 0},
   //{I2C_SMART_BAT_LIMITS,          4,  uint16le,  "dischargeCurrentRating",  UNIT_RAW, 0},   // disabled to save sensors slots
   //{I2C_SMART_BAT_LIMITS,          6,  uint16le,  "overDischarge_mV",  UNIT_RAW, 0},   // disabled to save sensors slots
   //{I2C_SMART_BAT_LIMITS,          8,  uint16le,  "zeroCapacity_mV",  UNIT_RAW, 0},   // disabled to save sensors slots
diff --git a/radio/src/telemetry/telemetry_sensors.cpp b/radio/src/telemetry/telemetry_sensors.cpp
index 92f51e8c4..c8ddb98f3 100644
--- a/radio/src/telemetry/telemetry_sensors.cpp
+++ b/radio/src/telemetry/telemetry_sensors.cpp
@@ -510,11 +510,17 @@ int setTelemetryValue(TelemetryProtocol protocol, uint16_t id, uint8_t subId, ui
   bool sensorFound = false;
 
   for (int index = 0; index < MAX_TELEMETRY_SENSORS; index++) {
-    TelemetrySensor & telemetrySensor = g_model.telemetrySensors[index];
-    if (telemetrySensor.type == TELEM_TYPE_CUSTOM && telemetrySensor.id == id && telemetrySensor.subId == subId && (telemetrySensor.isSameInstance(protocol, instance) || g_model.ignoreSensorIds)) {
+    TelemetrySensor &telemetrySensor = g_model.telemetrySensors[index];
+
+    if (telemetrySensor.type == TELEM_TYPE_CUSTOM && telemetrySensor.id == id &&
+        telemetrySensor.subId == subId &&
+        (telemetrySensor.isSameInstance(protocol, instance) ||
+         g_model.ignoreSensorIds)) {
+
       telemetryItems[index].setValue(telemetrySensor, value, unit, prec);
       sensorFound = true;
-      // we continue search here, because sensors can share the same id and instance
+      // we continue search here, because sensors can share the same id and
+      // instance
     }
   }
 
@@ -614,11 +620,11 @@ void TelemetrySensor::init(const char * label, uint8_t unit, uint8_t prec)
 
 void TelemetrySensor::init(uint16_t id)
 {
-  char label[4];
-  label[0] = hex2zchar((id & 0xf000) >> 12);
-  label[1] = hex2zchar((id & 0x0f00) >> 8);
-  label[2] = hex2zchar((id & 0x00f0) >> 4);
-  label[3] = hex2zchar((id & 0x000f) >> 0);
+  char label[TELEM_LABEL_LEN]; // 4
+  label[0] = hex2char((id & 0x0f00) >> 8);
+  label[1] = hex2char((id & 0x00f0) >> 4);
+  label[2] = hex2char((id & 0x000f) >> 0);
+  label[3] = '\0';
   init(label);
 }
 
diff --git a/radio/src/translations/cn.h.txt b/radio/src/translations/cn.h.txt
index ca945f4c8..b1577ab32 100644
--- a/radio/src/translations/cn.h.txt
+++ b/radio/src/translations/cn.h.txt
@@ -1159,161 +1159,157 @@
 #define TR_AUTH_FAILURE                "验证失败"
 #define TR_RACING_MODE                 "Racing mode"
 
-#define ZSTR_VFR                       "VFR"
-#define ZSTR_RSSI                      "RSSI"
-#define ZSTR_R9PW                      "R9PW"
-#define ZSTR_RAS                       "SWR"
-#define ZSTR_A1                        "A1"
-#define ZSTR_A2                        "A2"
-#define ZSTR_A3                        "A3"
-#define ZSTR_A4                        "A4"
-#define ZSTR_BATT                      "RxBt"
-#define ZSTR_ALT                       "Alt"
-#define ZSTR_TEMP1                     "Tmp1"
-#define ZSTR_TEMP2                     "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM                       "RPM"
-#define ZSTR_FUEL                      "Fuel"
-#define ZSTR_VSPD                      "VSpd"
-#define ZSTR_ACCX                      "AccX"
-#define ZSTR_ACCY                      "AccY"
-#define ZSTR_ACCZ                      "AccZ"
-#define ZSTR_GYROX                     "GYRX"
-#define ZSTR_GYROY                     "GYRY"
-#define ZSTR_GYROZ                     "GYRZ"
-#define ZSTR_CURR                      "Curr"
-#define ZSTR_CAPACITY                  "Capa"
-#define ZSTR_VFAS                      "VFAS"
-#define ZSTR_BATT_PERCENT              "Bat%"
-#define ZSTR_ASPD                      "ASpd"
-#define ZSTR_GSPD                      "GSpd"
-#define ZSTR_HDG                       "Hdg"
-#define ZSTR_SATELLITES                "Sats"
-#define ZSTR_CELLS                     "Cels"
-#define ZSTR_GPSALT                    "GAlt"
-#define ZSTR_GPSDATETIME               "Date"
-#define ZSTR_GPS                       "GPS"
-#define ZSTR_BATT1_VOLTAGE             "RB1V"
-#define ZSTR_BATT2_VOLTAGE             "RB2V"
-#define ZSTR_BATT1_CURRENT             "RB1A"
-#define ZSTR_BATT2_CURRENT             "RB2A"
-#define ZSTR_BATT1_CONSUMPTION         "RB1C"
-#define ZSTR_BATT2_CONSUMPTION         "RB2C"
-#define ZSTR_BATT1_TEMP                "RB1T"
-#define ZSTR_BATT2_TEMP                "RB2T"
-#define ZSTR_RB_STATE                  "RBS"
-#define ZSTR_CHANS_STATE               "RBCS"
-#define ZSTR_RX_RSSI1                  "1RSS"
-#define ZSTR_RX_RSSI2                  "2RSS"
-#define ZSTR_RX_QUALITY                "RQly"
-#define ZSTR_RX_SNR                    "RSNR"
-#define ZSTR_RX_NOISE                  "RNse"
-#define ZSTR_ANTENNA                   "ANT"
-#define ZSTR_RF_MODE                   "RFMD"
-#define ZSTR_TX_POWER                  "TPWR"
-#define ZSTR_TX_RSSI                   "TRSS"
-#define ZSTR_TX_QUALITY                "TQly"
-#define ZSTR_TX_SNR                    "TSNR"
-#define ZSTR_TX_NOISE                  "TNse"
-#define ZSTR_PITCH                     "Ptch"
-#define ZSTR_ROLL                      "Roll"
-#define ZSTR_YAW                       "Yaw"
-#define ZSTR_FLIGHT_MODE               "FM"
-#define ZSTR_THROTTLE                  "Thr"
-#define ZSTR_QOS_A                     "FdeA"
-#define ZSTR_QOS_B                     "FdeB"
-#define ZSTR_QOS_L                     "FdeL"
-#define ZSTR_QOS_R                     "FdeR"
-#define ZSTR_QOS_F                     "FLss"
-#define ZSTR_QOS_H                     "Hold"
-#define ZSTR_BIND                      "BIND"
-#define ZSTR_LAP_NUMBER                "Lap "
-#define ZSTR_GATE_NUMBER               "Gate"
-#define ZSTR_LAP_TIME                  "LapT"
-#define ZSTR_GATE_TIME                 "GteT"
-#define ZSTR_ESC_VOLTAGE               "EscV"
-#define ZSTR_ESC_CURRENT               "EscA"
-#define ZSTR_ESC_RPM                   "Erpm"
-#define ZSTR_ESC_CONSUMPTION           "EscC"
-#define ZSTR_ESC_TEMP                  "EscT"
-#define ZSTR_SD1_CHANNEL               "Chan"
-#define ZSTR_GASSUIT_TEMP1             "GTp1"
-#define ZSTR_GASSUIT_TEMP2             "GTp2"
-#define ZSTR_GASSUIT_RPM               "GRPM"
-#define ZSTR_GASSUIT_FLOW              "GFlo"
-#define ZSTR_GASSUIT_CONS              "GFue"
-#define ZSTR_GASSUIT_RES_VOL           "GRVl"
-#define ZSTR_GASSUIT_RES_PERC          "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW          "GMFl"
-#define ZSTR_GASSUIT_AVG_FLOW          "GAFl"
-#define ZSTR_SBEC_VOLTAGE              "BecV"
-#define ZSTR_SBEC_CURRENT              "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR                       "VFR"
+#define STR_RSSI                      "RSSI"
+#define STR_R9PW                      "R9PW"
+#define STR_RAS                       "SWR"
+#define STR_A1                        "A1"
+#define STR_A2                        "A2"
+#define STR_A3                        "A3"
+#define STR_A4                        "A4"
+#define STR_BATT                      "RxBt"
+#define STR_ALT                       "Alt"
+#define STR_TEMP1                     "Tmp1"
+#define STR_TEMP2                     "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM                       "RPM"
+#define STR_FUEL                      "Fuel"
+#define STR_VSPD                      "VSpd"
+#define STR_ACCX                      "AccX"
+#define STR_ACCY                      "AccY"
+#define STR_ACCZ                      "AccZ"
+#define STR_GYROX                     "GYRX"
+#define STR_GYROY                     "GYRY"
+#define STR_GYROZ                     "GYRZ"
+#define STR_CURR                      "Curr"
+#define STR_CAPACITY                  "Capa"
+#define STR_VFAS                      "VFAS"
+#define STR_BATT_PERCENT              "Bat%"
+#define STR_ASPD                      "ASpd"
+#define STR_GSPD                      "GSpd"
+#define STR_HDG                       "Hdg"
+#define STR_SATELLITES                "Sats"
+#define STR_CELLS                     "Cels"
+#define STR_GPSALT                    "GAlt"
+#define STR_GPSDATETIME               "Date"
+#define STR_BATT1_VOLTAGE             "RB1V"
+#define STR_BATT2_VOLTAGE             "RB2V"
+#define STR_BATT1_CURRENT             "RB1A"
+#define STR_BATT2_CURRENT             "RB2A"
+#define STR_BATT1_CONSUMPTION         "RB1C"
+#define STR_BATT2_CONSUMPTION         "RB2C"
+#define STR_BATT1_TEMP                "RB1T"
+#define STR_BATT2_TEMP                "RB2T"
+#define STR_RB_STATE                  "RBS"
+#define STR_CHANS_STATE               "RBCS"
+#define STR_RX_RSSI1                  "1RSS"
+#define STR_RX_RSSI2                  "2RSS"
+#define STR_RX_QUALITY                "RQly"
+#define STR_RX_SNR                    "RSNR"
+#define STR_RX_NOISE                  "RNse"
+#define STR_RF_MODE                   "RFMD"
+#define STR_TX_POWER                  "TPWR"
+#define STR_TX_RSSI                   "TRSS"
+#define STR_TX_QUALITY                "TQly"
+#define STR_TX_SNR                    "TSNR"
+#define STR_TX_NOISE                  "TNse"
+#define STR_PITCH                     "Ptch"
+#define STR_ROLL                      "Roll"
+#define STR_YAW                       "Yaw"
+#define STR_THROTTLE                  "Thr"
+#define STR_QOS_A                     "FdeA"
+#define STR_QOS_B                     "FdeB"
+#define STR_QOS_L                     "FdeL"
+#define STR_QOS_R                     "FdeR"
+#define STR_QOS_F                     "FLss"
+#define STR_QOS_H                     "Hold"
+#define STR_LAP_NUMBER                "Lap "
+#define STR_GATE_NUMBER               "Gate"
+#define STR_LAP_TIME                  "LapT"
+#define STR_GATE_TIME                 "GteT"
+#define STR_ESC_VOLTAGE               "EscV"
+#define STR_ESC_CURRENT               "EscA"
+#define STR_ESC_RPM                   "Erpm"
+#define STR_ESC_CONSUMPTION           "EscC"
+#define STR_ESC_TEMP                  "EscT"
+#define STR_SD1_CHANNEL               "Chan"
+#define STR_GASSUIT_TEMP1             "GTp1"
+#define STR_GASSUIT_TEMP2             "GTp2"
+#define STR_GASSUIT_RPM               "GRPM"
+#define STR_GASSUIT_FLOW              "GFlo"
+#define STR_GASSUIT_CONS              "GFue"
+#define STR_GASSUIT_RES_VOL           "GRVl"
+#define STR_GASSUIT_RES_PERC          "GRPc"
+#define STR_GASSUIT_MAX_FLOW          "GMFl"
+#define STR_GASSUIT_AVG_FLOW          "GAFl"
+#define STR_SBEC_VOLTAGE              "BecV"
+#define STR_SBEC_CURRENT              "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index a866cb937..c0801defa 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -1262,161 +1262,157 @@
 #define TR_AUTH_FAILURE                "Auth-failure"
 #define TR_RACING_MODE                 "Racing mode"
 
-#define ZSTR_VFR                       "VFR"
-#define ZSTR_RSSI                      "RSSI"
-#define ZSTR_R9PW                      "R9PW"
-#define ZSTR_RAS                       "SWR"
-#define ZSTR_A1                        "A1"
-#define ZSTR_A2                        "A2"
-#define ZSTR_A3                        "A3"
-#define ZSTR_A4                        "A4"
-#define ZSTR_BATT                      "RxBt"
-#define ZSTR_ALT                       "Alt"
-#define ZSTR_TEMP1                     "Tmp1"
-#define ZSTR_TEMP2                     "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM                       "RPM"
-#define ZSTR_FUEL                      "Fuel"
-#define ZSTR_VSPD                      "VSpd"
-#define ZSTR_ACCX                      "AccX"
-#define ZSTR_ACCY                      "AccY"
-#define ZSTR_ACCZ                      "AccZ"
-#define ZSTR_GYROX                     "GYRX"
-#define ZSTR_GYROY                     "GYRY"
-#define ZSTR_GYROZ                     "GYRZ"
-#define ZSTR_CURR                      "Curr"
-#define ZSTR_CAPACITY                  "Capa"
-#define ZSTR_VFAS                      "VFAS"
-#define ZSTR_BATT_PERCENT              "Bat%"
-#define ZSTR_ASPD                      "ASpd"
-#define ZSTR_GSPD                      "GSpd"
-#define ZSTR_HDG                       "Hdg"
-#define ZSTR_SATELLITES                "Sats"
-#define ZSTR_CELLS                     "Cels"
-#define ZSTR_GPSALT                    "GAlt"
-#define ZSTR_GPSDATETIME               "Date"
-#define ZSTR_GPS                       "GPS"
-#define ZSTR_BATT1_VOLTAGE             "RB1V"
-#define ZSTR_BATT2_VOLTAGE             "RB2V"
-#define ZSTR_BATT1_CURRENT             "RB1A"
-#define ZSTR_BATT2_CURRENT             "RB2A"
-#define ZSTR_BATT1_CONSUMPTION         "RB1C"
-#define ZSTR_BATT2_CONSUMPTION         "RB2C"
-#define ZSTR_BATT1_TEMP                "RB1T"
-#define ZSTR_BATT2_TEMP                "RB2T"
-#define ZSTR_RB_STATE                  "RBS"
-#define ZSTR_CHANS_STATE               "RBCS"
-#define ZSTR_RX_RSSI1                  "1RSS"
-#define ZSTR_RX_RSSI2                  "2RSS"
-#define ZSTR_RX_QUALITY                "RQly"
-#define ZSTR_RX_SNR                    "RSNR"
-#define ZSTR_RX_NOISE                  "RNse"
-#define ZSTR_ANTENNA                   "ANT"
-#define ZSTR_RF_MODE                   "RFMD"
-#define ZSTR_TX_POWER                  "TPWR"
-#define ZSTR_TX_RSSI                   "TRSS"
-#define ZSTR_TX_QUALITY                "TQly"
-#define ZSTR_TX_SNR                    "TSNR"
-#define ZSTR_TX_NOISE                  "TNse"
-#define ZSTR_PITCH                     "Ptch"
-#define ZSTR_ROLL                      "Roll"
-#define ZSTR_YAW                       "Yaw"
-#define ZSTR_FLIGHT_MODE               "FM"
-#define ZSTR_THROTTLE                  "Thr"
-#define ZSTR_QOS_A                     "FdeA"
-#define ZSTR_QOS_B                     "FdeB"
-#define ZSTR_QOS_L                     "FdeL"
-#define ZSTR_QOS_R                     "FdeR"
-#define ZSTR_QOS_F                     "FLss"
-#define ZSTR_QOS_H                     "Hold"
-#define ZSTR_BIND                      "BIND"
-#define ZSTR_LAP_NUMBER                "Lap "
-#define ZSTR_GATE_NUMBER               "Gate"
-#define ZSTR_LAP_TIME                  "LapT"
-#define ZSTR_GATE_TIME                 "GteT"
-#define ZSTR_ESC_VOLTAGE               "EscV"
-#define ZSTR_ESC_CURRENT               "EscA"
-#define ZSTR_ESC_RPM                   "Erpm"
-#define ZSTR_ESC_CONSUMPTION           "EscC"
-#define ZSTR_ESC_TEMP                  "EscT"
-#define ZSTR_SD1_CHANNEL               "Chan"
-#define ZSTR_GASSUIT_TEMP1             "GTp1"
-#define ZSTR_GASSUIT_TEMP2             "GTp2"
-#define ZSTR_GASSUIT_RPM               "GRPM"
-#define ZSTR_GASSUIT_FLOW              "GFlo"
-#define ZSTR_GASSUIT_CONS              "GFue"
-#define ZSTR_GASSUIT_RES_VOL           "GRVl"
-#define ZSTR_GASSUIT_RES_PERC          "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW          "GMFl"
-#define ZSTR_GASSUIT_AVG_FLOW          "GAFl"
-#define ZSTR_SBEC_VOLTAGE              "BecV"
-#define ZSTR_SBEC_CURRENT              "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR                       "VFR"
+#define STR_RSSI                      "RSSI"
+#define STR_R9PW                      "R9PW"
+#define STR_RAS                       "SWR"
+#define STR_A1                        "A1"
+#define STR_A2                        "A2"
+#define STR_A3                        "A3"
+#define STR_A4                        "A4"
+#define STR_BATT                      "RxBt"
+#define STR_ALT                       "Alt"
+#define STR_TEMP1                     "Tmp1"
+#define STR_TEMP2                     "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM                       "RPM"
+#define STR_FUEL                      "Fuel"
+#define STR_VSPD                      "VSpd"
+#define STR_ACCX                      "AccX"
+#define STR_ACCY                      "AccY"
+#define STR_ACCZ                      "AccZ"
+#define STR_GYROX                     "GYRX"
+#define STR_GYROY                     "GYRY"
+#define STR_GYROZ                     "GYRZ"
+#define STR_CURR                      "Curr"
+#define STR_CAPACITY                  "Capa"
+#define STR_VFAS                      "VFAS"
+#define STR_BATT_PERCENT              "Bat%"
+#define STR_ASPD                      "ASpd"
+#define STR_GSPD                      "GSpd"
+#define STR_HDG                       "Hdg"
+#define STR_SATELLITES                "Sats"
+#define STR_CELLS                     "Cels"
+#define STR_GPSALT                    "GAlt"
+#define STR_GPSDATETIME               "Date"
+#define STR_BATT1_VOLTAGE             "RB1V"
+#define STR_BATT2_VOLTAGE             "RB2V"
+#define STR_BATT1_CURRENT             "RB1A"
+#define STR_BATT2_CURRENT             "RB2A"
+#define STR_BATT1_CONSUMPTION         "RB1C"
+#define STR_BATT2_CONSUMPTION         "RB2C"
+#define STR_BATT1_TEMP                "RB1T"
+#define STR_BATT2_TEMP                "RB2T"
+#define STR_RB_STATE                  "RBS"
+#define STR_CHANS_STATE               "RBCS"
+#define STR_RX_RSSI1                  "1RSS"
+#define STR_RX_RSSI2                  "2RSS"
+#define STR_RX_QUALITY                "RQly"
+#define STR_RX_SNR                    "RSNR"
+#define STR_RX_NOISE                  "RNse"
+#define STR_RF_MODE                   "RFMD"
+#define STR_TX_POWER                  "TPWR"
+#define STR_TX_RSSI                   "TRSS"
+#define STR_TX_QUALITY                "TQly"
+#define STR_TX_SNR                    "TSNR"
+#define STR_TX_NOISE                  "TNse"
+#define STR_PITCH                     "Ptch"
+#define STR_ROLL                      "Roll"
+#define STR_YAW                       "Yaw"
+#define STR_THROTTLE                  "Thr"
+#define STR_QOS_A                     "FdeA"
+#define STR_QOS_B                     "FdeB"
+#define STR_QOS_L                     "FdeL"
+#define STR_QOS_R                     "FdeR"
+#define STR_QOS_F                     "FLss"
+#define STR_QOS_H                     "Hold"
+#define STR_LAP_NUMBER                "Lap "
+#define STR_GATE_NUMBER               "Gate"
+#define STR_LAP_TIME                  "LapT"
+#define STR_GATE_TIME                 "GteT"
+#define STR_ESC_VOLTAGE               "EscV"
+#define STR_ESC_CURRENT               "EscA"
+#define STR_ESC_RPM                   "Erpm"
+#define STR_ESC_CONSUMPTION           "EscC"
+#define STR_ESC_TEMP                  "EscT"
+#define STR_SD1_CHANNEL               "Chan"
+#define STR_GASSUIT_TEMP1             "GTp1"
+#define STR_GASSUIT_TEMP2             "GTp2"
+#define STR_GASSUIT_RPM               "GRPM"
+#define STR_GASSUIT_FLOW              "GFlo"
+#define STR_GASSUIT_CONS              "GFue"
+#define STR_GASSUIT_RES_VOL           "GRVl"
+#define STR_GASSUIT_RES_PERC          "GRPc"
+#define STR_GASSUIT_MAX_FLOW          "GMFl"
+#define STR_GASSUIT_AVG_FLOW          "GAFl"
+#define STR_SBEC_VOLTAGE              "BecV"
+#define STR_SBEC_CURRENT              "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index a6bd8d297..384fbd23d 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -1272,161 +1272,157 @@
 #define TR_RACING_MODE                 "Racing mode"
 
 // ----------------------------------------------------------------
-#define ZSTR_VFR                       "VFR"
-#define ZSTR_RSSI                      "RSSI"
-#define ZSTR_R9PW                      "R9PW"
-#define ZSTR_RAS                       "SWR"
-#define ZSTR_A1                        "A1"
-#define ZSTR_A2                        "A2"
-#define ZSTR_A3                        "A3"
-#define ZSTR_A4                        "A4"
-#define ZSTR_BATT                      "RxBt"
-#define ZSTR_ALT                       "Alt"
-#define ZSTR_TEMP1                     "Tmp1"
-#define ZSTR_TEMP2                     "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM                       "RPM"
-#define ZSTR_FUEL                      "Fuel"
-#define ZSTR_VSPD                      "VSpd"
-#define ZSTR_ACCX                      "AccX"
-#define ZSTR_ACCY                      "AccY"
-#define ZSTR_ACCZ                      "AccZ"
-#define ZSTR_GYROX                     "GYRX"
-#define ZSTR_GYROY                     "GYRY"
-#define ZSTR_GYROZ                     "GYRZ"
-#define ZSTR_CURR                      "Curr"
-#define ZSTR_CAPACITY                  "Capa"
-#define ZSTR_VFAS                      "VFAS"
-#define ZSTR_BATT_PERCENT              "Bat%"
-#define ZSTR_ASPD                      "ASpd"
-#define ZSTR_GSPD                      "GSpd"
-#define ZSTR_HDG                       "Hdg"
-#define ZSTR_SATELLITES                "Sats"
-#define ZSTR_CELLS                     "Cels"
-#define ZSTR_GPSALT                    "GAlt"
-#define ZSTR_GPSDATETIME               "Date"
-#define ZSTR_GPS                       "GPS"
-#define ZSTR_BATT1_VOLTAGE             "RB1V"
-#define ZSTR_BATT2_VOLTAGE             "RB2V"
-#define ZSTR_BATT1_CURRENT             "RB1A"
-#define ZSTR_BATT2_CURRENT             "RB2A"
-#define ZSTR_BATT1_CONSUMPTION         "RB1C"
-#define ZSTR_BATT2_CONSUMPTION         "RB2C"
-#define ZSTR_BATT1_TEMP                "RB1T"
-#define ZSTR_BATT2_TEMP                "RB2T"
-#define ZSTR_RB_STATE                  "RBS"
-#define ZSTR_CHANS_STATE               "RBCS"
-#define ZSTR_RX_RSSI1                  "1RSS"
-#define ZSTR_RX_RSSI2                  "2RSS"
-#define ZSTR_RX_QUALITY                "RQly"
-#define ZSTR_RX_SNR                    "RSNR"
-#define ZSTR_RX_NOISE                  "RNse"
-#define ZSTR_ANTENNA                   "ANT"
-#define ZSTR_RF_MODE                   "RFMD"
-#define ZSTR_TX_POWER                  "TPWR"
-#define ZSTR_TX_RSSI                   "TRSS"
-#define ZSTR_TX_QUALITY                "TQly"
-#define ZSTR_TX_SNR                    "TSNR"
-#define ZSTR_TX_NOISE                  "TNse"
-#define ZSTR_PITCH                     "Ptch"
-#define ZSTR_ROLL                      "Roll"
-#define ZSTR_YAW                       "Yaw"
-#define ZSTR_FLIGHT_MODE               "FM"
-#define ZSTR_THROTTLE                  "Thr"
-#define ZSTR_QOS_A                     "FdeA"
-#define ZSTR_QOS_B                     "FdeB"
-#define ZSTR_QOS_L                     "FdeL"
-#define ZSTR_QOS_R                     "FdeR"
-#define ZSTR_QOS_F                     "FLss"
-#define ZSTR_QOS_H                     "Hold"
-#define ZSTR_BIND                      "BIND"
-#define ZSTR_LAP_NUMBER                "Lap "
-#define ZSTR_GATE_NUMBER               "Gate"
-#define ZSTR_LAP_TIME                  "LapT"
-#define ZSTR_GATE_TIME                 "GteT"
-#define ZSTR_ESC_VOLTAGE               "EscV"
-#define ZSTR_ESC_CURRENT               "EscA"
-#define ZSTR_ESC_RPM                   "Erpm"
-#define ZSTR_ESC_CONSUMPTION           "EscC"
-#define ZSTR_ESC_TEMP                  "EscT"
-#define ZSTR_SD1_CHANNEL               "Chan"
-#define ZSTR_GASSUIT_TEMP1             "GTp1"
-#define ZSTR_GASSUIT_TEMP2             "GTp2"
-#define ZSTR_GASSUIT_RPM               "GRPM"
-#define ZSTR_GASSUIT_FLOW              "GFlo"
-#define ZSTR_GASSUIT_CONS              "GFue"
-#define ZSTR_GASSUIT_RES_VOL           "GRVl"
-#define ZSTR_GASSUIT_RES_PERC          "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW          "GMFl"
-#define ZSTR_GASSUIT_AVG_FLOW          "GAFl"
-#define ZSTR_SBEC_VOLTAGE              "BecV"
-#define ZSTR_SBEC_CURRENT              "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR                       "VFR"
+#define STR_RSSI                      "RSSI"
+#define STR_R9PW                      "R9PW"
+#define STR_RAS                       "SWR"
+#define STR_A1                        "A1"
+#define STR_A2                        "A2"
+#define STR_A3                        "A3"
+#define STR_A4                        "A4"
+#define STR_BATT                      "RxBt"
+#define STR_ALT                       "Alt"
+#define STR_TEMP1                     "Tmp1"
+#define STR_TEMP2                     "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM                       "RPM"
+#define STR_FUEL                      "Fuel"
+#define STR_VSPD                      "VSpd"
+#define STR_ACCX                      "AccX"
+#define STR_ACCY                      "AccY"
+#define STR_ACCZ                      "AccZ"
+#define STR_GYROX                     "GYRX"
+#define STR_GYROY                     "GYRY"
+#define STR_GYROZ                     "GYRZ"
+#define STR_CURR                      "Curr"
+#define STR_CAPACITY                  "Capa"
+#define STR_VFAS                      "VFAS"
+#define STR_BATT_PERCENT              "Bat%"
+#define STR_ASPD                      "ASpd"
+#define STR_GSPD                      "GSpd"
+#define STR_HDG                       "Hdg"
+#define STR_SATELLITES                "Sats"
+#define STR_CELLS                     "Cels"
+#define STR_GPSALT                    "GAlt"
+#define STR_GPSDATETIME               "Date"
+#define STR_BATT1_VOLTAGE             "RB1V"
+#define STR_BATT2_VOLTAGE             "RB2V"
+#define STR_BATT1_CURRENT             "RB1A"
+#define STR_BATT2_CURRENT             "RB2A"
+#define STR_BATT1_CONSUMPTION         "RB1C"
+#define STR_BATT2_CONSUMPTION         "RB2C"
+#define STR_BATT1_TEMP                "RB1T"
+#define STR_BATT2_TEMP                "RB2T"
+#define STR_RB_STATE                  "RBS"
+#define STR_CHANS_STATE               "RBCS"
+#define STR_RX_RSSI1                  "1RSS"
+#define STR_RX_RSSI2                  "2RSS"
+#define STR_RX_QUALITY                "RQly"
+#define STR_RX_SNR                    "RSNR"
+#define STR_RX_NOISE                  "RNse"
+#define STR_RF_MODE                   "RFMD"
+#define STR_TX_POWER                  "TPWR"
+#define STR_TX_RSSI                   "TRSS"
+#define STR_TX_QUALITY                "TQly"
+#define STR_TX_SNR                    "TSNR"
+#define STR_TX_NOISE                  "TNse"
+#define STR_PITCH                     "Ptch"
+#define STR_ROLL                      "Roll"
+#define STR_YAW                       "Yaw"
+#define STR_THROTTLE                  "Thr"
+#define STR_QOS_A                     "FdeA"
+#define STR_QOS_B                     "FdeB"
+#define STR_QOS_L                     "FdeL"
+#define STR_QOS_R                     "FdeR"
+#define STR_QOS_F                     "FLss"
+#define STR_QOS_H                     "Hold"
+#define STR_LAP_NUMBER                "Lap "
+#define STR_GATE_NUMBER               "Gate"
+#define STR_LAP_TIME                  "LapT"
+#define STR_GATE_TIME                 "GteT"
+#define STR_ESC_VOLTAGE               "EscV"
+#define STR_ESC_CURRENT               "EscA"
+#define STR_ESC_RPM                   "Erpm"
+#define STR_ESC_CONSUMPTION           "EscC"
+#define STR_ESC_TEMP                  "EscT"
+#define STR_SD1_CHANNEL               "Chan"
+#define STR_GASSUIT_TEMP1             "GTp1"
+#define STR_GASSUIT_TEMP2             "GTp2"
+#define STR_GASSUIT_RPM               "GRPM"
+#define STR_GASSUIT_FLOW              "GFlo"
+#define STR_GASSUIT_CONS              "GFue"
+#define STR_GASSUIT_RES_VOL           "GRVl"
+#define STR_GASSUIT_RES_PERC          "GRPc"
+#define STR_GASSUIT_MAX_FLOW          "GMFl"
+#define STR_GASSUIT_AVG_FLOW          "GAFl"
+#define STR_SBEC_VOLTAGE              "BecV"
+#define STR_SBEC_CURRENT              "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 9f02dc4e0..ae77352ea 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -1276,161 +1276,157 @@
 #define TR_AUTH_FAILURE                "Auth-failure"
 #define TR_RACING_MODE                 "Racing mode"
 
-#define ZSTR_VFR                       "VFR"
-#define ZSTR_RSSI                      "RSSI"
-#define ZSTR_R9PW                      "R9PW"
-#define ZSTR_RAS                       "SWR"
-#define ZSTR_A1                        "A1"
-#define ZSTR_A2                        "A2"
-#define ZSTR_A3                        "A3"
-#define ZSTR_A4                        "A4"
-#define ZSTR_BATT                      "RxBt"
-#define ZSTR_ALT                       "Alt"
-#define ZSTR_TEMP1                     "Tmp1"
-#define ZSTR_TEMP2                     "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM                       "RPM"
-#define ZSTR_FUEL                      "Fuel"
-#define ZSTR_VSPD                      "VSpd"
-#define ZSTR_ACCX                      "AccX"
-#define ZSTR_ACCY                      "AccY"
-#define ZSTR_ACCZ                      "AccZ"
-#define ZSTR_GYROX                     "GYRX"
-#define ZSTR_GYROY                     "GYRY"
-#define ZSTR_GYROZ                     "GYRZ"
-#define ZSTR_CURR                      "Curr"
-#define ZSTR_CAPACITY                  "Capa"
-#define ZSTR_VFAS                      "VFAS"
-#define ZSTR_BATT_PERCENT              "Bat%"
-#define ZSTR_ASPD                      "ASpd"
-#define ZSTR_GSPD                      "GSpd"
-#define ZSTR_HDG                       "Hdg"
-#define ZSTR_SATELLITES                "Sats"
-#define ZSTR_CELLS                     "Cels"
-#define ZSTR_GPSALT                    "GAlt"
-#define ZSTR_GPSDATETIME               "Date"
-#define ZSTR_GPS                       "GPS"
-#define ZSTR_BATT1_VOLTAGE             "RB1V"
-#define ZSTR_BATT2_VOLTAGE             "RB2V"
-#define ZSTR_BATT1_CURRENT             "RB1A"
-#define ZSTR_BATT2_CURRENT             "RB2A"
-#define ZSTR_BATT1_CONSUMPTION         "RB1C"
-#define ZSTR_BATT2_CONSUMPTION         "RB2C"
-#define ZSTR_BATT1_TEMP                "RB1T"
-#define ZSTR_BATT2_TEMP                "RB2T"
-#define ZSTR_RB_STATE                  "RBS"
-#define ZSTR_CHANS_STATE               "RBCS"
-#define ZSTR_RX_RSSI1                  "1RSS"
-#define ZSTR_RX_RSSI2                  "2RSS"
-#define ZSTR_RX_QUALITY                "RQly"
-#define ZSTR_RX_SNR                    "RSNR"
-#define ZSTR_RX_NOISE                  "RNse"
-#define ZSTR_ANTENNA                   "ANT"
-#define ZSTR_RF_MODE                   "RFMD"
-#define ZSTR_TX_POWER                  "TPWR"
-#define ZSTR_TX_RSSI                   "TRSS"
-#define ZSTR_TX_QUALITY                "TQly"
-#define ZSTR_TX_SNR                    "TSNR"
-#define ZSTR_TX_NOISE                  "TNse"
-#define ZSTR_PITCH                     "Ptch"
-#define ZSTR_ROLL                      "Roll"
-#define ZSTR_YAW                       "Yaw"
-#define ZSTR_FLIGHT_MODE               "FM"
-#define ZSTR_THROTTLE                  "Thr"
-#define ZSTR_QOS_A                     "FdeA"
-#define ZSTR_QOS_B                     "FdeB"
-#define ZSTR_QOS_L                     "FdeL"
-#define ZSTR_QOS_R                     "FdeR"
-#define ZSTR_QOS_F                     "FLss"
-#define ZSTR_QOS_H                     "Hold"
-#define ZSTR_BIND                      "BIND"
-#define ZSTR_LAP_NUMBER                "Lap "
-#define ZSTR_GATE_NUMBER               "Gate"
-#define ZSTR_LAP_TIME                  "LapT"
-#define ZSTR_GATE_TIME                 "GteT"
-#define ZSTR_ESC_VOLTAGE               "EscV"
-#define ZSTR_ESC_CURRENT               "EscA"
-#define ZSTR_ESC_RPM                   "Erpm"
-#define ZSTR_ESC_CONSUMPTION           "EscC"
-#define ZSTR_ESC_TEMP                  "EscT"
-#define ZSTR_SD1_CHANNEL               "Chan"
-#define ZSTR_GASSUIT_TEMP1             "GTp1"
-#define ZSTR_GASSUIT_TEMP2             "GTp2"
-#define ZSTR_GASSUIT_RPM               "GRPM"
-#define ZSTR_GASSUIT_FLOW              "GFlo"
-#define ZSTR_GASSUIT_CONS              "GFue"
-#define ZSTR_GASSUIT_RES_VOL           "GRVl"
-#define ZSTR_GASSUIT_RES_PERC          "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW          "GMFl"
-#define ZSTR_GASSUIT_AVG_FLOW          "GAFl"
-#define ZSTR_SBEC_VOLTAGE              "BecV"
-#define ZSTR_SBEC_CURRENT              "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR                       "VFR"
+#define STR_RSSI                      "RSSI"
+#define STR_R9PW                      "R9PW"
+#define STR_RAS                       "SWR"
+#define STR_A1                        "A1"
+#define STR_A2                        "A2"
+#define STR_A3                        "A3"
+#define STR_A4                        "A4"
+#define STR_BATT                      "RxBt"
+#define STR_ALT                       "Alt"
+#define STR_TEMP1                     "Tmp1"
+#define STR_TEMP2                     "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM                       "RPM"
+#define STR_FUEL                      "Fuel"
+#define STR_VSPD                      "VSpd"
+#define STR_ACCX                      "AccX"
+#define STR_ACCY                      "AccY"
+#define STR_ACCZ                      "AccZ"
+#define STR_GYROX                     "GYRX"
+#define STR_GYROY                     "GYRY"
+#define STR_GYROZ                     "GYRZ"
+#define STR_CURR                      "Curr"
+#define STR_CAPACITY                  "Capa"
+#define STR_VFAS                      "VFAS"
+#define STR_BATT_PERCENT              "Bat%"
+#define STR_ASPD                      "ASpd"
+#define STR_GSPD                      "GSpd"
+#define STR_HDG                       "Hdg"
+#define STR_SATELLITES                "Sats"
+#define STR_CELLS                     "Cels"
+#define STR_GPSALT                    "GAlt"
+#define STR_GPSDATETIME               "Date"
+#define STR_BATT1_VOLTAGE             "RB1V"
+#define STR_BATT2_VOLTAGE             "RB2V"
+#define STR_BATT1_CURRENT             "RB1A"
+#define STR_BATT2_CURRENT             "RB2A"
+#define STR_BATT1_CONSUMPTION         "RB1C"
+#define STR_BATT2_CONSUMPTION         "RB2C"
+#define STR_BATT1_TEMP                "RB1T"
+#define STR_BATT2_TEMP                "RB2T"
+#define STR_RB_STATE                  "RBS"
+#define STR_CHANS_STATE               "RBCS"
+#define STR_RX_RSSI1                  "1RSS"
+#define STR_RX_RSSI2                  "2RSS"
+#define STR_RX_QUALITY                "RQly"
+#define STR_RX_SNR                    "RSNR"
+#define STR_RX_NOISE                  "RNse"
+#define STR_RF_MODE                   "RFMD"
+#define STR_TX_POWER                  "TPWR"
+#define STR_TX_RSSI                   "TRSS"
+#define STR_TX_QUALITY                "TQly"
+#define STR_TX_SNR                    "TSNR"
+#define STR_TX_NOISE                  "TNse"
+#define STR_PITCH                     "Ptch"
+#define STR_ROLL                      "Roll"
+#define STR_YAW                       "Yaw"
+#define STR_THROTTLE                  "Thr"
+#define STR_QOS_A                     "FdeA"
+#define STR_QOS_B                     "FdeB"
+#define STR_QOS_L                     "FdeL"
+#define STR_QOS_R                     "FdeR"
+#define STR_QOS_F                     "FLss"
+#define STR_QOS_H                     "Hold"
+#define STR_LAP_NUMBER                "Lap "
+#define STR_GATE_NUMBER               "Gate"
+#define STR_LAP_TIME                  "LapT"
+#define STR_GATE_TIME                 "GteT"
+#define STR_ESC_VOLTAGE               "EscV"
+#define STR_ESC_CURRENT               "EscA"
+#define STR_ESC_RPM                   "Erpm"
+#define STR_ESC_CONSUMPTION           "EscC"
+#define STR_ESC_TEMP                  "EscT"
+#define STR_SD1_CHANNEL               "Chan"
+#define STR_GASSUIT_TEMP1             "GTp1"
+#define STR_GASSUIT_TEMP2             "GTp2"
+#define STR_GASSUIT_RPM               "GRPM"
+#define STR_GASSUIT_FLOW              "GFlo"
+#define STR_GASSUIT_CONS              "GFue"
+#define STR_GASSUIT_RES_VOL           "GRVl"
+#define STR_GASSUIT_RES_PERC          "GRPc"
+#define STR_GASSUIT_MAX_FLOW          "GMFl"
+#define STR_GASSUIT_AVG_FLOW          "GAFl"
+#define STR_SBEC_VOLTAGE              "BecV"
+#define STR_SBEC_CURRENT              "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index b0d630ff0..d483265d4 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -1270,161 +1270,157 @@
 #define TR_AUTH_FAILURE        "Fallo " LCDW_128_480_LINEBREAK  "autentificación"
 #define TR_RACING_MODE         "Racing mode"
 
-#define ZSTR_VFR               "VFR"
-#define ZSTR_RSSI              "RSSI"
-#define ZSTR_R9PW                      "R9PW"
-#define ZSTR_RAS               "SWR"
-#define ZSTR_A1                "A1"
-#define ZSTR_A2                "A2"
-#define ZSTR_A3                "A3"
-#define ZSTR_A4                "A4"
-#define ZSTR_BATT              "RxBt"
-#define ZSTR_ALT               "Alt"
-#define ZSTR_TEMP1             "Tmp1"
-#define ZSTR_TEMP2             "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM               "RPM"
-#define ZSTR_FUEL              "Fuel"
-#define ZSTR_VSPD              "VSpd"
-#define ZSTR_ACCX              "AccX"
-#define ZSTR_ACCY              "AccY"
-#define ZSTR_ACCZ              "AccZ"
-#define ZSTR_GYROX             "GYRX"
-#define ZSTR_GYROY             "GYRY"
-#define ZSTR_GYROZ             "GYRZ"
-#define ZSTR_CURR              "Curr"
-#define ZSTR_CAPACITY          "Capa"
-#define ZSTR_VFAS              "VFAS"
-#define ZSTR_BATT_PERCENT      "Bat%"
-#define ZSTR_ASPD              "ASpd"
-#define ZSTR_GSPD              "GSpd"
-#define ZSTR_HDG               "Hdg"
-#define ZSTR_SATELLITES        "Sats"
-#define ZSTR_CELLS             "Cels"
-#define ZSTR_GPSALT            "GAlt"
-#define ZSTR_GPSDATETIME       "Date"
-#define ZSTR_GPS               "GPS"
-#define ZSTR_BATT1_VOLTAGE     "RB1V"
-#define ZSTR_BATT2_VOLTAGE     "RB2V"
-#define ZSTR_BATT1_CURRENT     "RB1A"
-#define ZSTR_BATT2_CURRENT     "RB2A"
-#define ZSTR_BATT1_CONSUMPTION "RB1C"
-#define ZSTR_BATT2_CONSUMPTION "RB2C"
-#define ZSTR_BATT1_TEMP        "RB1T"
-#define ZSTR_BATT2_TEMP        "RB2T"
-#define ZSTR_RB_STATE          "RBS"
-#define ZSTR_CHANS_STATE       "RBCS"
-#define ZSTR_RX_RSSI1          "1RSS"
-#define ZSTR_RX_RSSI2          "2RSS"
-#define ZSTR_RX_QUALITY        "RQly"
-#define ZSTR_RX_SNR            "RSNR"
-#define ZSTR_RX_NOISE          "RNse"
-#define ZSTR_ANTENNA           "ANT"
-#define ZSTR_RF_MODE           "RFMD"
-#define ZSTR_TX_POWER          "TPWR"
-#define ZSTR_TX_RSSI           "TRSS"
-#define ZSTR_TX_QUALITY        "TQly"
-#define ZSTR_TX_SNR            "TSNR"
-#define ZSTR_TX_NOISE          "TNse"
-#define ZSTR_PITCH             "Ptch"
-#define ZSTR_ROLL              "Roll"
-#define ZSTR_YAW               "Yaw"
-#define ZSTR_FLIGHT_MODE       "FM"
-#define ZSTR_THROTTLE          "Thr"
-#define ZSTR_QOS_A             "FdeA"
-#define ZSTR_QOS_B             "FdeB"
-#define ZSTR_QOS_L             "FdeL"
-#define ZSTR_QOS_R             "FdeR"
-#define ZSTR_QOS_F             "FLss"
-#define ZSTR_QOS_H             "Hold"
-#define ZSTR_BIND              "BIND"
-#define ZSTR_LAP_NUMBER        "Lap "
-#define ZSTR_GATE_NUMBER       "Gate"
-#define ZSTR_LAP_TIME          "LapT"
-#define ZSTR_GATE_TIME         "GteT"
-#define ZSTR_ESC_VOLTAGE       "EscV"
-#define ZSTR_ESC_CURRENT       "EscA"
-#define ZSTR_ESC_RPM           "Erpm"
-#define ZSTR_ESC_CONSUMPTION   "EscC"
-#define ZSTR_ESC_TEMP          "EscT"
-#define ZSTR_SD1_CHANNEL       "Chan"
-#define ZSTR_GASSUIT_TEMP1     "GTp1"
-#define ZSTR_GASSUIT_TEMP2     "GTp2"
-#define ZSTR_GASSUIT_RPM       "GRPM"
-#define ZSTR_GASSUIT_FLOW      "GFlo"
-#define ZSTR_GASSUIT_CONS      "GFue"
-#define ZSTR_GASSUIT_RES_VOL   "GRVl"
-#define ZSTR_GASSUIT_RES_PERC  "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW  "GMFl"
-#define ZSTR_GASSUIT_AVG_FLOW  "GAFl"
-#define ZSTR_SBEC_VOLTAGE      "BecV"
-#define ZSTR_SBEC_CURRENT      "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR               "VFR"
+#define STR_RSSI              "RSSI"
+#define STR_R9PW                      "R9PW"
+#define STR_RAS               "SWR"
+#define STR_A1                "A1"
+#define STR_A2                "A2"
+#define STR_A3                "A3"
+#define STR_A4                "A4"
+#define STR_BATT              "RxBt"
+#define STR_ALT               "Alt"
+#define STR_TEMP1             "Tmp1"
+#define STR_TEMP2             "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM               "RPM"
+#define STR_FUEL              "Fuel"
+#define STR_VSPD              "VSpd"
+#define STR_ACCX              "AccX"
+#define STR_ACCY              "AccY"
+#define STR_ACCZ              "AccZ"
+#define STR_GYROX             "GYRX"
+#define STR_GYROY             "GYRY"
+#define STR_GYROZ             "GYRZ"
+#define STR_CURR              "Curr"
+#define STR_CAPACITY          "Capa"
+#define STR_VFAS              "VFAS"
+#define STR_BATT_PERCENT      "Bat%"
+#define STR_ASPD              "ASpd"
+#define STR_GSPD              "GSpd"
+#define STR_HDG               "Hdg"
+#define STR_SATELLITES        "Sats"
+#define STR_CELLS             "Cels"
+#define STR_GPSALT            "GAlt"
+#define STR_GPSDATETIME       "Date"
+#define STR_BATT1_VOLTAGE     "RB1V"
+#define STR_BATT2_VOLTAGE     "RB2V"
+#define STR_BATT1_CURRENT     "RB1A"
+#define STR_BATT2_CURRENT     "RB2A"
+#define STR_BATT1_CONSUMPTION "RB1C"
+#define STR_BATT2_CONSUMPTION "RB2C"
+#define STR_BATT1_TEMP        "RB1T"
+#define STR_BATT2_TEMP        "RB2T"
+#define STR_RB_STATE          "RBS"
+#define STR_CHANS_STATE       "RBCS"
+#define STR_RX_RSSI1          "1RSS"
+#define STR_RX_RSSI2          "2RSS"
+#define STR_RX_QUALITY        "RQly"
+#define STR_RX_SNR            "RSNR"
+#define STR_RX_NOISE          "RNse"
+#define STR_RF_MODE           "RFMD"
+#define STR_TX_POWER          "TPWR"
+#define STR_TX_RSSI           "TRSS"
+#define STR_TX_QUALITY        "TQly"
+#define STR_TX_SNR            "TSNR"
+#define STR_TX_NOISE          "TNse"
+#define STR_PITCH             "Ptch"
+#define STR_ROLL              "Roll"
+#define STR_YAW               "Yaw"
+#define STR_THROTTLE          "Thr"
+#define STR_QOS_A             "FdeA"
+#define STR_QOS_B             "FdeB"
+#define STR_QOS_L             "FdeL"
+#define STR_QOS_R             "FdeR"
+#define STR_QOS_F             "FLss"
+#define STR_QOS_H             "Hold"
+#define STR_LAP_NUMBER        "Lap "
+#define STR_GATE_NUMBER       "Gate"
+#define STR_LAP_TIME          "LapT"
+#define STR_GATE_TIME         "GteT"
+#define STR_ESC_VOLTAGE       "EscV"
+#define STR_ESC_CURRENT       "EscA"
+#define STR_ESC_RPM           "Erpm"
+#define STR_ESC_CONSUMPTION   "EscC"
+#define STR_ESC_TEMP          "EscT"
+#define STR_SD1_CHANNEL       "Chan"
+#define STR_GASSUIT_TEMP1     "GTp1"
+#define STR_GASSUIT_TEMP2     "GTp2"
+#define STR_GASSUIT_RPM       "GRPM"
+#define STR_GASSUIT_FLOW      "GFlo"
+#define STR_GASSUIT_CONS      "GFue"
+#define STR_GASSUIT_RES_VOL   "GRVl"
+#define STR_GASSUIT_RES_PERC  "GRPc"
+#define STR_GASSUIT_MAX_FLOW  "GMFl"
+#define STR_GASSUIT_AVG_FLOW  "GAFl"
+#define STR_SBEC_VOLTAGE      "BecV"
+#define STR_SBEC_CURRENT      "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index db6a8287d..626128ffc 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -1277,160 +1277,156 @@
 #define TR_AUTH_FAILURE                "Auth-failure"
 #define TR_RACING_MODE         "Racing mode"
 
-#define ZSTR_VFR               "VFR"
-#define ZSTR_RSSI              "RSSI"
-#define ZSTR_R9PW                      "R9PW"
-#define ZSTR_RAS               "SWR"
-#define ZSTR_A1                "A1"
-#define ZSTR_A2                "A2"
-#define ZSTR_A3                "A3"
-#define ZSTR_A4                "A4"
-#define ZSTR_BATT              "RxBt"
-#define ZSTR_ALT               "Alt"
-#define ZSTR_TEMP1             "Tmp1"
-#define ZSTR_TEMP2             "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM               "RPM"
-#define ZSTR_FUEL              "Fuel"
-#define ZSTR_VSPD              "VSpd"
-#define ZSTR_ACCX              "AccX"
-#define ZSTR_ACCY              "AccY"
-#define ZSTR_ACCZ              "AccZ"
-#define ZSTR_GYROX             "GYRX"
-#define ZSTR_GYROY             "GYRY"
-#define ZSTR_GYROZ             "GYRZ"
-#define ZSTR_CURR              "Curr"
-#define ZSTR_CAPACITY          "Capa"
-#define ZSTR_VFAS              "VFAS"
-#define ZSTR_BATT_PERCENT      "Bat%"
-#define ZSTR_ASPD              "ASpd"
-#define ZSTR_GSPD              "GSpd"
-#define ZSTR_HDG               "Hdg"
-#define ZSTR_SATELLITES        "Sats"
-#define ZSTR_CELLS             "Cels"
-#define ZSTR_GPSALT            "GAlt"
-#define ZSTR_GPSDATETIME       "Date"
-#define ZSTR_GPS               "GPS"
-#define ZSTR_BATT1_VOLTAGE     "RB1V"
-#define ZSTR_BATT2_VOLTAGE     "RB2V"
-#define ZSTR_BATT1_CURRENT     "RB1A"
-#define ZSTR_BATT2_CURRENT     "RB2A"
-#define ZSTR_BATT1_CONSUMPTION "RB1C"
-#define ZSTR_BATT2_CONSUMPTION "RB2C"
-#define ZSTR_BATT1_TEMP        "RB1T"
-#define ZSTR_BATT2_TEMP        "RB2T"
-#define ZSTR_RB_STATE          "RBS"
-#define ZSTR_CHANS_STATE       "RBCS"
-#define ZSTR_RX_RSSI1          "1RSS"
-#define ZSTR_RX_RSSI2          "2RSS"
-#define ZSTR_RX_QUALITY        "RQly"
-#define ZSTR_RX_SNR            "RSNR"
-#define ZSTR_RX_NOISE          "RNse"
-#define ZSTR_ANTENNA           "ANT"
-#define ZSTR_RF_MODE           "RFMD"
-#define ZSTR_TX_POWER          "TPWR"
-#define ZSTR_TX_RSSI           "TRSS"
-#define ZSTR_TX_QUALITY        "TQly"
-#define ZSTR_TX_SNR            "TSNR"
-#define ZSTR_TX_NOISE          "TNse"
-#define ZSTR_PITCH             "Ptch"
-#define ZSTR_ROLL              "Roll"
-#define ZSTR_YAW               "Yaw"
-#define ZSTR_FLIGHT_MODE       "FM"
-#define ZSTR_THROTTLE          "Thr"
-#define ZSTR_QOS_A             "FdeA"
-#define ZSTR_QOS_B             "FdeB"
-#define ZSTR_QOS_L             "FdeL"
-#define ZSTR_QOS_R             "FdeR"
-#define ZSTR_QOS_F             "FLss"
-#define ZSTR_QOS_H             "Hold"
-#define ZSTR_BIND              "BIND"
-#define ZSTR_LAP_NUMBER        "Lap "
-#define ZSTR_GATE_NUMBER       "Gate"
-#define ZSTR_LAP_TIME          "LapT"
-#define ZSTR_GATE_TIME         "GteT"
-#define ZSTR_ESC_VOLTAGE       "EscV"
-#define ZSTR_ESC_CURRENT       "EscA"
-#define ZSTR_ESC_RPM           "Erpm"
-#define ZSTR_ESC_CONSUMPTION   "EscC"
-#define ZSTR_ESC_TEMP          "EscT"
-#define ZSTR_SD1_CHANNEL       "Chan"
-#define ZSTR_GASSUIT_TEMP1     "GTp1"
-#define ZSTR_GASSUIT_TEMP2     "GTp2"
-#define ZSTR_GASSUIT_RPM       "GRPM"
-#define ZSTR_GASSUIT_FLOW      "GFlo"
-#define ZSTR_GASSUIT_CONS      "GFue"
-#define ZSTR_GASSUIT_RES_VOL   "GRVl"
-#define ZSTR_GASSUIT_RES_PERC  "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW  "GMFl"
-#define ZSTR_SBEC_VOLTAGE              "BecV"
-#define ZSTR_SBEC_CURRENT              "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR               "VFR"
+#define STR_RSSI              "RSSI"
+#define STR_R9PW                      "R9PW"
+#define STR_RAS               "SWR"
+#define STR_A1                "A1"
+#define STR_A2                "A2"
+#define STR_A3                "A3"
+#define STR_A4                "A4"
+#define STR_BATT              "RxBt"
+#define STR_ALT               "Alt"
+#define STR_TEMP1             "Tmp1"
+#define STR_TEMP2             "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM               "RPM"
+#define STR_FUEL              "Fuel"
+#define STR_VSPD              "VSpd"
+#define STR_ACCX              "AccX"
+#define STR_ACCY              "AccY"
+#define STR_ACCZ              "AccZ"
+#define STR_GYROX             "GYRX"
+#define STR_GYROY             "GYRY"
+#define STR_GYROZ             "GYRZ"
+#define STR_CURR              "Curr"
+#define STR_CAPACITY          "Capa"
+#define STR_VFAS              "VFAS"
+#define STR_BATT_PERCENT      "Bat%"
+#define STR_ASPD              "ASpd"
+#define STR_GSPD              "GSpd"
+#define STR_HDG               "Hdg"
+#define STR_SATELLITES        "Sats"
+#define STR_CELLS             "Cels"
+#define STR_GPSALT            "GAlt"
+#define STR_GPSDATETIME       "Date"
+#define STR_BATT1_VOLTAGE     "RB1V"
+#define STR_BATT2_VOLTAGE     "RB2V"
+#define STR_BATT1_CURRENT     "RB1A"
+#define STR_BATT2_CURRENT     "RB2A"
+#define STR_BATT1_CONSUMPTION "RB1C"
+#define STR_BATT2_CONSUMPTION "RB2C"
+#define STR_BATT1_TEMP        "RB1T"
+#define STR_BATT2_TEMP        "RB2T"
+#define STR_RB_STATE          "RBS"
+#define STR_CHANS_STATE       "RBCS"
+#define STR_RX_RSSI1          "1RSS"
+#define STR_RX_RSSI2          "2RSS"
+#define STR_RX_QUALITY        "RQly"
+#define STR_RX_SNR            "RSNR"
+#define STR_RX_NOISE          "RNse"
+#define STR_RF_MODE           "RFMD"
+#define STR_TX_POWER          "TPWR"
+#define STR_TX_RSSI           "TRSS"
+#define STR_TX_QUALITY        "TQly"
+#define STR_TX_SNR            "TSNR"
+#define STR_TX_NOISE          "TNse"
+#define STR_PITCH             "Ptch"
+#define STR_ROLL              "Roll"
+#define STR_YAW               "Yaw"
+#define STR_THROTTLE          "Thr"
+#define STR_QOS_A             "FdeA"
+#define STR_QOS_B             "FdeB"
+#define STR_QOS_L             "FdeL"
+#define STR_QOS_R             "FdeR"
+#define STR_QOS_F             "FLss"
+#define STR_QOS_H             "Hold"
+#define STR_LAP_NUMBER        "Lap "
+#define STR_GATE_NUMBER       "Gate"
+#define STR_LAP_TIME          "LapT"
+#define STR_GATE_TIME         "GteT"
+#define STR_ESC_VOLTAGE       "EscV"
+#define STR_ESC_CURRENT       "EscA"
+#define STR_ESC_RPM           "Erpm"
+#define STR_ESC_CONSUMPTION   "EscC"
+#define STR_ESC_TEMP          "EscT"
+#define STR_SD1_CHANNEL       "Chan"
+#define STR_GASSUIT_TEMP1     "GTp1"
+#define STR_GASSUIT_TEMP2     "GTp2"
+#define STR_GASSUIT_RPM       "GRPM"
+#define STR_GASSUIT_FLOW      "GFlo"
+#define STR_GASSUIT_CONS      "GFue"
+#define STR_GASSUIT_RES_VOL   "GRVl"
+#define STR_GASSUIT_RES_PERC  "GRPc"
+#define STR_GASSUIT_MAX_FLOW  "GMFl"
+#define STR_SBEC_VOLTAGE              "BecV"
+#define STR_SBEC_CURRENT              "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index 96eccac8f..119d95a4d 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -1301,161 +1301,157 @@
 #define TR_AUTH_FAILURE                "Auth-failure"
 #define TR_RACING_MODE                 "Racing mode"
 
-#define ZSTR_VFR                       "VFR"
-#define ZSTR_RSSI                      "RSSI"
-#define ZSTR_R9PW                      "R9PW"
-#define ZSTR_RAS                       "SWR"
-#define ZSTR_A1                        "A1"
-#define ZSTR_A2                        "A2"
-#define ZSTR_A3                        "A3"
-#define ZSTR_A4                        "A4"
-#define ZSTR_BATT                      "BtRx"
-#define ZSTR_ALT                       "Alt"
-#define ZSTR_TEMP1                     "Tmp1"
-#define ZSTR_TEMP2                     "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM                       "RPM"
-#define ZSTR_FUEL                      "Fuel"
-#define ZSTR_VSPD                      "VSpd"
-#define ZSTR_ACCX                      "AccX"
-#define ZSTR_ACCY                      "AccY"
-#define ZSTR_ACCZ                      "AccZ"
-#define ZSTR_GYROX                     "GYRX"
-#define ZSTR_GYROY                     "GYRY"
-#define ZSTR_GYROZ                     "GYRZ"
-#define ZSTR_CURR                      "Curr"
-#define ZSTR_CAPACITY                  "Capa"
-#define ZSTR_VFAS                      "VFAS"
-#define ZSTR_BATT_PERCENT              "Bat%"
-#define ZSTR_ASPD                      "ASpd"
-#define ZSTR_GSPD                      "GSpd"
-#define ZSTR_HDG                       "Hdg"
-#define ZSTR_SATELLITES                "Sats"
-#define ZSTR_CELLS                     "Cels"
-#define ZSTR_GPSALT                    "GAlt"
-#define ZSTR_GPSDATETIME               "Date"
-#define ZSTR_GPS                       "GPS"
-#define ZSTR_BATT1_VOLTAGE             "RB1V"
-#define ZSTR_BATT2_VOLTAGE             "RB2V"
-#define ZSTR_BATT1_CURRENT             "RB1A"
-#define ZSTR_BATT2_CURRENT             "RB2A"
-#define ZSTR_BATT1_CONSUMPTION         "RB1C"
-#define ZSTR_BATT2_CONSUMPTION         "RB2C"
-#define ZSTR_BATT1_TEMP                "RB1T"
-#define ZSTR_BATT2_TEMP                "RB2T"
-#define ZSTR_RB_STATE                  "RBS"
-#define ZSTR_CHANS_STATE               "RBCS"
-#define ZSTR_RX_RSSI1                  "1RSS"
-#define ZSTR_RX_RSSI2                  "2RSS"
-#define ZSTR_RX_QUALITY                "RQly"
-#define ZSTR_RX_SNR                    "RSNR"
-#define ZSTR_RX_NOISE                  "RNse"
-#define ZSTR_ANTENNA                   "ANT"
-#define ZSTR_RF_MODE                   "RFMD"
-#define ZSTR_TX_POWER                  "TPWR"
-#define ZSTR_TX_RSSI                   "TRSS"
-#define ZSTR_TX_QUALITY                "TQly"
-#define ZSTR_TX_SNR                    "TSNR"
-#define ZSTR_TX_NOISE                  "TNse"
-#define ZSTR_PITCH                     "Ptch"
-#define ZSTR_ROLL                      "Roll"
-#define ZSTR_YAW                       "Yaw"
-#define ZSTR_FLIGHT_MODE               "PV"
-#define ZSTR_THROTTLE                  "Thr"
-#define ZSTR_QOS_A                     "FdeA"
-#define ZSTR_QOS_B                     "FdeB"
-#define ZSTR_QOS_L                     "FdeL"
-#define ZSTR_QOS_R                     "FdeR"
-#define ZSTR_QOS_F                     "FLss"
-#define ZSTR_QOS_H                     "Hold"
-#define ZSTR_BIND                      "BIND"
-#define ZSTR_LAP_NUMBER                "Lap "
-#define ZSTR_GATE_NUMBER               "Gate"
-#define ZSTR_LAP_TIME                  "LapT"
-#define ZSTR_GATE_TIME                 "GteT"
-#define ZSTR_ESC_VOLTAGE               "EscV"
-#define ZSTR_ESC_CURRENT               "EscA"
-#define ZSTR_ESC_RPM                   "Erpm"
-#define ZSTR_ESC_CONSUMPTION           "EscC"
-#define ZSTR_ESC_TEMP                  "EscT"
-#define ZSTR_SD1_CHANNEL               "Chan"
-#define ZSTR_GASSUIT_TEMP1             "GTp1"
-#define ZSTR_GASSUIT_TEMP2             "GTp2"
-#define ZSTR_GASSUIT_RPM               "GRPM"
-#define ZSTR_GASSUIT_FLOW              "GFlo"
-#define ZSTR_GASSUIT_CONS              "GFue"
-#define ZSTR_GASSUIT_RES_VOL           "GRVl"
-#define ZSTR_GASSUIT_RES_PERC          "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW          "GMFl"
-#define ZSTR_GASSUIT_AVG_FLOW          "GAFl"
-#define ZSTR_SBEC_VOLTAGE              "BecV"
-#define ZSTR_SBEC_CURRENT              "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR                       "VFR"
+#define STR_RSSI                      "RSSI"
+#define STR_R9PW                      "R9PW"
+#define STR_RAS                       "SWR"
+#define STR_A1                        "A1"
+#define STR_A2                        "A2"
+#define STR_A3                        "A3"
+#define STR_A4                        "A4"
+#define STR_BATT                      "BtRx"
+#define STR_ALT                       "Alt"
+#define STR_TEMP1                     "Tmp1"
+#define STR_TEMP2                     "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM                       "RPM"
+#define STR_FUEL                      "Fuel"
+#define STR_VSPD                      "VSpd"
+#define STR_ACCX                      "AccX"
+#define STR_ACCY                      "AccY"
+#define STR_ACCZ                      "AccZ"
+#define STR_GYROX                     "GYRX"
+#define STR_GYROY                     "GYRY"
+#define STR_GYROZ                     "GYRZ"
+#define STR_CURR                      "Curr"
+#define STR_CAPACITY                  "Capa"
+#define STR_VFAS                      "VFAS"
+#define STR_BATT_PERCENT              "Bat%"
+#define STR_ASPD                      "ASpd"
+#define STR_GSPD                      "GSpd"
+#define STR_HDG                       "Hdg"
+#define STR_SATELLITES                "Sats"
+#define STR_CELLS                     "Cels"
+#define STR_GPSALT                    "GAlt"
+#define STR_GPSDATETIME               "Date"
+#define STR_BATT1_VOLTAGE             "RB1V"
+#define STR_BATT2_VOLTAGE             "RB2V"
+#define STR_BATT1_CURRENT             "RB1A"
+#define STR_BATT2_CURRENT             "RB2A"
+#define STR_BATT1_CONSUMPTION         "RB1C"
+#define STR_BATT2_CONSUMPTION         "RB2C"
+#define STR_BATT1_TEMP                "RB1T"
+#define STR_BATT2_TEMP                "RB2T"
+#define STR_RB_STATE                  "RBS"
+#define STR_CHANS_STATE               "RBCS"
+#define STR_RX_RSSI1                  "1RSS"
+#define STR_RX_RSSI2                  "2RSS"
+#define STR_RX_QUALITY                "RQly"
+#define STR_RX_SNR                    "RSNR"
+#define STR_RX_NOISE                  "RNse"
+#define STR_RF_MODE                   "RFMD"
+#define STR_TX_POWER                  "TPWR"
+#define STR_TX_RSSI                   "TRSS"
+#define STR_TX_QUALITY                "TQly"
+#define STR_TX_SNR                    "TSNR"
+#define STR_TX_NOISE                  "TNse"
+#define STR_PITCH                     "Ptch"
+#define STR_ROLL                      "Roll"
+#define STR_YAW                       "Yaw"
+#define STR_THROTTLE                  "Thr"
+#define STR_QOS_A                     "FdeA"
+#define STR_QOS_B                     "FdeB"
+#define STR_QOS_L                     "FdeL"
+#define STR_QOS_R                     "FdeR"
+#define STR_QOS_F                     "FLss"
+#define STR_QOS_H                     "Hold"
+#define STR_LAP_NUMBER                "Lap "
+#define STR_GATE_NUMBER               "Gate"
+#define STR_LAP_TIME                  "LapT"
+#define STR_GATE_TIME                 "GteT"
+#define STR_ESC_VOLTAGE               "EscV"
+#define STR_ESC_CURRENT               "EscA"
+#define STR_ESC_RPM                   "Erpm"
+#define STR_ESC_CONSUMPTION           "EscC"
+#define STR_ESC_TEMP                  "EscT"
+#define STR_SD1_CHANNEL               "Chan"
+#define STR_GASSUIT_TEMP1             "GTp1"
+#define STR_GASSUIT_TEMP2             "GTp2"
+#define STR_GASSUIT_RPM               "GRPM"
+#define STR_GASSUIT_FLOW              "GFlo"
+#define STR_GASSUIT_CONS              "GFue"
+#define STR_GASSUIT_RES_VOL           "GRVl"
+#define STR_GASSUIT_RES_PERC          "GRPc"
+#define STR_GASSUIT_MAX_FLOW          "GMFl"
+#define STR_GASSUIT_AVG_FLOW          "GAFl"
+#define STR_SBEC_VOLTAGE              "BecV"
+#define STR_SBEC_CURRENT              "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index f6f4adac2..435d785d4 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -1290,161 +1290,157 @@
 #define TR_AUTH_FAILURE        "Auth-failure"
 #define TR_RACING_MODE         "Racing mode"
 
-#define ZSTR_VFR               "VFR"
-#define ZSTR_RSSI              "RSSI"
-#define ZSTR_R9PW              "R9PW"
-#define ZSTR_RAS               "SWR"
-#define ZSTR_A1                "A1"
-#define ZSTR_A2                "A2"
-#define ZSTR_A3                "A3"
-#define ZSTR_A4                "A4"
-#define ZSTR_BATT              "RxBt"
-#define ZSTR_ALT               "Alt"
-#define ZSTR_TEMP1             "Tmp1"
-#define ZSTR_TEMP2             "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM               "RPM"
-#define ZSTR_FUEL              "Fuel"
-#define ZSTR_VSPD              "VSpd"
-#define ZSTR_ACCX              "AccX"
-#define ZSTR_ACCY              "AccY"
-#define ZSTR_ACCZ              "AccZ"
-#define ZSTR_GYROX             "GYRX"
-#define ZSTR_GYROY             "GYRY"
-#define ZSTR_GYROZ             "GYRZ"
-#define ZSTR_CURR              "Curr"
-#define ZSTR_CAPACITY          "Capa"
-#define ZSTR_VFAS              "VFAS"
-#define ZSTR_BATT_PERCENT      "Bat%"
-#define ZSTR_ASPD              "ASpd"
-#define ZSTR_GSPD              "GSpd"
-#define ZSTR_HDG               "Hdg"
-#define ZSTR_SATELLITES        "Sats"
-#define ZSTR_CELLS             "Cels"
-#define ZSTR_GPSALT            "GAlt"
-#define ZSTR_GPSDATETIME       "Data"
-#define ZSTR_GPS               "GPS"
-#define ZSTR_BATT1_VOLTAGE     "RB1V"
-#define ZSTR_BATT2_VOLTAGE     "RB2V"
-#define ZSTR_BATT1_CURRENT     "RB1A"
-#define ZSTR_BATT2_CURRENT     "RB2A"
-#define ZSTR_BATT1_CONSUMPTION "RB1C"
-#define ZSTR_BATT2_CONSUMPTION "RB2C"
-#define ZSTR_BATT1_TEMP        "RB1T"
-#define ZSTR_BATT2_TEMP        "RB2T"
-#define ZSTR_RB_STATE          "RBS"
-#define ZSTR_CHANS_STATE       "RBCS"
-#define ZSTR_RX_RSSI1          "1RSS"
-#define ZSTR_RX_RSSI2          "2RSS"
-#define ZSTR_RX_QUALITY        "RQly"
-#define ZSTR_RX_SNR            "RSNR"
-#define ZSTR_RX_NOISE          "RNse"
-#define ZSTR_ANTENNA           "ANT"
-#define ZSTR_RF_MODE           "RFMD"
-#define ZSTR_TX_POWER          "TPWR"
-#define ZSTR_TX_RSSI           "TRSS"
-#define ZSTR_TX_QUALITY        "TQly"
-#define ZSTR_TX_SNR            "TSNR"
-#define ZSTR_TX_NOISE          "TNse"
-#define ZSTR_PITCH             "Ptch"
-#define ZSTR_ROLL              "Roll"
-#define ZSTR_YAW               "Yaw"
-#define ZSTR_FLIGHT_MODE       "FM"
-#define ZSTR_THROTTLE          "Thr"
-#define ZSTR_QOS_A             "FdeA"
-#define ZSTR_QOS_B             "FdeB"
-#define ZSTR_QOS_L             "FdeL"
-#define ZSTR_QOS_R             "FdeR"
-#define ZSTR_QOS_F             "FLss"
-#define ZSTR_QOS_H             "Hold"
-#define ZSTR_BIND              "BIND"
-#define ZSTR_LAP_NUMBER        "Lap "
-#define ZSTR_GATE_NUMBER       "Gate"
-#define ZSTR_LAP_TIME          "LapT"
-#define ZSTR_GATE_TIME         "GteT"
-#define ZSTR_ESC_VOLTAGE       "EscV"
-#define ZSTR_ESC_CURRENT       "EscA"
-#define ZSTR_ESC_RPM           "Erpm"
-#define ZSTR_ESC_CONSUMPTION   "EscC"
-#define ZSTR_ESC_TEMP          "EscT"
-#define ZSTR_SD1_CHANNEL       "Chan"
-#define ZSTR_GASSUIT_TEMP1     "GTp1"
-#define ZSTR_GASSUIT_TEMP2     "GTp2"
-#define ZSTR_GASSUIT_RPM       "GRPM"
-#define ZSTR_GASSUIT_FLOW      "GFlo"
-#define ZSTR_GASSUIT_CONS      "GFue"
-#define ZSTR_GASSUIT_RES_VOL   "GRVl"
-#define ZSTR_GASSUIT_RES_PERC  "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW  "GMFl"
-#define ZSTR_GASSUIT_AVG_FLOW  "GAFl"
-#define ZSTR_SBEC_VOLTAGE      "BecV"
-#define ZSTR_SBEC_CURRENT      "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR               "VFR"
+#define STR_RSSI              "RSSI"
+#define STR_R9PW              "R9PW"
+#define STR_RAS               "SWR"
+#define STR_A1                "A1"
+#define STR_A2                "A2"
+#define STR_A3                "A3"
+#define STR_A4                "A4"
+#define STR_BATT              "RxBt"
+#define STR_ALT               "Alt"
+#define STR_TEMP1             "Tmp1"
+#define STR_TEMP2             "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM               "RPM"
+#define STR_FUEL              "Fuel"
+#define STR_VSPD              "VSpd"
+#define STR_ACCX              "AccX"
+#define STR_ACCY              "AccY"
+#define STR_ACCZ              "AccZ"
+#define STR_GYROX             "GYRX"
+#define STR_GYROY             "GYRY"
+#define STR_GYROZ             "GYRZ"
+#define STR_CURR              "Curr"
+#define STR_CAPACITY          "Capa"
+#define STR_VFAS              "VFAS"
+#define STR_BATT_PERCENT      "Bat%"
+#define STR_ASPD              "ASpd"
+#define STR_GSPD              "GSpd"
+#define STR_HDG               "Hdg"
+#define STR_SATELLITES        "Sats"
+#define STR_CELLS             "Cels"
+#define STR_GPSALT            "GAlt"
+#define STR_GPSDATETIME       "Data"
+#define STR_BATT1_VOLTAGE     "RB1V"
+#define STR_BATT2_VOLTAGE     "RB2V"
+#define STR_BATT1_CURRENT     "RB1A"
+#define STR_BATT2_CURRENT     "RB2A"
+#define STR_BATT1_CONSUMPTION "RB1C"
+#define STR_BATT2_CONSUMPTION "RB2C"
+#define STR_BATT1_TEMP        "RB1T"
+#define STR_BATT2_TEMP        "RB2T"
+#define STR_RB_STATE          "RBS"
+#define STR_CHANS_STATE       "RBCS"
+#define STR_RX_RSSI1          "1RSS"
+#define STR_RX_RSSI2          "2RSS"
+#define STR_RX_QUALITY        "RQly"
+#define STR_RX_SNR            "RSNR"
+#define STR_RX_NOISE          "RNse"
+#define STR_RF_MODE           "RFMD"
+#define STR_TX_POWER          "TPWR"
+#define STR_TX_RSSI           "TRSS"
+#define STR_TX_QUALITY        "TQly"
+#define STR_TX_SNR            "TSNR"
+#define STR_TX_NOISE          "TNse"
+#define STR_PITCH             "Ptch"
+#define STR_ROLL              "Roll"
+#define STR_YAW               "Yaw"
+#define STR_THROTTLE          "Thr"
+#define STR_QOS_A             "FdeA"
+#define STR_QOS_B             "FdeB"
+#define STR_QOS_L             "FdeL"
+#define STR_QOS_R             "FdeR"
+#define STR_QOS_F             "FLss"
+#define STR_QOS_H             "Hold"
+#define STR_LAP_NUMBER        "Lap "
+#define STR_GATE_NUMBER       "Gate"
+#define STR_LAP_TIME          "LapT"
+#define STR_GATE_TIME         "GteT"
+#define STR_ESC_VOLTAGE       "EscV"
+#define STR_ESC_CURRENT       "EscA"
+#define STR_ESC_RPM           "Erpm"
+#define STR_ESC_CONSUMPTION   "EscC"
+#define STR_ESC_TEMP          "EscT"
+#define STR_SD1_CHANNEL       "Chan"
+#define STR_GASSUIT_TEMP1     "GTp1"
+#define STR_GASSUIT_TEMP2     "GTp2"
+#define STR_GASSUIT_RPM       "GRPM"
+#define STR_GASSUIT_FLOW      "GFlo"
+#define STR_GASSUIT_CONS      "GFue"
+#define STR_GASSUIT_RES_VOL   "GRVl"
+#define STR_GASSUIT_RES_PERC  "GRPc"
+#define STR_GASSUIT_MAX_FLOW  "GMFl"
+#define STR_GASSUIT_AVG_FLOW  "GAFl"
+#define STR_SBEC_VOLTAGE      "BecV"
+#define STR_SBEC_CURRENT      "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"
diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt
index fc39d9eb2..f8c132f8e 100644
--- a/radio/src/translations/nl.h.txt
+++ b/radio/src/translations/nl.h.txt
@@ -1277,161 +1277,157 @@
 #define TR_AUTH_FAILURE                "Auth-failure"
 #define TR_RACING_MODE                 "Racing mode"
 
-#define ZSTR_VFR               "VFR"
-#define ZSTR_RSSI              "RSSI"
-#define ZSTR_R9PW                      "R9PW"
-#define ZSTR_RAS               "SWR"
-#define ZSTR_A1                "A1"
-#define ZSTR_A2                "A2"
-#define ZSTR_A3                "A3"
-#define ZSTR_A4                "A4"
-#define ZSTR_BATT              "RxBt"
-#define ZSTR_ALT               "Alt"
-#define ZSTR_TEMP1             "Tmp1"
-#define ZSTR_TEMP2             "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM               "RPM"
-#define ZSTR_FUEL              "Fuel"
-#define ZSTR_VSPD              "VSpd"
-#define ZSTR_ACCX              "AccX"
-#define ZSTR_ACCY              "AccY"
-#define ZSTR_ACCZ              "AccZ"
-#define ZSTR_GYROX             "GYRX"
-#define ZSTR_GYROY             "GYRY"
-#define ZSTR_GYROZ             "GYRZ"
-#define ZSTR_CURR              "Curr"
-#define ZSTR_CAPACITY          "Capa"
-#define ZSTR_VFAS              "VFAS"
-#define ZSTR_BATT_PERCENT      "Bat%"
-#define ZSTR_ASPD              "ASpd"
-#define ZSTR_GSPD              "GSpd"
-#define ZSTR_HDG               "Hdg"
-#define ZSTR_SATELLITES        "Sats"
-#define ZSTR_CELLS             "Cels"
-#define ZSTR_GPSALT            "GAlt"
-#define ZSTR_GPSDATETIME       "Date"
-#define ZSTR_GPS               "GPS"
-#define ZSTR_BATT1_VOLTAGE     "RB1V"
-#define ZSTR_BATT2_VOLTAGE     "RB2V"
-#define ZSTR_BATT1_CURRENT     "RB1A"
-#define ZSTR_BATT2_CURRENT     "RB2A"
-#define ZSTR_BATT1_CONSUMPTION "RB1C"
-#define ZSTR_BATT2_CONSUMPTION "RB2C"
-#define ZSTR_BATT1_TEMP        "RB1T"
-#define ZSTR_BATT2_TEMP        "RB2T"
-#define ZSTR_RB_STATE          "RBS"
-#define ZSTR_CHANS_STATE       "RBCS"
-#define ZSTR_RX_RSSI1          "1RSS"
-#define ZSTR_RX_RSSI2          "2RSS"
-#define ZSTR_RX_QUALITY        "RQly"
-#define ZSTR_RX_SNR            "RSNR"
-#define ZSTR_RX_NOISE          "RNse"
-#define ZSTR_ANTENNA           "ANT"
-#define ZSTR_RF_MODE           "RFMD"
-#define ZSTR_TX_POWER          "TPWR"
-#define ZSTR_TX_RSSI           "TRSS"
-#define ZSTR_TX_QUALITY        "TQly"
-#define ZSTR_TX_SNR            "TSNR"
-#define ZSTR_TX_NOISE          "TNse"
-#define ZSTR_PITCH             "Ptch"
-#define ZSTR_ROLL              "Roll"
-#define ZSTR_YAW               "Yaw"
-#define ZSTR_FLIGHT_MODE       "FM"
-#define ZSTR_THROTTLE          "Thr"
-#define ZSTR_QOS_A             "FdeA"
-#define ZSTR_QOS_B             "FdeB"
-#define ZSTR_QOS_L             "FdeL"
-#define ZSTR_QOS_R             "FdeR"
-#define ZSTR_QOS_F             "FLss"
-#define ZSTR_QOS_H             "Hold"
-#define ZSTR_BIND              "BIND"
-#define ZSTR_LAP_NUMBER        "Lap "
-#define ZSTR_GATE_NUMBER       "Gate"
-#define ZSTR_LAP_TIME          "LapT"
-#define ZSTR_GATE_TIME         "GteT"
-#define ZSTR_ESC_VOLTAGE       "EscV"
-#define ZSTR_ESC_CURRENT       "EscA"
-#define ZSTR_ESC_RPM           "Erpm"
-#define ZSTR_ESC_CONSUMPTION   "EscC"
-#define ZSTR_ESC_TEMP          "EscT"
-#define ZSTR_SD1_CHANNEL       "Chan"
-#define ZSTR_GASSUIT_TEMP1     "GTp1"
-#define ZSTR_GASSUIT_TEMP2     "GTp2"
-#define ZSTR_GASSUIT_RPM       "GRPM"
-#define ZSTR_GASSUIT_FLOW      "GFlo"
-#define ZSTR_GASSUIT_CONS      "GFue"
-#define ZSTR_GASSUIT_RES_VOL   "GRVl"
-#define ZSTR_GASSUIT_RES_PERC  "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW  "GMFl"
-#define ZSTR_GASSUIT_AVG_FLOW  "GAFl"
-#define ZSTR_SBEC_VOLTAGE      "BecV"
-#define ZSTR_SBEC_CURRENT      "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR               "VFR"
+#define STR_RSSI              "RSSI"
+#define STR_R9PW                      "R9PW"
+#define STR_RAS               "SWR"
+#define STR_A1                "A1"
+#define STR_A2                "A2"
+#define STR_A3                "A3"
+#define STR_A4                "A4"
+#define STR_BATT              "RxBt"
+#define STR_ALT               "Alt"
+#define STR_TEMP1             "Tmp1"
+#define STR_TEMP2             "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM               "RPM"
+#define STR_FUEL              "Fuel"
+#define STR_VSPD              "VSpd"
+#define STR_ACCX              "AccX"
+#define STR_ACCY              "AccY"
+#define STR_ACCZ              "AccZ"
+#define STR_GYROX             "GYRX"
+#define STR_GYROY             "GYRY"
+#define STR_GYROZ             "GYRZ"
+#define STR_CURR              "Curr"
+#define STR_CAPACITY          "Capa"
+#define STR_VFAS              "VFAS"
+#define STR_BATT_PERCENT      "Bat%"
+#define STR_ASPD              "ASpd"
+#define STR_GSPD              "GSpd"
+#define STR_HDG               "Hdg"
+#define STR_SATELLITES        "Sats"
+#define STR_CELLS             "Cels"
+#define STR_GPSALT            "GAlt"
+#define STR_GPSDATETIME       "Date"
+#define STR_BATT1_VOLTAGE     "RB1V"
+#define STR_BATT2_VOLTAGE     "RB2V"
+#define STR_BATT1_CURRENT     "RB1A"
+#define STR_BATT2_CURRENT     "RB2A"
+#define STR_BATT1_CONSUMPTION "RB1C"
+#define STR_BATT2_CONSUMPTION "RB2C"
+#define STR_BATT1_TEMP        "RB1T"
+#define STR_BATT2_TEMP        "RB2T"
+#define STR_RB_STATE          "RBS"
+#define STR_CHANS_STATE       "RBCS"
+#define STR_RX_RSSI1          "1RSS"
+#define STR_RX_RSSI2          "2RSS"
+#define STR_RX_QUALITY        "RQly"
+#define STR_RX_SNR            "RSNR"
+#define STR_RX_NOISE          "RNse"
+#define STR_RF_MODE           "RFMD"
+#define STR_TX_POWER          "TPWR"
+#define STR_TX_RSSI           "TRSS"
+#define STR_TX_QUALITY        "TQly"
+#define STR_TX_SNR            "TSNR"
+#define STR_TX_NOISE          "TNse"
+#define STR_PITCH             "Ptch"
+#define STR_ROLL              "Roll"
+#define STR_YAW               "Yaw"
+#define STR_THROTTLE          "Thr"
+#define STR_QOS_A             "FdeA"
+#define STR_QOS_B             "FdeB"
+#define STR_QOS_L             "FdeL"
+#define STR_QOS_R             "FdeR"
+#define STR_QOS_F             "FLss"
+#define STR_QOS_H             "Hold"
+#define STR_LAP_NUMBER        "Lap "
+#define STR_GATE_NUMBER       "Gate"
+#define STR_LAP_TIME          "LapT"
+#define STR_GATE_TIME         "GteT"
+#define STR_ESC_VOLTAGE       "EscV"
+#define STR_ESC_CURRENT       "EscA"
+#define STR_ESC_RPM           "Erpm"
+#define STR_ESC_CONSUMPTION   "EscC"
+#define STR_ESC_TEMP          "EscT"
+#define STR_SD1_CHANNEL       "Chan"
+#define STR_GASSUIT_TEMP1     "GTp1"
+#define STR_GASSUIT_TEMP2     "GTp2"
+#define STR_GASSUIT_RPM       "GRPM"
+#define STR_GASSUIT_FLOW      "GFlo"
+#define STR_GASSUIT_CONS      "GFue"
+#define STR_GASSUIT_RES_VOL   "GRVl"
+#define STR_GASSUIT_RES_PERC  "GRPc"
+#define STR_GASSUIT_MAX_FLOW  "GMFl"
+#define STR_GASSUIT_AVG_FLOW  "GAFl"
+#define STR_SBEC_VOLTAGE      "BecV"
+#define STR_SBEC_CURRENT      "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index 933ad87ee..d0259b62a 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -1286,161 +1286,157 @@
 #define TR_AUTH_FAILURE                "Auth-failure"
 #define TR_RACING_MODE                 "Racing mode"
 
-#define ZSTR_VFR               "VFR"
-#define ZSTR_RSSI              "RSSI"
-#define ZSTR_R9PW                      "R9PW"
-#define ZSTR_RAS               "SWR"
-#define ZSTR_A1                "A1"
-#define ZSTR_A2                "A2"
-#define ZSTR_A3                "A3"
-#define ZSTR_A4                "A4"
-#define ZSTR_BATT              "RxBt"
-#define ZSTR_ALT               "Alt"
-#define ZSTR_TEMP1             "Tmp1"
-#define ZSTR_TEMP2             "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM               "RPM"
-#define ZSTR_FUEL              "Fuel"
-#define ZSTR_VSPD              "VSpd"
-#define ZSTR_ACCX              "AccX"
-#define ZSTR_ACCY              "AccY"
-#define ZSTR_ACCZ              "AccZ"
-#define ZSTR_GYROX             "GYRX"
-#define ZSTR_GYROY             "GYRY"
-#define ZSTR_GYROZ             "GYRZ"
-#define ZSTR_CURR              "Curr"
-#define ZSTR_CAPACITY          "Capa"
-#define ZSTR_VFAS              "VFAS"
-#define ZSTR_BATT_PERCENT      "Bat%"
-#define ZSTR_ASPD              "ASpd"
-#define ZSTR_GSPD              "GSpd"
-#define ZSTR_HDG               "Hdg"
-#define ZSTR_SATELLITES        "Sats"
-#define ZSTR_CELLS             "Cels"
-#define ZSTR_GPSALT            "GAlt"
-#define ZSTR_GPSDATETIME       "Date"
-#define ZSTR_GPS               "GPS"
-#define ZSTR_BATT1_VOLTAGE     "RB1V"
-#define ZSTR_BATT2_VOLTAGE     "RB2V"
-#define ZSTR_BATT1_CURRENT     "RB1A"
-#define ZSTR_BATT2_CURRENT     "RB2A"
-#define ZSTR_BATT1_CONSUMPTION "RB1C"
-#define ZSTR_BATT2_CONSUMPTION "RB2C"
-#define ZSTR_BATT1_TEMP        "RB1T"
-#define ZSTR_BATT2_TEMP        "RB2T"
-#define ZSTR_RB_STATE          "RBS"
-#define ZSTR_CHANS_STATE       "RBCS"
-#define ZSTR_RX_RSSI1          "1RSS"
-#define ZSTR_RX_RSSI2          "2RSS"
-#define ZSTR_RX_QUALITY        "RQly"
-#define ZSTR_RX_SNR            "RSNR"
-#define ZSTR_RX_NOISE          "RNse"
-#define ZSTR_ANTENNA           "ANT"
-#define ZSTR_RF_MODE           "RFMD"
-#define ZSTR_TX_POWER          "TPWR"
-#define ZSTR_TX_RSSI           "TRSS"
-#define ZSTR_TX_QUALITY        "TQly"
-#define ZSTR_TX_SNR            "TSNR"
-#define ZSTR_TX_NOISE          "TNse"
-#define ZSTR_PITCH             "Ptch"
-#define ZSTR_ROLL              "Roll"
-#define ZSTR_YAW               "Yaw"
-#define ZSTR_FLIGHT_MODE       "FM"
-#define ZSTR_THROTTLE          "Thr"
-#define ZSTR_QOS_A             "FdeA"
-#define ZSTR_QOS_B             "FdeB"
-#define ZSTR_QOS_L             "FdeL"
-#define ZSTR_QOS_R             "FdeR"
-#define ZSTR_QOS_F             "FLss"
-#define ZSTR_QOS_H             "Hold"
-#define ZSTR_BIND              "BIND"
-#define ZSTR_LAP_NUMBER        "Lap "
-#define ZSTR_GATE_NUMBER       "Gate"
-#define ZSTR_LAP_TIME          "LapT"
-#define ZSTR_GATE_TIME         "GteT"
-#define ZSTR_ESC_VOLTAGE       "EscV"
-#define ZSTR_ESC_CURRENT       "EscA"
-#define ZSTR_ESC_RPM           "Erpm"
-#define ZSTR_ESC_CONSUMPTION   "EscC"
-#define ZSTR_ESC_TEMP          "EscT"
-#define ZSTR_SD1_CHANNEL       "Chan"
-#define ZSTR_GASSUIT_TEMP1     "GTp1"
-#define ZSTR_GASSUIT_TEMP2     "GTp2"
-#define ZSTR_GASSUIT_RPM       "GRPM"
-#define ZSTR_GASSUIT_FLOW      "GFlo"
-#define ZSTR_GASSUIT_CONS      "GFue"
-#define ZSTR_GASSUIT_RES_VOL   "GRVl"
-#define ZSTR_GASSUIT_RES_PERC  "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW  "GMFl"
-#define ZSTR_GASSUIT_AVG_FLOW  "GAFl"
-#define ZSTR_SBEC_VOLTAGE      "BecV"
-#define ZSTR_SBEC_CURRENT      "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR               "VFR"
+#define STR_RSSI              "RSSI"
+#define STR_R9PW                      "R9PW"
+#define STR_RAS               "SWR"
+#define STR_A1                "A1"
+#define STR_A2                "A2"
+#define STR_A3                "A3"
+#define STR_A4                "A4"
+#define STR_BATT              "RxBt"
+#define STR_ALT               "Alt"
+#define STR_TEMP1             "Tmp1"
+#define STR_TEMP2             "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM               "RPM"
+#define STR_FUEL              "Fuel"
+#define STR_VSPD              "VSpd"
+#define STR_ACCX              "AccX"
+#define STR_ACCY              "AccY"
+#define STR_ACCZ              "AccZ"
+#define STR_GYROX             "GYRX"
+#define STR_GYROY             "GYRY"
+#define STR_GYROZ             "GYRZ"
+#define STR_CURR              "Curr"
+#define STR_CAPACITY          "Capa"
+#define STR_VFAS              "VFAS"
+#define STR_BATT_PERCENT      "Bat%"
+#define STR_ASPD              "ASpd"
+#define STR_GSPD              "GSpd"
+#define STR_HDG               "Hdg"
+#define STR_SATELLITES        "Sats"
+#define STR_CELLS             "Cels"
+#define STR_GPSALT            "GAlt"
+#define STR_GPSDATETIME       "Date"
+#define STR_BATT1_VOLTAGE     "RB1V"
+#define STR_BATT2_VOLTAGE     "RB2V"
+#define STR_BATT1_CURRENT     "RB1A"
+#define STR_BATT2_CURRENT     "RB2A"
+#define STR_BATT1_CONSUMPTION "RB1C"
+#define STR_BATT2_CONSUMPTION "RB2C"
+#define STR_BATT1_TEMP        "RB1T"
+#define STR_BATT2_TEMP        "RB2T"
+#define STR_RB_STATE          "RBS"
+#define STR_CHANS_STATE       "RBCS"
+#define STR_RX_RSSI1          "1RSS"
+#define STR_RX_RSSI2          "2RSS"
+#define STR_RX_QUALITY        "RQly"
+#define STR_RX_SNR            "RSNR"
+#define STR_RX_NOISE          "RNse"
+#define STR_RF_MODE           "RFMD"
+#define STR_TX_POWER          "TPWR"
+#define STR_TX_RSSI           "TRSS"
+#define STR_TX_QUALITY        "TQly"
+#define STR_TX_SNR            "TSNR"
+#define STR_TX_NOISE          "TNse"
+#define STR_PITCH             "Ptch"
+#define STR_ROLL              "Roll"
+#define STR_YAW               "Yaw"
+#define STR_THROTTLE          "Thr"
+#define STR_QOS_A             "FdeA"
+#define STR_QOS_B             "FdeB"
+#define STR_QOS_L             "FdeL"
+#define STR_QOS_R             "FdeR"
+#define STR_QOS_F             "FLss"
+#define STR_QOS_H             "Hold"
+#define STR_LAP_NUMBER        "Lap "
+#define STR_GATE_NUMBER       "Gate"
+#define STR_LAP_TIME          "LapT"
+#define STR_GATE_TIME         "GteT"
+#define STR_ESC_VOLTAGE       "EscV"
+#define STR_ESC_CURRENT       "EscA"
+#define STR_ESC_RPM           "Erpm"
+#define STR_ESC_CONSUMPTION   "EscC"
+#define STR_ESC_TEMP          "EscT"
+#define STR_SD1_CHANNEL       "Chan"
+#define STR_GASSUIT_TEMP1     "GTp1"
+#define STR_GASSUIT_TEMP2     "GTp2"
+#define STR_GASSUIT_RPM       "GRPM"
+#define STR_GASSUIT_FLOW      "GFlo"
+#define STR_GASSUIT_CONS      "GFue"
+#define STR_GASSUIT_RES_VOL   "GRVl"
+#define STR_GASSUIT_RES_PERC  "GRPc"
+#define STR_GASSUIT_MAX_FLOW  "GMFl"
+#define STR_GASSUIT_AVG_FLOW  "GAFl"
+#define STR_SBEC_VOLTAGE      "BecV"
+#define STR_SBEC_CURRENT      "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index abd610af5..a33ebe0fe 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -1285,161 +1285,157 @@
 #define TR_RTC_CHECK           TR("Check RTC", "Check RTC voltage")
 #define TR_AUTH_FAILURE        "Auth-failure"
 #define TR_RACING_MODE         "Racing mode"
-#define ZSTR_VFR               "VFR"
-#define ZSTR_RSSI              "RSSI"
-#define ZSTR_R9PW                      "R9PW"
-#define ZSTR_RAS               "SWR"
-#define ZSTR_A1                "A1"
-#define ZSTR_A2                "A2"
-#define ZSTR_A3                "A3"
-#define ZSTR_A4                "A4"
-#define ZSTR_BATT              "RxBt"
-#define ZSTR_ALT               "Alt"
-#define ZSTR_TEMP1             "Tmp1"
-#define ZSTR_TEMP2             "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM               "RPM"
-#define ZSTR_FUEL              "Fuel"
-#define ZSTR_VSPD              "VSpd"
-#define ZSTR_ACCX              "AccX"
-#define ZSTR_ACCY              "AccY"
-#define ZSTR_ACCZ              "AccZ"
-#define ZSTR_GYROX             "GYRX"
-#define ZSTR_GYROY             "GYRY"
-#define ZSTR_GYROZ             "GYRZ"
-#define ZSTR_CURR              "Curr"
-#define ZSTR_CAPACITY          "Capa"
-#define ZSTR_VFAS              "VFAS"
-#define ZSTR_BATT_PERCENT      "Bat%"
-#define ZSTR_ASPD              "ASpd"
-#define ZSTR_GSPD              "GSpd"
-#define ZSTR_HDG               "Hdg"
-#define ZSTR_SATELLITES        "Sats"
-#define ZSTR_CELLS             "Cels"
-#define ZSTR_GPSALT            "GAlt"
-#define ZSTR_GPSDATETIME       "Date"
-#define ZSTR_GPS               "GPS"
-#define ZSTR_BATT1_VOLTAGE     "RB1V"
-#define ZSTR_BATT2_VOLTAGE     "RB2V"
-#define ZSTR_BATT1_CURRENT     "RB1A"
-#define ZSTR_BATT2_CURRENT     "RB2A"
-#define ZSTR_BATT1_CONSUMPTION "RB1C"
-#define ZSTR_BATT2_CONSUMPTION "RB2C"
-#define ZSTR_BATT1_TEMP        "RB1T"
-#define ZSTR_BATT2_TEMP        "RB2T"
-#define ZSTR_RB_STATE          "RBS"
-#define ZSTR_CHANS_STATE       "RBCS"
-#define ZSTR_RX_RSSI1          "1RSS"
-#define ZSTR_RX_RSSI2          "2RSS"
-#define ZSTR_RX_QUALITY        "RQly"
-#define ZSTR_RX_SNR            "RSNR"
-#define ZSTR_RX_NOISE          "RNse"
-#define ZSTR_ANTENNA           "ANT"
-#define ZSTR_RF_MODE           "RFMD"
-#define ZSTR_TX_POWER          "TPWR"
-#define ZSTR_TX_RSSI           "TRSS"
-#define ZSTR_TX_QUALITY        "TQly"
-#define ZSTR_TX_SNR            "TSNR"
-#define ZSTR_TX_NOISE          "TNse"
-#define ZSTR_PITCH             "Ptch"
-#define ZSTR_ROLL              "Roll"
-#define ZSTR_YAW               "Yaw"
-#define ZSTR_FLIGHT_MODE       "FM"
-#define ZSTR_THROTTLE          "Thr"
-#define ZSTR_QOS_A             "FdeA"
-#define ZSTR_QOS_B             "FdeB"
-#define ZSTR_QOS_L             "FdeL"
-#define ZSTR_QOS_R             "FdeR"
-#define ZSTR_QOS_F             "FLss"
-#define ZSTR_QOS_H             "Hold"
-#define ZSTR_BIND              "BIND"
-#define ZSTR_LAP_NUMBER        "Lap "
-#define ZSTR_GATE_NUMBER       "Gate"
-#define ZSTR_LAP_TIME          "LapT"
-#define ZSTR_GATE_TIME         "GteT"
-#define ZSTR_ESC_VOLTAGE       "EscV"
-#define ZSTR_ESC_CURRENT       "EscA"
-#define ZSTR_ESC_RPM           "Erpm"
-#define ZSTR_ESC_CONSUMPTION   "EscC"
-#define ZSTR_ESC_TEMP          "EscT"
-#define ZSTR_SD1_CHANNEL       "Chan"
-#define ZSTR_GASSUIT_TEMP1     "GTp1"
-#define ZSTR_GASSUIT_TEMP2     "GTp2"
-#define ZSTR_GASSUIT_RPM       "GRPM"
-#define ZSTR_GASSUIT_FLOW      "GFlo"
-#define ZSTR_GASSUIT_CONS      "GFue"
-#define ZSTR_GASSUIT_RES_VOL   "GRVl"
-#define ZSTR_GASSUIT_RES_PERC  "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW  "GMFl"
-#define ZSTR_GASSUIT_AVG_FLOW  "GAFl"
-#define ZSTR_SBEC_VOLTAGE      "BecV"
-#define ZSTR_SBEC_CURRENT      "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR               "VFR"
+#define STR_RSSI              "RSSI"
+#define STR_R9PW                      "R9PW"
+#define STR_RAS               "SWR"
+#define STR_A1                "A1"
+#define STR_A2                "A2"
+#define STR_A3                "A3"
+#define STR_A4                "A4"
+#define STR_BATT              "RxBt"
+#define STR_ALT               "Alt"
+#define STR_TEMP1             "Tmp1"
+#define STR_TEMP2             "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM               "RPM"
+#define STR_FUEL              "Fuel"
+#define STR_VSPD              "VSpd"
+#define STR_ACCX              "AccX"
+#define STR_ACCY              "AccY"
+#define STR_ACCZ              "AccZ"
+#define STR_GYROX             "GYRX"
+#define STR_GYROY             "GYRY"
+#define STR_GYROZ             "GYRZ"
+#define STR_CURR              "Curr"
+#define STR_CAPACITY          "Capa"
+#define STR_VFAS              "VFAS"
+#define STR_BATT_PERCENT      "Bat%"
+#define STR_ASPD              "ASpd"
+#define STR_GSPD              "GSpd"
+#define STR_HDG               "Hdg"
+#define STR_SATELLITES        "Sats"
+#define STR_CELLS             "Cels"
+#define STR_GPSALT            "GAlt"
+#define STR_GPSDATETIME       "Date"
+#define STR_BATT1_VOLTAGE     "RB1V"
+#define STR_BATT2_VOLTAGE     "RB2V"
+#define STR_BATT1_CURRENT     "RB1A"
+#define STR_BATT2_CURRENT     "RB2A"
+#define STR_BATT1_CONSUMPTION "RB1C"
+#define STR_BATT2_CONSUMPTION "RB2C"
+#define STR_BATT1_TEMP        "RB1T"
+#define STR_BATT2_TEMP        "RB2T"
+#define STR_RB_STATE          "RBS"
+#define STR_CHANS_STATE       "RBCS"
+#define STR_RX_RSSI1          "1RSS"
+#define STR_RX_RSSI2          "2RSS"
+#define STR_RX_QUALITY        "RQly"
+#define STR_RX_SNR            "RSNR"
+#define STR_RX_NOISE          "RNse"
+#define STR_RF_MODE           "RFMD"
+#define STR_TX_POWER          "TPWR"
+#define STR_TX_RSSI           "TRSS"
+#define STR_TX_QUALITY        "TQly"
+#define STR_TX_SNR            "TSNR"
+#define STR_TX_NOISE          "TNse"
+#define STR_PITCH             "Ptch"
+#define STR_ROLL              "Roll"
+#define STR_YAW               "Yaw"
+#define STR_THROTTLE          "Thr"
+#define STR_QOS_A             "FdeA"
+#define STR_QOS_B             "FdeB"
+#define STR_QOS_L             "FdeL"
+#define STR_QOS_R             "FdeR"
+#define STR_QOS_F             "FLss"
+#define STR_QOS_H             "Hold"
+#define STR_LAP_NUMBER        "Lap "
+#define STR_GATE_NUMBER       "Gate"
+#define STR_LAP_TIME          "LapT"
+#define STR_GATE_TIME         "GteT"
+#define STR_ESC_VOLTAGE       "EscV"
+#define STR_ESC_CURRENT       "EscA"
+#define STR_ESC_RPM           "Erpm"
+#define STR_ESC_CONSUMPTION   "EscC"
+#define STR_ESC_TEMP          "EscT"
+#define STR_SD1_CHANNEL       "Chan"
+#define STR_GASSUIT_TEMP1     "GTp1"
+#define STR_GASSUIT_TEMP2     "GTp2"
+#define STR_GASSUIT_RPM       "GRPM"
+#define STR_GASSUIT_FLOW      "GFlo"
+#define STR_GASSUIT_CONS      "GFue"
+#define STR_GASSUIT_RES_VOL   "GRVl"
+#define STR_GASSUIT_RES_PERC  "GRPc"
+#define STR_GASSUIT_MAX_FLOW  "GMFl"
+#define STR_GASSUIT_AVG_FLOW  "GAFl"
+#define STR_SBEC_VOLTAGE      "BecV"
+#define STR_SBEC_CURRENT      "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index abf63efbe..7addcd639 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -1289,161 +1289,157 @@
 #define TR_AUTH_FAILURE                "Auth-failure"
 #define TR_RACING_MODE                 "Racing mode"
 
-#define ZSTR_VFR               "VFR"
-#define ZSTR_RSSI              "RSSI"
-#define ZSTR_R9PW                      "R9PW"
-#define ZSTR_RAS               "SWR"
-#define ZSTR_A1                "A1"
-#define ZSTR_A2                "A2"
-#define ZSTR_A3                "A3"
-#define ZSTR_A4                "A4"
-#define ZSTR_BATT              "RxBt"
-#define ZSTR_ALT               "Alt"
-#define ZSTR_TEMP1             "Tmp1"
-#define ZSTR_TEMP2             "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM               "RPM"
-#define ZSTR_FUEL              "Fuel"
-#define ZSTR_VSPD              "VSpd"
-#define ZSTR_ACCX              "AccX"
-#define ZSTR_ACCY              "AccY"
-#define ZSTR_ACCZ              "AccZ"
-#define ZSTR_GYROX             "GYRX"
-#define ZSTR_GYROY             "GYRY"
-#define ZSTR_GYROZ             "GYRZ"
-#define ZSTR_CURR              "Curr"
-#define ZSTR_CAPACITY          "Capa"
-#define ZSTR_VFAS              "VFAS"
-#define ZSTR_BATT_PERCENT      "Bat%"
-#define ZSTR_ASPD              "ASpd"
-#define ZSTR_GSPD              "GSpd"
-#define ZSTR_HDG               "Hdg"
-#define ZSTR_SATELLITES        "Sats"
-#define ZSTR_CELLS             "Cels"
-#define ZSTR_GPSALT            "GAlt"
-#define ZSTR_GPSDATETIME       "Date"
-#define ZSTR_GPS               "GPS"
-#define ZSTR_BATT1_VOLTAGE     "RB1V"
-#define ZSTR_BATT2_VOLTAGE     "RB2V"
-#define ZSTR_BATT1_CURRENT     "RB1A"
-#define ZSTR_BATT2_CURRENT     "RB2A"
-#define ZSTR_BATT1_CONSUMPTION "RB1C"
-#define ZSTR_BATT2_CONSUMPTION "RB2C"
-#define ZSTR_BATT1_TEMP        "RB1T"
-#define ZSTR_BATT2_TEMP        "RB2T"
-#define ZSTR_RB_STATE          "RBS"
-#define ZSTR_CHANS_STATE       "RBCS"
-#define ZSTR_RX_RSSI1          "1RSS"
-#define ZSTR_RX_RSSI2          "2RSS"
-#define ZSTR_RX_QUALITY        "RQly"
-#define ZSTR_RX_SNR            "RSNR"
-#define ZSTR_RX_NOISE          "RNse"
-#define ZSTR_ANTENNA           "ANT"
-#define ZSTR_RF_MODE           "RFMD"
-#define ZSTR_TX_POWER          "TPWR"
-#define ZSTR_TX_RSSI           "TRSS"
-#define ZSTR_TX_QUALITY        "TQly"
-#define ZSTR_TX_SNR            "TSNR"
-#define ZSTR_TX_NOISE          "TNse"
-#define ZSTR_PITCH             "Ptch"
-#define ZSTR_ROLL              "Roll"
-#define ZSTR_YAW               "Yaw"
-#define ZSTR_FLIGHT_MODE       "FM"
-#define ZSTR_THROTTLE          "Thr"
-#define ZSTR_QOS_A             "FdeA"
-#define ZSTR_QOS_B             "FdeB"
-#define ZSTR_QOS_L             "FdeL"
-#define ZSTR_QOS_R             "FdeR"
-#define ZSTR_QOS_F             "FLss"
-#define ZSTR_QOS_H             "Hold"
-#define ZSTR_BIND              "BIND"
-#define ZSTR_LAP_NUMBER        "Lap "
-#define ZSTR_GATE_NUMBER       "Gate"
-#define ZSTR_LAP_TIME          "LapT"
-#define ZSTR_GATE_TIME         "GteT"
-#define ZSTR_ESC_VOLTAGE       "EscV"
-#define ZSTR_ESC_CURRENT       "EscA"
-#define ZSTR_ESC_RPM           "Erpm"
-#define ZSTR_ESC_CONSUMPTION   "EscC"
-#define ZSTR_ESC_TEMP          "EscT"
-#define ZSTR_SD1_CHANNEL       "Chan"
-#define ZSTR_GASSUIT_TEMP1     "GTp1"
-#define ZSTR_GASSUIT_TEMP2     "GTp2"
-#define ZSTR_GASSUIT_RPM       "GRPM"
-#define ZSTR_GASSUIT_FLOW      "GFlo"
-#define ZSTR_GASSUIT_CONS      "GFue"
-#define ZSTR_GASSUIT_RES_VOL   "GRVl"
-#define ZSTR_GASSUIT_RES_PERC  "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW  "GMFl"
-#define ZSTR_GASSUIT_AVG_FLOW  "GAFl"
-#define ZSTR_SBEC_VOLTAGE      "BecV"
-#define ZSTR_SBEC_CURRENT      "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR               "VFR"
+#define STR_RSSI              "RSSI"
+#define STR_R9PW                      "R9PW"
+#define STR_RAS               "SWR"
+#define STR_A1                "A1"
+#define STR_A2                "A2"
+#define STR_A3                "A3"
+#define STR_A4                "A4"
+#define STR_BATT              "RxBt"
+#define STR_ALT               "Alt"
+#define STR_TEMP1             "Tmp1"
+#define STR_TEMP2             "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM               "RPM"
+#define STR_FUEL              "Fuel"
+#define STR_VSPD              "VSpd"
+#define STR_ACCX              "AccX"
+#define STR_ACCY              "AccY"
+#define STR_ACCZ              "AccZ"
+#define STR_GYROX             "GYRX"
+#define STR_GYROY             "GYRY"
+#define STR_GYROZ             "GYRZ"
+#define STR_CURR              "Curr"
+#define STR_CAPACITY          "Capa"
+#define STR_VFAS              "VFAS"
+#define STR_BATT_PERCENT      "Bat%"
+#define STR_ASPD              "ASpd"
+#define STR_GSPD              "GSpd"
+#define STR_HDG               "Hdg"
+#define STR_SATELLITES        "Sats"
+#define STR_CELLS             "Cels"
+#define STR_GPSALT            "GAlt"
+#define STR_GPSDATETIME       "Date"
+#define STR_BATT1_VOLTAGE     "RB1V"
+#define STR_BATT2_VOLTAGE     "RB2V"
+#define STR_BATT1_CURRENT     "RB1A"
+#define STR_BATT2_CURRENT     "RB2A"
+#define STR_BATT1_CONSUMPTION "RB1C"
+#define STR_BATT2_CONSUMPTION "RB2C"
+#define STR_BATT1_TEMP        "RB1T"
+#define STR_BATT2_TEMP        "RB2T"
+#define STR_RB_STATE          "RBS"
+#define STR_CHANS_STATE       "RBCS"
+#define STR_RX_RSSI1          "1RSS"
+#define STR_RX_RSSI2          "2RSS"
+#define STR_RX_QUALITY        "RQly"
+#define STR_RX_SNR            "RSNR"
+#define STR_RX_NOISE          "RNse"
+#define STR_RF_MODE           "RFMD"
+#define STR_TX_POWER          "TPWR"
+#define STR_TX_RSSI           "TRSS"
+#define STR_TX_QUALITY        "TQly"
+#define STR_TX_SNR            "TSNR"
+#define STR_TX_NOISE          "TNse"
+#define STR_PITCH             "Ptch"
+#define STR_ROLL              "Roll"
+#define STR_YAW               "Yaw"
+#define STR_THROTTLE          "Thr"
+#define STR_QOS_A             "FdeA"
+#define STR_QOS_B             "FdeB"
+#define STR_QOS_L             "FdeL"
+#define STR_QOS_R             "FdeR"
+#define STR_QOS_F             "FLss"
+#define STR_QOS_H             "Hold"
+#define STR_LAP_NUMBER        "Lap "
+#define STR_GATE_NUMBER       "Gate"
+#define STR_LAP_TIME          "LapT"
+#define STR_GATE_TIME         "GteT"
+#define STR_ESC_VOLTAGE       "EscV"
+#define STR_ESC_CURRENT       "EscA"
+#define STR_ESC_RPM           "Erpm"
+#define STR_ESC_CONSUMPTION   "EscC"
+#define STR_ESC_TEMP          "EscT"
+#define STR_SD1_CHANNEL       "Chan"
+#define STR_GASSUIT_TEMP1     "GTp1"
+#define STR_GASSUIT_TEMP2     "GTp2"
+#define STR_GASSUIT_RPM       "GRPM"
+#define STR_GASSUIT_FLOW      "GFlo"
+#define STR_GASSUIT_CONS      "GFue"
+#define STR_GASSUIT_RES_VOL   "GRVl"
+#define STR_GASSUIT_RES_PERC  "GRPc"
+#define STR_GASSUIT_MAX_FLOW  "GMFl"
+#define STR_GASSUIT_AVG_FLOW  "GAFl"
+#define STR_SBEC_VOLTAGE      "BecV"
+#define STR_SBEC_CURRENT      "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"
diff --git a/radio/src/translations/tw.h.txt b/radio/src/translations/tw.h.txt
index ea30246bd..e492070ac 100644
--- a/radio/src/translations/tw.h.txt
+++ b/radio/src/translations/tw.h.txt
@@ -1167,161 +1167,157 @@
 #define TR_AUTH_FAILURE                "驗證失敗"
 #define TR_RACING_MODE                 "Racing mode"
 
-#define ZSTR_VFR                       "VFR"
-#define ZSTR_RSSI                      "RSSI"
-#define ZSTR_R9PW                      "R9PW"
-#define ZSTR_RAS                       "SWR"
-#define ZSTR_A1                        "A1"
-#define ZSTR_A2                        "A2"
-#define ZSTR_A3                        "A3"
-#define ZSTR_A4                        "A4"
-#define ZSTR_BATT                      "RxBt"
-#define ZSTR_ALT                       "Alt"
-#define ZSTR_TEMP1                     "Tmp1"
-#define ZSTR_TEMP2                     "Tmp2"
-#define ZSTR_TEMP3                     "Tmp3"
-#define ZSTR_TEMP4                     "Tmp4"
-#define ZSTR_RPM2                      "RPM2"
-#define ZSTR_PRES                      "Pres"
-#define ZSTR_ODO1                      "Odo1"
-#define ZSTR_ODO2                      "Odo2"
-#define ZSTR_TXV                       "TX_V"
-#define ZSTR_CURR_SERVO1               "CSv1"
-#define ZSTR_CURR_SERVO2               "CSv2"
-#define ZSTR_CURR_SERVO3               "CSv3"
-#define ZSTR_CURR_SERVO4               "CSv4"
-#define ZSTR_DIST                      "Dist"
-#define ZSTR_ARM                       "Arm"
-#define ZSTR_C50                       "C50"
-#define ZSTR_C200                      "C200"
-#define ZSTR_RPM                       "RPM"
-#define ZSTR_FUEL                      "Fuel"
-#define ZSTR_VSPD                      "VSpd"
-#define ZSTR_ACCX                      "AccX"
-#define ZSTR_ACCY                      "AccY"
-#define ZSTR_ACCZ                      "AccZ"
-#define ZSTR_GYROX                     "GYRX"
-#define ZSTR_GYROY                     "GYRY"
-#define ZSTR_GYROZ                     "GYRZ"
-#define ZSTR_CURR                      "Curr"
-#define ZSTR_CAPACITY                  "Capa"
-#define ZSTR_VFAS                      "VFAS"
-#define ZSTR_BATT_PERCENT              "Bat%"
-#define ZSTR_ASPD                      "ASpd"
-#define ZSTR_GSPD                      "GSpd"
-#define ZSTR_HDG                       "Hdg"
-#define ZSTR_SATELLITES                "Sats"
-#define ZSTR_CELLS                     "Cels"
-#define ZSTR_GPSALT                    "GAlt"
-#define ZSTR_GPSDATETIME               "Date"
-#define ZSTR_GPS                       "GPS"
-#define ZSTR_BATT1_VOLTAGE             "RB1V"
-#define ZSTR_BATT2_VOLTAGE             "RB2V"
-#define ZSTR_BATT1_CURRENT             "RB1A"
-#define ZSTR_BATT2_CURRENT             "RB2A"
-#define ZSTR_BATT1_CONSUMPTION         "RB1C"
-#define ZSTR_BATT2_CONSUMPTION         "RB2C"
-#define ZSTR_BATT1_TEMP                "RB1T"
-#define ZSTR_BATT2_TEMP                "RB2T"
-#define ZSTR_RB_STATE                  "RBS"
-#define ZSTR_CHANS_STATE               "RBCS"
-#define ZSTR_RX_RSSI1                  "1RSS"
-#define ZSTR_RX_RSSI2                  "2RSS"
-#define ZSTR_RX_QUALITY                "RQly"
-#define ZSTR_RX_SNR                    "RSNR"
-#define ZSTR_RX_NOISE                  "RNse"
-#define ZSTR_ANTENNA                   "ANT"
-#define ZSTR_RF_MODE                   "RFMD"
-#define ZSTR_TX_POWER                  "TPWR"
-#define ZSTR_TX_RSSI                   "TRSS"
-#define ZSTR_TX_QUALITY                "TQly"
-#define ZSTR_TX_SNR                    "TSNR"
-#define ZSTR_TX_NOISE                  "TNse"
-#define ZSTR_PITCH                     "Ptch"
-#define ZSTR_ROLL                      "Roll"
-#define ZSTR_YAW                       "Yaw"
-#define ZSTR_FLIGHT_MODE               "FM"
-#define ZSTR_THROTTLE                  "Thr"
-#define ZSTR_QOS_A                     "FdeA"
-#define ZSTR_QOS_B                     "FdeB"
-#define ZSTR_QOS_L                     "FdeL"
-#define ZSTR_QOS_R                     "FdeR"
-#define ZSTR_QOS_F                     "FLss"
-#define ZSTR_QOS_H                     "Hold"
-#define ZSTR_BIND                      "BIND"
-#define ZSTR_LAP_NUMBER                "Lap "
-#define ZSTR_GATE_NUMBER               "Gate"
-#define ZSTR_LAP_TIME                  "LapT"
-#define ZSTR_GATE_TIME                 "GteT"
-#define ZSTR_ESC_VOLTAGE               "EscV"
-#define ZSTR_ESC_CURRENT               "EscA"
-#define ZSTR_ESC_RPM                   "Erpm"
-#define ZSTR_ESC_CONSUMPTION           "EscC"
-#define ZSTR_ESC_TEMP                  "EscT"
-#define ZSTR_SD1_CHANNEL               "Chan"
-#define ZSTR_GASSUIT_TEMP1             "GTp1"
-#define ZSTR_GASSUIT_TEMP2             "GTp2"
-#define ZSTR_GASSUIT_RPM               "GRPM"
-#define ZSTR_GASSUIT_FLOW              "GFlo"
-#define ZSTR_GASSUIT_CONS              "GFue"
-#define ZSTR_GASSUIT_RES_VOL           "GRVl"
-#define ZSTR_GASSUIT_RES_PERC          "GRPc"
-#define ZSTR_GASSUIT_MAX_FLOW          "GMFl"
-#define ZSTR_GASSUIT_AVG_FLOW          "GAFl"
-#define ZSTR_SBEC_VOLTAGE              "BecV"
-#define ZSTR_SBEC_CURRENT              "BecA"
-#define ZSTR_RB3040_EXTRA_STATE        "RBES"
-#define ZSTR_RB3040_CHANNEL1           "CH1A"
-#define ZSTR_RB3040_CHANNEL2           "CH2A"
-#define ZSTR_RB3040_CHANNEL3           "CH3A"
-#define ZSTR_RB3040_CHANNEL4           "CH4A"
-#define ZSTR_RB3040_CHANNEL5           "CH5A"
-#define ZSTR_RB3040_CHANNEL6           "CH6A"
-#define ZSTR_RB3040_CHANNEL7           "CH7A"
-#define ZSTR_RB3040_CHANNEL8           "CH8A"
-#define ZSTR_ESC_VIN                   "EVIN"
-#define ZSTR_ESC_TFET                  "TFET"
-#define ZSTR_ESC_CUR                   "ECUR"
-#define ZSTR_ESC_TBEC                  "TBEC"
-#define ZSTR_ESC_BCUR                  "CBEC"
-#define ZSTR_ESC_VBEC                  "VBEC"
-#define ZSTR_ESC_THR                   "ETHR"
-#define ZSTR_ESC_POUT                  "EOUT"
-#define ZSTR_SMART_BAT_BTMP            "BTmp"
-#define ZSTR_SMART_BAT_BCUR            "BCur"
-#define ZSTR_SMART_BAT_BCAP            "BUse"
-#define ZSTR_SMART_BAT_MIN_CEL         "CLMi"
-#define ZSTR_SMART_BAT_MAX_CEL         "CLMa"
-#define ZSTR_SMART_BAT_CYCLES          "Cycl"
-#define ZSTR_SMART_BAT_CAPACITY        "BCpT"
-#define ZSTR_CL01                      "Cel1"
-#define ZSTR_CL02                      "Cel2"
-#define ZSTR_CL03                      "Cel3"
-#define ZSTR_CL04                      "Cel4"
-#define ZSTR_CL05                      "Cel5"
-#define ZSTR_CL06                      "Cel6"
-#define ZSTR_CL07                      "Cel7"
-#define ZSTR_CL08                      "Cel8"
-#define ZSTR_CL09                      "Cel9"
-#define ZSTR_CL10                      "Cl10"
-#define ZSTR_CL11                      "Cl11"
-#define ZSTR_CL12                      "Cl12"
-#define ZSTR_CL13                      "Cl13"
-#define ZSTR_CL14                      "Cl14"
-#define ZSTR_CL15                      "Cl15"
-#define ZSTR_CL16                      "Cl16"
-#define ZSTR_CL17                      "Cl17"
-#define ZSTR_CL18                      "Cl18"
-#define ZSTR_FRAME_RATE                "FRat"
-#define ZSTR_TOTAL_LATENCY             "TLat"
-#define ZSTR_VTX_FREQ                  "VFrq"
-#define ZSTR_VTX_PWR                   "VPwr"
-#define ZSTR_VTX_CHAN                  "VChn"
-#define ZSTR_VTX_BAND                  "VBan"
-#define ZSTR_SERVO_CURRENT             "SrvA"
-#define ZSTR_SERVO_VOLTAGE             "SrvV"
-#define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
-#define ZSTR_LOSS                      "Loss"
-#define ZSTR_SPEED                     "Spd "
-#define ZSTR_FLOW                      "Flow"
+#define STR_VFR                       "VFR"
+#define STR_RSSI                      "RSSI"
+#define STR_R9PW                      "R9PW"
+#define STR_RAS                       "SWR"
+#define STR_A1                        "A1"
+#define STR_A2                        "A2"
+#define STR_A3                        "A3"
+#define STR_A4                        "A4"
+#define STR_BATT                      "RxBt"
+#define STR_ALT                       "Alt"
+#define STR_TEMP1                     "Tmp1"
+#define STR_TEMP2                     "Tmp2"
+#define STR_TEMP3                     "Tmp3"
+#define STR_TEMP4                     "Tmp4"
+#define STR_RPM2                      "RPM2"
+#define STR_PRES                      "Pres"
+#define STR_ODO1                      "Odo1"
+#define STR_ODO2                      "Odo2"
+#define STR_TXV                       "TX_V"
+#define STR_CURR_SERVO1               "CSv1"
+#define STR_CURR_SERVO2               "CSv2"
+#define STR_CURR_SERVO3               "CSv3"
+#define STR_CURR_SERVO4               "CSv4"
+#define STR_DIST                      "Dist"
+#define STR_ARM                       "Arm"
+#define STR_C50                       "C50"
+#define STR_C200                      "C200"
+#define STR_RPM                       "RPM"
+#define STR_FUEL                      "Fuel"
+#define STR_VSPD                      "VSpd"
+#define STR_ACCX                      "AccX"
+#define STR_ACCY                      "AccY"
+#define STR_ACCZ                      "AccZ"
+#define STR_GYROX                     "GYRX"
+#define STR_GYROY                     "GYRY"
+#define STR_GYROZ                     "GYRZ"
+#define STR_CURR                      "Curr"
+#define STR_CAPACITY                  "Capa"
+#define STR_VFAS                      "VFAS"
+#define STR_BATT_PERCENT              "Bat%"
+#define STR_ASPD                      "ASpd"
+#define STR_GSPD                      "GSpd"
+#define STR_HDG                       "Hdg"
+#define STR_SATELLITES                "Sats"
+#define STR_CELLS                     "Cels"
+#define STR_GPSALT                    "GAlt"
+#define STR_GPSDATETIME               "Date"
+#define STR_BATT1_VOLTAGE             "RB1V"
+#define STR_BATT2_VOLTAGE             "RB2V"
+#define STR_BATT1_CURRENT             "RB1A"
+#define STR_BATT2_CURRENT             "RB2A"
+#define STR_BATT1_CONSUMPTION         "RB1C"
+#define STR_BATT2_CONSUMPTION         "RB2C"
+#define STR_BATT1_TEMP                "RB1T"
+#define STR_BATT2_TEMP                "RB2T"
+#define STR_RB_STATE                  "RBS"
+#define STR_CHANS_STATE               "RBCS"
+#define STR_RX_RSSI1                  "1RSS"
+#define STR_RX_RSSI2                  "2RSS"
+#define STR_RX_QUALITY                "RQly"
+#define STR_RX_SNR                    "RSNR"
+#define STR_RX_NOISE                  "RNse"
+#define STR_RF_MODE                   "RFMD"
+#define STR_TX_POWER                  "TPWR"
+#define STR_TX_RSSI                   "TRSS"
+#define STR_TX_QUALITY                "TQly"
+#define STR_TX_SNR                    "TSNR"
+#define STR_TX_NOISE                  "TNse"
+#define STR_PITCH                     "Ptch"
+#define STR_ROLL                      "Roll"
+#define STR_YAW                       "Yaw"
+#define STR_THROTTLE                  "Thr"
+#define STR_QOS_A                     "FdeA"
+#define STR_QOS_B                     "FdeB"
+#define STR_QOS_L                     "FdeL"
+#define STR_QOS_R                     "FdeR"
+#define STR_QOS_F                     "FLss"
+#define STR_QOS_H                     "Hold"
+#define STR_LAP_NUMBER                "Lap "
+#define STR_GATE_NUMBER               "Gate"
+#define STR_LAP_TIME                  "LapT"
+#define STR_GATE_TIME                 "GteT"
+#define STR_ESC_VOLTAGE               "EscV"
+#define STR_ESC_CURRENT               "EscA"
+#define STR_ESC_RPM                   "Erpm"
+#define STR_ESC_CONSUMPTION           "EscC"
+#define STR_ESC_TEMP                  "EscT"
+#define STR_SD1_CHANNEL               "Chan"
+#define STR_GASSUIT_TEMP1             "GTp1"
+#define STR_GASSUIT_TEMP2             "GTp2"
+#define STR_GASSUIT_RPM               "GRPM"
+#define STR_GASSUIT_FLOW              "GFlo"
+#define STR_GASSUIT_CONS              "GFue"
+#define STR_GASSUIT_RES_VOL           "GRVl"
+#define STR_GASSUIT_RES_PERC          "GRPc"
+#define STR_GASSUIT_MAX_FLOW          "GMFl"
+#define STR_GASSUIT_AVG_FLOW          "GAFl"
+#define STR_SBEC_VOLTAGE              "BecV"
+#define STR_SBEC_CURRENT              "BecA"
+#define STR_RB3040_EXTRA_STATE        "RBES"
+#define STR_RB3040_CHANNEL1           "CH1A"
+#define STR_RB3040_CHANNEL2           "CH2A"
+#define STR_RB3040_CHANNEL3           "CH3A"
+#define STR_RB3040_CHANNEL4           "CH4A"
+#define STR_RB3040_CHANNEL5           "CH5A"
+#define STR_RB3040_CHANNEL6           "CH6A"
+#define STR_RB3040_CHANNEL7           "CH7A"
+#define STR_RB3040_CHANNEL8           "CH8A"
+#define STR_ESC_VIN                   "EVIN"
+#define STR_ESC_TFET                  "TFET"
+#define STR_ESC_CUR                   "ECUR"
+#define STR_ESC_TBEC                  "TBEC"
+#define STR_ESC_BCUR                  "CBEC"
+#define STR_ESC_VBEC                  "VBEC"
+#define STR_ESC_THR                   "ETHR"
+#define STR_ESC_POUT                  "EOUT"
+#define STR_SMART_BAT_BTMP            "BTmp"
+#define STR_SMART_BAT_BCUR            "BCur"
+#define STR_SMART_BAT_BCAP            "BUse"
+#define STR_SMART_BAT_MIN_CEL         "CLMi"
+#define STR_SMART_BAT_MAX_CEL         "CLMa"
+#define STR_SMART_BAT_CYCLES          "Cycl"
+#define STR_SMART_BAT_CAPACITY        "BCpT"
+#define STR_CL01                      "Cel1"
+#define STR_CL02                      "Cel2"
+#define STR_CL03                      "Cel3"
+#define STR_CL04                      "Cel4"
+#define STR_CL05                      "Cel5"
+#define STR_CL06                      "Cel6"
+#define STR_CL07                      "Cel7"
+#define STR_CL08                      "Cel8"
+#define STR_CL09                      "Cel9"
+#define STR_CL10                      "Cl10"
+#define STR_CL11                      "Cl11"
+#define STR_CL12                      "Cl12"
+#define STR_CL13                      "Cl13"
+#define STR_CL14                      "Cl14"
+#define STR_CL15                      "Cl15"
+#define STR_CL16                      "Cl16"
+#define STR_CL17                      "Cl17"
+#define STR_CL18                      "Cl18"
+#define STR_FRAME_RATE                "FRat"
+#define STR_TOTAL_LATENCY             "TLat"
+#define STR_VTX_FREQ                  "VFrq"
+#define STR_VTX_PWR                   "VPwr"
+#define STR_VTX_CHAN                  "VChn"
+#define STR_VTX_BAND                  "VBan"
+#define STR_SERVO_CURRENT             "SrvA"
+#define STR_SERVO_VOLTAGE             "SrvV"
+#define STR_SERVO_TEMPERATURE         "SrvT"
+#define STR_SERVO_STATUS              "SrvS"
+#define STR_LOSS                      "Loss"
+#define STR_SPEED                     "Spd "
+#define STR_FLOW                      "Flow"