From f83ed1b3557ca5d45870d144a91f41eda9b6a143 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Wed, 13 Feb 2019 19:33:07 +0100
Subject: [PATCH] Only display RegId in model is different from owner id

---
 radio/src/dataconstants.h               |  2 +-
 radio/src/datastructs.h                 |  4 ++--
 radio/src/gui/128x64/model_setup.cpp    | 20 ++++++++++----------
 radio/src/gui/128x64/radio_hardware.cpp |  7 ++++++-
 radio/src/opentx.h                      |  6 +++---
 radio/src/pulses/pxx2.cpp               |  6 +++---
 radio/src/pulses/pxx2.h                 |  4 ++--
 radio/src/telemetry/telemetry.cpp       | 18 +++++++++---------
 radio/src/translations.cpp              |  1 +
 radio/src/translations.h                |  1 +
 radio/src/translations/cz.h.txt         |  3 ++-
 radio/src/translations/de.h.txt         |  3 ++-
 radio/src/translations/en.h.txt         |  3 ++-
 radio/src/translations/es.h.txt         |  3 ++-
 radio/src/translations/fi.h.txt         |  3 ++-
 radio/src/translations/fr.h.txt         |  3 ++-
 radio/src/translations/it.h.txt         |  3 ++-
 radio/src/translations/nl.h.txt         |  3 ++-
 radio/src/translations/pl.h.txt         |  3 ++-
 radio/src/translations/pt.h.txt         |  3 ++-
 radio/src/translations/se.h.txt         |  3 ++-
 21 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h
index 30ed86365..0195a8394 100644
--- a/radio/src/dataconstants.h
+++ b/radio/src/dataconstants.h
@@ -788,7 +788,7 @@ enum BluetoothModes {
 
 // PXX2 constants
 #define PXX2_LEN_REGISTRATION_ID            8
-#define PXX2_LEN_RX_ID                      8
+#define PXX2_LEN_RX_NAME                      8
 #define PXX2_MAX_RECEIVERS_PER_MODULE       5
 
 #endif // _DATACONSTANTS_H_
diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index 9738a835c..f543eb64a 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -419,7 +419,7 @@ PACK(struct ReceiverData {
   uint8_t  telemetry:1;
   uint8_t  spare:6;
   uint64_t channelMapping; // each receiver output (16) can be assigned to one of the 16 channels
-  char  rxID[PXX2_LEN_RX_ID];
+  char  rxName[PXX2_LEN_RX_NAME];
 });
 
 /*
@@ -798,7 +798,7 @@ PACK(struct RadioData {
 
   THEME_DATA
 
-  uint8_t ownerRegistrationID[PXX2_LEN_REGISTRATION_ID];
+  char ownerRegistrationID[PXX2_LEN_REGISTRATION_ID];
 });
 
 #undef SWITCHES_WARNING_DATA
diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index e65dc7415..1001281bb 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -237,7 +237,7 @@ enum MenuModelSetupItems {
 void onPXX2BindMenu(const char * result)
 {
   reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index = (result - reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_names[0]) / sizeof(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_names[0]);
-  reusableBuffer.modelsetup.pxx2_bind_step = BIND_RX_ID_SELECTED;
+  reusableBuffer.modelsetup.pxx2_bind_step = BIND_RX_NAME_SELECTED;
 }
 
 void onBindMenu(const char * result)
@@ -303,13 +303,13 @@ void menuModelSetup(event_t event)
 
     NUM_STICKS + NUM_POTS + NUM_SLIDERS + NUM_ROTARY_ENCODERS - 1, // Center beeps
     0, // Global functions
-    IF_PXX2(PXX2_LEN_REGISTRATION_ID - 1), // Registration ID
+    IF_PXX2(memcmp(g_model.modelRegistrationID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID ) ? (uint8_t)-1: HIDDEN_ROW), // Registration ID
 
     LABEL(InternalModule),
       INTERNAL_MODULE_MODE_ROWS, // module mode (PXX(2) / None)
       INTERNAL_MODULE_CHANNELS_ROWS, // Channels min and count
       IF_NOT_PXX2(IF_INTERNAL_MODULE_ON(HAS_RF_PROTOCOL_MODELINDEX(g_model.moduleData[INTERNAL_MODULE].rfProtocol) ? (uint8_t)2 : (uint8_t)1)),
-      IF_PXX2(0),                                                  // Model Number
+      IF_PXX2(0),    // Model Number
       ANTENNA_ROW
       IF_INTERNAL_MODULE_ON(FAILSAFE_ROWS(INTERNAL_MODULE)),       // Module start channel (pxx2 always send 16)
       IF_PXX2_RECEIVER_DISPLAYED(INTERNAL_MODULE, 0, 1),           // Range check and Register buttons
@@ -1106,8 +1106,8 @@ void menuModelSetup(event_t event)
         uint8_t receiverIdx = CURRENT_RECEIVER_EDITED(k);
         uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
 
-        lcdDrawTextAlignedLeft(y, STR_REG_ID);
-        lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[moduleIdx].pxx2.receivers[receiverIdx].rxID, PXX2_LEN_RX_ID, 0);
+        lcdDrawTextAlignedLeft(y, STR_RECEIVER);
+        lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[moduleIdx].pxx2.receivers[receiverIdx].rxName, PXX2_LEN_RX_NAME, 0);
       }
       break;
 
@@ -1141,7 +1141,7 @@ void menuModelSetup(event_t event)
         uint8_t receiverIdx = CURRENT_RECEIVER_EDITED(k);
         uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
 
-        lcdDrawSizedText(6, y, g_model.moduleData[moduleIdx].pxx2.receivers[receiverIdx].rxID, PXX2_LEN_RX_ID, 0);
+        lcdDrawSizedText(6, y, g_model.moduleData[moduleIdx].pxx2.receivers[receiverIdx].rxName, PXX2_LEN_RX_NAME, 0);
         lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_BIND, menuHorizontalPosition==0 ? attr : 0);
         lcdDrawText(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS, y, STR_DEL_BUTTON, menuHorizontalPosition==1 ? attr : 0);
         if (attr) {
@@ -1153,7 +1153,7 @@ void menuModelSetup(event_t event)
             }
             if (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_BIND) {
               s_editMode = 1;
-              if (reusableBuffer.modelsetup.pxx2_bind_step == BIND_RX_ID_RECEIVED) {
+              if (reusableBuffer.modelsetup.pxx2_bind_step == BIND_RX_NAME_RECEIVED) {
                 popupMenuItemsCount = min<uint8_t>(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count, PXX2_MAX_RECEIVERS_PER_MODULE);
                 for (uint8_t i=0; i<popupMenuItemsCount; i++) {
                   popupMenuItems[i] = reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_names[i];
@@ -1165,7 +1165,7 @@ void menuModelSetup(event_t event)
               s_editMode = 0;
             }
             if (reusableBuffer.modelsetup.pxx2_bind_step == BIND_OK) {
-              memcpy(g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[receiverIdx].rxID, reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index], PXX2_LEN_RX_ID);
+              memcpy(g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[receiverIdx].rxName, reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index], PXX2_LEN_RX_NAME);
             }
           }
           else if (menuHorizontalPosition == 1 && s_editMode > 0) {
@@ -1742,8 +1742,8 @@ void menuModelPinmap(event_t event)
   SIMPLE_SUBMENU_NOTITLE(sentModuleChannels(g_moduleIdx));
 
   lcdDrawTextAlignedLeft(0, STR_PINMAPSET);
-  for (uint8_t pos=0; pos<PXX2_LEN_RX_ID; pos++) {
-    lcdDrawHexChar(50 + pos*FW*2, 0, g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[g_receiverIdx].rxID[pos], 0);
+  for (uint8_t pos=0; pos<PXX2_LEN_RX_NAME; pos++) {
+    lcdDrawHexChar(50 + pos*FW*2, 0, g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[g_receiverIdx].rxName[pos], 0);
   }
   lcdInvertLine(0);
 
diff --git a/radio/src/gui/128x64/radio_hardware.cpp b/radio/src/gui/128x64/radio_hardware.cpp
index 96d397577..133b2d564 100644
--- a/radio/src/gui/128x64/radio_hardware.cpp
+++ b/radio/src/gui/128x64/radio_hardware.cpp
@@ -122,6 +122,7 @@ enum MenuRadioHardwareItems {
   ITEM_RADIO_HARDWARE_BLUETOOTH_NAME,
 #endif
   ITEM_RADIO_HARDWARE_JITTER_FILTER,
+  ITEM_RADIO_OWNER_ID,
   ITEM_RADIO_HARDWARE_MAX
 };
 
@@ -153,7 +154,7 @@ enum MenuRadioHardwareItems {
 
 void menuRadioHardware(event_t event)
 {
-  MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, HEADER_LINE+ITEM_RADIO_HARDWARE_MAX, { HEADER_LINE_COLUMNS LABEL(Sticks), 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, 0/*max bauds*/, BLUETOOTH_ROWS 0/*jitter filter*/ });
+  MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, HEADER_LINE+ITEM_RADIO_HARDWARE_MAX, { HEADER_LINE_COLUMNS LABEL(Sticks), 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, 0/*max bauds*/, BLUETOOTH_ROWS 0/*jitter filter*/ , 0 /*owner id*/ });
 
   uint8_t sub = menuVerticalPosition - HEADER_LINE;
 
@@ -282,6 +283,10 @@ void menuRadioHardware(event_t event)
       case ITEM_RADIO_HARDWARE_JITTER_FILTER:
         g_eeGeneral.jitterFilter = 1 - editCheckBox(1 - g_eeGeneral.jitterFilter, HW_SETTINGS_COLUMN2, y, STR_JITTER_FILTER, attr, event);
         break;
+
+      case ITEM_RADIO_OWNER_ID:
+        editSingleName(HW_SETTINGS_COLUMN2, y, STR_OWNER_ID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID, event, attr);
+        break;
     }
   }
 }
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 257643d42..808eccca1 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -1122,9 +1122,9 @@ union ReusableBuffer
       uint8_t pxx2_bind_step;
     };
     uint32_t pxx2_bind_wait_timeout;
-    uint8_t pxx2_register_rx_id[PXX2_LEN_RX_ID];
-    char pxx2_bind_candidate_receivers_ids[PXX2_MAX_RECEIVERS_PER_MODULE][PXX2_LEN_RX_ID];
-    char pxx2_bind_candidate_receivers_names[PXX2_MAX_RECEIVERS_PER_MODULE][3*PXX2_LEN_RX_ID+1];
+    uint8_t pxx2_register_rx_id[PXX2_LEN_RX_NAME];
+    char pxx2_bind_candidate_receivers_ids[PXX2_MAX_RECEIVERS_PER_MODULE][PXX2_LEN_RX_NAME];
+    char pxx2_bind_candidate_receivers_names[PXX2_MAX_RECEIVERS_PER_MODULE][3*PXX2_LEN_RX_NAME+1];
     uint8_t pxx2_bind_candidate_receivers_count;
     uint8_t pxx2_bind_selected_receiver_index;
   } modelsetup;
diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp
index 5e19e3879..852eb5a6f 100644
--- a/radio/src/pulses/pxx2.cpp
+++ b/radio/src/pulses/pxx2.cpp
@@ -60,7 +60,7 @@ bool Pxx2Pulses::setupRegisterFrame(uint8_t module)
 
   if (reusableBuffer.modelsetup.pxx2_register_step == REGISTER_COUNTER_ID_RECEIVED) {
     Pxx2Transport::addByte(0x01);
-    for (uint8_t i=0; i<PXX2_LEN_RX_ID; i++) {
+    for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
       Pxx2Transport::addByte(0x00);
     }
     for (uint8_t i=0; i<PXX2_LEN_REGISTRATION_ID; i++) {
@@ -87,9 +87,9 @@ bool Pxx2Pulses::setupBindFrame(uint8_t module)
       return false;
     }
   }
-  else if (reusableBuffer.modelsetup.pxx2_bind_step == BIND_RX_ID_SELECTED) {
+  else if (reusableBuffer.modelsetup.pxx2_bind_step == BIND_RX_NAME_SELECTED) {
     Pxx2Transport::addByte(0x01);
-    for (uint8_t i=0; i<PXX2_LEN_RX_ID; i++) {
+    for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
       Pxx2Transport::addByte(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index][i]);
     }
     Pxx2Transport::addByte(g_model.header.modelId[INTERNAL_MODULE]);
diff --git a/radio/src/pulses/pxx2.h b/radio/src/pulses/pxx2.h
index bc813b7ac..e16e3654f 100644
--- a/radio/src/pulses/pxx2.h
+++ b/radio/src/pulses/pxx2.h
@@ -49,8 +49,8 @@ enum PXX2RegisterSteps {
 
 enum PXX2BindSteps {
     BIND_START,
-    BIND_RX_ID_RECEIVED,
-    BIND_RX_ID_SELECTED,
+    BIND_RX_NAME_RECEIVED,
+    BIND_RX_NAME_SELECTED,
     BIND_WAIT,
     BIND_OK
 };
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index 8c35713a2..597e5d820 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -78,13 +78,13 @@ void processRegisterFrame(uint8_t module, uint8_t * frame)
   }
 
   if (frame[3] == 0x00) {
-    // RX_ID follows, we store it for the next step
-    memcpy(reusableBuffer.modelsetup.pxx2_register_rx_id, &frame[4], PXX2_LEN_RX_ID);
+    // RX_NAME follows, we store it for the next step
+    memcpy(reusableBuffer.modelsetup.pxx2_register_rx_id, &frame[4], PXX2_LEN_RX_NAME);
     reusableBuffer.modelsetup.pxx2_register_step = REGISTER_COUNTER_ID_RECEIVED;
   }
   else if (frame[3] == 0x01) {
-    // RX_ID + PASSWORD follow, we check they are good
-    if (memcmp(&frame[4], reusableBuffer.modelsetup.pxx2_register_rx_id, PXX2_LEN_RX_ID) == 0 &&
+    // RX_NAME + PASSWORD follow, we check they are good
+    if (memcmp(&frame[4], reusableBuffer.modelsetup.pxx2_register_rx_id, PXX2_LEN_RX_NAME) == 0 &&
         memcmp(&frame[12], g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID) == 0) {
       reusableBuffer.modelsetup.pxx2_register_step = REGISTER_OK;
       moduleSettings[module].mode = MODULE_MODE_NORMAL;
@@ -102,15 +102,15 @@ void processBindFrame(uint8_t module, uint8_t * frame)
   if (frame[3] == 0x00) {
     bool found = false;
     for (uint8_t i=0; i<reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count; i++) {
-      if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[i], &frame[4], PXX2_LEN_RX_ID) == 0) {
+      if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[i], &frame[4], PXX2_LEN_RX_NAME) == 0) {
         found = true;
         break;
       }
     }
     if (!found && reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count < PXX2_MAX_RECEIVERS_PER_MODULE) {
-      memcpy(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count], &frame[4], PXX2_LEN_RX_ID);
+      memcpy(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count], &frame[4], PXX2_LEN_RX_NAME);
       char * c = reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_names[reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count];
-      for (uint8_t i=0; i<PXX2_LEN_RX_ID; i++) {
+      for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
         uint8_t byte = frame[4 + i];
         uint8_t quartet = (byte >> 4);
         *c++ = (quartet >= 10 ? quartet + 'A' - 10 : quartet + '0');
@@ -120,11 +120,11 @@ void processBindFrame(uint8_t module, uint8_t * frame)
       }
       *c = '\0';
       ++reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count;
-      reusableBuffer.modelsetup.pxx2_bind_step = BIND_RX_ID_RECEIVED;
+      reusableBuffer.modelsetup.pxx2_bind_step = BIND_RX_NAME_RECEIVED;
     }
   }
   else if (frame[3] == 0x01) {
-    if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index], &frame[4], PXX2_LEN_RX_ID) == 0) {
+    if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index], &frame[4], PXX2_LEN_RX_NAME) == 0) {
       reusableBuffer.modelsetup.pxx2_bind_step = BIND_WAIT;
       reusableBuffer.modelsetup.pxx2_bind_wait_timeout = get_tmr10ms() + 30;
     }
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index 4cb7812bc..8ceb1ae24 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -369,6 +369,7 @@ const char STR_JACKMODE[]  = TR_JACKMODE;
 const char STR_FAILSAFE[]  = TR_FAILSAFE;
 const char STR_FAILSAFESET[]  = TR_FAILSAFESET;
 const char STR_REG_ID[]  = TR_REG_ID;
+const char STR_OWNER_ID[]  = TR_OWNER_ID;
 const char STR_PINMAPSET[]  = TR_PINMAPSET;
 const char STR_HOLD[]  = TR_HOLD;
 const char STR_NONE[]  = TR_NONE;
diff --git a/radio/src/translations.h b/radio/src/translations.h
index 306daac08..5a8e19671 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -583,6 +583,7 @@ extern const char STR_FAILSAFE[];
 extern const char STR_FAILSAFESET[];
 extern const char STR_RECEIVER[];
 extern const char STR_REG_ID[];
+extern const char STR_OWNER_ID[];
 extern const char STR_PINMAPSET[];
 extern const char STR_HOLD[];
 extern const char STR_NONE[];
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 6e9885e3a..e1805bee5 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -921,7 +921,8 @@
 #define TR_EXTERNALRF          "Externí RF modul"
 #define TR_FAILSAFE            TR("Failsafe", "Mód Failsafe")
 #define TR_FAILSAFESET         "NASTAVENÍ FAILSAFE"
-#define TR_REG_ID                      INDENT "Reg. ID"
+#define TR_REG_ID                      TR("Reg. ID", "Registration ID")
+#define TR_OWNER_ID                    "Owner ID"
 #define TR_PINMAPSET                   "PINMAP"
 #define TR_HOLD                "HOLD"
 #define TR_NONE                "NONE"
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index d26046232..067d8c6f7 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -926,7 +926,8 @@
 #define TR_EXTERNALRF          "Externes HF-Modul"
 #define TR_FAILSAFE            TR(INDENT "Failsafe", INDENT "Failsafe Mode")
 #define TR_FAILSAFESET         "Failsafe setzen"
-#define TR_REG_ID                      INDENT "Reg. ID"
+#define TR_REG_ID                      TR("Reg. ID", "Registration ID")
+#define TR_OWNER_ID                    "Owner ID"
 #define TR_PINMAPSET                   "PINMAP"
 #define TR_HOLD                "HOLD"
 #define TR_NONE                "NONE"
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 3681a0eab..e4546328b 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -925,7 +925,8 @@
 #define TR_EXTERNALRF                  "External RF"
 #define TR_FAILSAFE                    TR(INDENT "Failsafe", INDENT "Failsafe mode")
 #define TR_FAILSAFESET                 "FAILSAFE SETTINGS"
-#define TR_REG_ID                      INDENT "Reg. ID"
+#define TR_REG_ID                      TR("Reg. ID", "Registration ID")
+#define TR_OWNER_ID                    "Owner ID"
 #define TR_PINMAPSET                   "PINMAP"
 #define TR_HOLD                        "HOLD"
 #define TR_NONE                        "NONE"
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index de3915e4e..7c376334c 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -932,7 +932,8 @@
 #define TR_EXTERNALRF          "Externa RF"
 #define TR_FAILSAFE            INDENT"Modo sgdad."
 #define TR_FAILSAFESET         "AJUSTES SGDAD."
-#define TR_REG_ID                      INDENT "Reg. ID"
+#define TR_REG_ID                      TR("Reg. ID", "Registration ID")
+#define TR_OWNER_ID                    "Owner ID"
 #define TR_PINMAPSET                   "PINMAP"
 #define TR_HOLD                "HOLD"
 #define TR_NONE                "NONE"
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index 577f896a5..1f13dc56f 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -924,7 +924,8 @@
 #define TR_EXTERNALRF          "External RF"
 #define TR_FAILSAFE            INDENT "Failsafe mode"
 #define TR_FAILSAFESET         "FAILSAFE SETTINGS"
-#define TR_REG_ID                      INDENT "Reg. ID"
+#define TR_REG_ID                      TR("Reg. ID", "Registration ID")
+#define TR_OWNER_ID                    "Owner ID"
 #define TR_PINMAPSET                   "PINMAP"
 #define TR_HOLD                "HOLD"
 #define TR_NONE                "NONE"
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index 86b42022a..9d2417b8b 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -936,7 +936,8 @@
 #define TR_EXTERNALRF                  "HF externe"
 #define TR_FAILSAFE                    TR(INDENT "Failsafe", INDENT "Type failsafe")
 #define TR_FAILSAFESET                 "REGLAGES FAILSAFE"
-#define TR_REG_ID                      INDENT "Reg. ID"
+#define TR_REG_ID                      TR("Reg. ID", "Registration ID")
+#define TR_OWNER_ID                    "Owner ID"
 #define TR_PINMAPSET                   "PINMAP"
 #define TR_HOLD                        "HOLD"
 #define TR_NONE                        "NONE"
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index 7a513832e..5c15154be 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -926,7 +926,8 @@
 #define TR_EXTERNALRF          "Modulo esterno"
 #define TR_FAILSAFE            "Modo failsafe"
 #define TR_FAILSAFESET         TR("FAILSAFE","IMPOSTAZIONI FAILSAFE")
-#define TR_REG_ID                      INDENT "Reg. ID"
+#define TR_REG_ID                      TR("Reg. ID", "Registration ID")
+#define TR_OWNER_ID                    "Owner ID"
 #define TR_PINMAPSET                   "PINMAP"
 #define TR_HOLD                "HOLD"
 #define TR_NONE                "NONE"
diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt
index 35747d20a..e4ad7dcea 100644
--- a/radio/src/translations/nl.h.txt
+++ b/radio/src/translations/nl.h.txt
@@ -927,7 +927,8 @@
 #define TR_EXTERNALRF          "Externe RF"
 #define TR_FAILSAFE            TR(INDENT "Failsafe", INDENT "Failsafe Modus")
 #define TR_FAILSAFESET         "Failsafe instellen"
-#define TR_REG_ID                      INDENT "Reg. ID"
+#define TR_REG_ID                      TR("Reg. ID", "Registration ID")
+#define TR_OWNER_ID                    "Owner ID"
 #define TR_PINMAPSET                   "PINMAP"
 #define TR_HOLD                "HOLD"
 #define TR_NONE                "NONE"
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index 9cdebc205..1667be9b5 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -927,7 +927,8 @@
 #define TR_EXTERNALRF          "Zewn.Moduł RF"
 #define TR_FAILSAFE            TR(INDENT"Failsafe",INDENT"Tryb Failsafe")
 #define TR_FAILSAFESET         "USTAWIENIE FAILSAFE"
-#define TR_REG_ID                      INDENT "Reg. ID"
+#define TR_REG_ID                      TR("Reg. ID", "Registration ID")
+#define TR_OWNER_ID                    "Owner ID"
 #define TR_PINMAPSET                   "PINMAP"
 #define TR_HOLD                "HOLD"
 #define TR_NONE                "NONE"
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index d3162ac61..10ba610bf 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -931,7 +931,8 @@
 #define TR_EXTERNALRF          "External RF"
 #define TR_FAILSAFE            "Failsafe mode"
 #define TR_FAILSAFESET         "FAILSAFE SETTINGS"
-#define TR_REG_ID                      INDENT "Reg. ID"
+#define TR_REG_ID                      TR("Reg. ID", "Registration ID")
+#define TR_OWNER_ID                    "Owner ID"
 #define TR_PINMAPSET                   "PINMAP"
 #define TR_HOLD                "HOLD"
 #define TR_NONE                "NONE"
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index 02a1d3549..879b199bc 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -940,7 +940,8 @@
 #define TR_EXTERNALRF          "Extern Radiomodul"
 #define TR_FAILSAFE            TR(INDENT "Failsafe", INDENT "Failsafeläge")
 #define TR_FAILSAFESET         "FailsafeInställning"
-#define TR_REG_ID                      INDENT "Reg. ID"
+#define TR_REG_ID                      TR("Reg. ID", "Registration ID")
+#define TR_OWNER_ID                    "Owner ID"
 #define TR_PINMAPSET                   "PINMAP"
 #define TR_HOLD                "HOLD"
 #define TR_NONE                "NONE"