diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index c68a7a4e9..a0fb5ae67 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -989,7 +989,7 @@ class ModelData {
     unsigned int nSwToWarn;
     unsigned int nPotsToWarn;
     int          potPosition[C9X_NUM_POTS];
-    bool         displayText;
+    bool         displayChecklist;
     // TODO structure
     char     gvars_names[C9X_MAX_GVARS][6+1];
     bool     gvars_popups[C9X_MAX_GVARS];
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 8b39986e1..538761f93 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -2382,7 +2382,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
   internalField.Append(new BoolField<1>(modelData.disableThrottleWarning));
 
   if (IS_TARANIS(board) || (IS_ARM(board) && version >= 216))
-    internalField.Append(new BoolField<1>(modelData.displayText));
+    internalField.Append(new BoolField<1>(modelData.displayChecklist));
   else
     internalField.Append(new BoolField<1>(modelData.moduleData[0].ppmPulsePol));
 
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 366dfaf8c..c185ce9bd 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -598,7 +598,7 @@ void SetupPanel::update()
   ui->throttleTrim->setChecked(model.thrTrim);
   ui->extendedLimits->setChecked(model.extendedLimits);
   ui->extendedTrims->setChecked(model.extendedTrims);
-  ui->displayText->setChecked(model.displayText);
+  ui->displayText->setChecked(model.displayChecklist);
 
   updateBeepCenter();
   updateStartupSwitches();
@@ -748,7 +748,7 @@ void SetupPanel::on_potWarningMode_currentIndexChanged(int index)
 
 void SetupPanel::on_displayText_toggled(bool checked)
 {
-  model.displayText = checked;
+  model.displayChecklist = checked;
   emit modified();
 }
 
diff --git a/radio/src/Makefile b/radio/src/Makefile
index 3bab858e6..70b357c64 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -589,7 +589,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
   SRC += targets/sky9x/MEDSdcard.c
   EEPROMSRC = eeprom_common.cpp eeprom_raw.cpp eeprom_conversions.cpp
   PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp pulses/dsm2_arm.cpp
-  CPPSRC += audio_arm.cpp haptic.cpp gui/view_about.cpp
+  CPPSRC += audio_arm.cpp haptic.cpp gui/view_about.cpp gui/view_text.cpp
   CPPSRC += targets/sky9x/telemetry_driver.cpp targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp
   CPPSRC += loadboot.cpp
     
diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp
index 93bb2d985..caef4e8c2 100644
--- a/radio/src/gui/menu_model.cpp
+++ b/radio/src/gui/menu_model.cpp
@@ -876,11 +876,11 @@ enum menuModelSetupItems {
   ITEM_MODEL_NAME,
   CASE_PCBTARANIS(ITEM_MODEL_BITMAP)
   ITEM_MODEL_TIMER1,
-  IF_PERSISTENT_TIMERS(ITEM_MODEL_TIMER1_PERSISTENT)
+  CASE_PERSISTENT_TIMERS(ITEM_MODEL_TIMER1_PERSISTENT)
   ITEM_MODEL_TIMER1_MINUTE_BEEP,
   ITEM_MODEL_TIMER1_COUNTDOWN_BEEP,
   ITEM_MODEL_TIMER2,
-  IF_PERSISTENT_TIMERS(ITEM_MODEL_TIMER2_PERSISTENT)
+  CASE_PERSISTENT_TIMERS(ITEM_MODEL_TIMER2_PERSISTENT)
   ITEM_MODEL_TIMER2_MINUTE_BEEP,
   ITEM_MODEL_TIMER2_COUNTDOWN_BEEP,
   ITEM_MODEL_EXTENDED_LIMITS,
@@ -1001,7 +1001,7 @@ void menuModelSetup(uint8_t event)
   #define MODEL_SETUP_MAX_LINES             (1+ITEM_MODEL_SETUP_MAX)
   #define POT_WARN_ITEMS()                  ((g_model.nPotsToWarn >> 6) ? (uint8_t)NUM_POTS : (uint8_t)0)
   bool CURSOR_ON_CELL = (m_posHorz >= 0);
-  MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,CASE_PCBTARANIS(LABEL(Throttle)) 0, 0, 0,CASE_PCBTARANIS(LABEL(PreflightCheck)) CASE_PCBTARANIS(0) 0, 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_INTERNAL_MODULE_ON(1), IF_INTERNAL_MODULE_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_INTERNAL_MODULE_ON(FAILSAFE_ROWS(INTERNAL_MODULE)), LABEL(ExternalModule), (IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, EXTERNAL_MODULE_CHANNELS_ROWS(), (IS_MODULE_XJT(EXTERNAL_MODULE) && IS_D8_RX(EXTERNAL_MODULE)) ? (uint8_t)1 : (IS_MODULE_PPM(EXTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW, IF_EXTERNAL_MODULE_XJT(FAILSAFE_ROWS(EXTERNAL_MODULE)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)});
+  MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, CASE_PCBTARANIS(LABEL(Throttle)) 0, 0, 0, CASE_CPUARM(LABEL(PreflightCheck)) CASE_CPUARM(0) 0, 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_INTERNAL_MODULE_ON(1), IF_INTERNAL_MODULE_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_INTERNAL_MODULE_ON(FAILSAFE_ROWS(INTERNAL_MODULE)), LABEL(ExternalModule), (IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, EXTERNAL_MODULE_CHANNELS_ROWS(), (IS_MODULE_XJT(EXTERNAL_MODULE) && IS_D8_RX(EXTERNAL_MODULE)) ? (uint8_t)1 : (IS_MODULE_PPM(EXTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW, IF_EXTERNAL_MODULE_XJT(FAILSAFE_ROWS(EXTERNAL_MODULE)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)});
 #elif defined(CPUARM)
   #define IF_EXTERNAL_MODULE_XJT(x)         (IS_MODULE_XJT(EXTERNAL_MODULE) ? (uint8_t)x : HIDDEN_ROW)
   #define IF_EXTERNAL_MODULE_ON(x)          (g_model.externalModule == MODULE_TYPE_NONE ? HIDDEN_ROW : (uint8_t)(x))
@@ -1018,17 +1018,17 @@ void menuModelSetup(uint8_t event)
 #else
   #define EXTRA_MODULE_ROWS                 LABEL(ExtraModule), 1, 2,
 #endif
-  MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,CASE_PCBTARANIS(LABEL(Throttle)) 0, 0, 0,CASE_PCBTARANIS(LABEL(PreflightCheck)) CASE_PCBTARANIS(0) 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, LABEL(ExternalModule), (IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, EXTERNAL_MODULE_CHANNELS_ROWS(), (IS_MODULE_XJT(EXTERNAL_MODULE) && IS_D8_RX(EXTERNAL_MODULE)) ? (uint8_t)1 : (IS_MODULE_PPM(EXTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW, IF_EXTERNAL_MODULE_XJT(FAILSAFE_ROWS(EXTERNAL_MODULE)), EXTRA_MODULE_ROWS LABEL(Trainer), TRAINER_CHANNELS_ROWS(), 2});
+  MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,CASE_PCBTARANIS(LABEL(Throttle)) 0, 0, 0, CASE_CPUARM(LABEL(PreflightCheck)) CASE_CPUARM(0) 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, LABEL(ExternalModule), (IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, EXTERNAL_MODULE_CHANNELS_ROWS(), (IS_MODULE_XJT(EXTERNAL_MODULE) && IS_D8_RX(EXTERNAL_MODULE)) ? (uint8_t)1 : (IS_MODULE_PPM(EXTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW, IF_EXTERNAL_MODULE_XJT(FAILSAFE_ROWS(EXTERNAL_MODULE)), EXTRA_MODULE_ROWS LABEL(Trainer), TRAINER_CHANNELS_ROWS(), 2});
 #elif defined(CPUM64)
   #define CURSOR_ON_CELL                    (true)
   #define MODEL_SETUP_MAX_LINES             ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX)
   uint8_t protocol = g_model.protocol;
-  MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2 });
+  MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2 });
 #else
   #define CURSOR_ON_CELL                    (true)
   #define MODEL_SETUP_MAX_LINES             ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX)
   uint8_t protocol = g_model.protocol;
-  MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0, 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2, CASE_PCBSKY9X(1) CASE_PCBSKY9X(2) });
+  MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0, 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2, CASE_PCBSKY9X(1) CASE_PCBSKY9X(2) });
 #endif
 
   if (!MENU_CHECK(menuTabModel, e_ModelSetup, MODEL_SETUP_MAX_LINES)) {
@@ -1202,13 +1202,13 @@ void menuModelSetup(uint8_t event)
         g_model.thrTrim = onoffMenuItem(g_model.thrTrim, MODEL_SETUP_2ND_COLUMN, y, STR_TTRIM, attr, event);
         break;
 
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
       case ITEM_MODEL_PREFLIGHT_LABEL:
         lcd_putsLeft(y, STR_PREFLIGHT);
         break;
 
       case ITEM_MODEL_CHECKLIST_DISPLAY:
-        g_model.displayText = onoffMenuItem(g_model.displayText, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST, attr, event);
+        g_model.displayChecklist = onoffMenuItem(g_model.displayChecklist, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST, attr, event);
         break;
 #endif
 
diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp
index 799c1adf5..6edc23fd6 100644
--- a/radio/src/gui/menus.cpp
+++ b/radio/src/gui/menus.cpp
@@ -338,7 +338,7 @@ void title(const pm_char * s)
 uint8_t scrollbar_X = LCD_W-1;
 #endif
 
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
 bool modelHasNotes()
 {
   FILINFO info;
@@ -360,7 +360,9 @@ void pushModelNotes()
   strcpy(buf, TEXT_EXT);
   pushMenuTextView(filename);
 }
+#endif
 
+#if defined(PCBTARANIS)
 void onLongMenuPress(const char *result)
 {
   if (result == STR_VIEW_CHANNELS) {
diff --git a/radio/src/gui/menus.h b/radio/src/gui/menus.h
index b6e2a18d0..0305342ee 100644
--- a/radio/src/gui/menus.h
+++ b/radio/src/gui/menus.h
@@ -411,11 +411,14 @@ void displayWarning(uint8_t event);
   #define drawStatusLine()
 #endif
 
+#if defined(CPUARM)
+  void pushMenuTextView(const char *filename);
+  bool modelHasNotes();
+  void pushModelNotes();
+#endif
+
 #if defined(PCBTARANIS)
-void menuChannelsView(uint8_t event);
-void pushMenuTextView(const char *filename);
-bool modelHasNotes();
-void pushModelNotes();
+  void menuChannelsView(uint8_t event);
 #endif
 
 #define LABEL(...) (uint8_t)-1
diff --git a/radio/src/gui/view_main.cpp b/radio/src/gui/view_main.cpp
index 15740b6ba..b4074948e 100644
--- a/radio/src/gui/view_main.cpp
+++ b/radio/src/gui/view_main.cpp
@@ -451,7 +451,7 @@ void onMainViewMenu(const char *result)
   else if (result == STR_RESET_TIMER2) {
     timerReset(1);
   }
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
   else if (result == STR_VIEW_NOTES) {
     pushModelNotes();
   }
@@ -459,7 +459,9 @@ void onMainViewMenu(const char *result)
     MENU_ADD_ITEM(STR_RESET_FLIGHT);
     MENU_ADD_ITEM(STR_RESET_TIMER1);
     MENU_ADD_ITEM(STR_RESET_TIMER2);
+#if defined(FRSKY)
     MENU_ADD_ITEM(STR_RESET_TELEMETRY);
+#endif
   }
 #endif
 #if defined(FRSKY)
@@ -529,13 +531,13 @@ void menuMainView(uint8_t event)
     case EVT_KEY_CONTEXT_MENU:
       killEvents(event);
 
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
       if (modelHasNotes()) {
         MENU_ADD_ITEM(STR_VIEW_NOTES);
       }
 #endif
 
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
       MENU_ADD_ITEM(STR_RESET_SUBMENU);
 #else
       MENU_ADD_ITEM(STR_RESET_TIMER1);
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index f2b85a254..b614dd708 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -1679,7 +1679,7 @@ PACK(typedef struct t_ModelData {
   ARM_FIELD(int8_t    spare2:4)
   int8_t    trimInc:3;            // Trim Increments
   uint8_t   disableThrottleWarning:1;
-  ARM_FIELD(uint8_t displayText:1)
+  ARM_FIELD(uint8_t displayChecklist:1)
   AVR_FIELD(uint8_t pulsePol:1)
   uint8_t   extendedLimits:1;
   uint8_t   extendedTrims:1;
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index bc38cc05b..01d8a54b8 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1026,8 +1026,8 @@ void checkAll()
   checkSwitches();
 #endif
 
-#if defined(PCBTARANIS)
-  if (g_model.displayText && modelHasNotes()) {
+#if defined(CPUARM)
+  if (g_model.displayChecklist && modelHasNotes()) {
     pushModelNotes();
   }
 #endif
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index dd15b064a..6aa4bd7a9 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -65,9 +65,11 @@
 #endif
 
 #if defined(CPUARM)
-  #define CASE_CPUARM(x) x,
+  #define CASE_CPUARM(x)     x,
+  #define IF_CPUARM(x)       x
 #else
   #define CASE_CPUARM(x)
+  #define IF_CPUARM(x)
 #endif
 
 #if defined(VARIO) && defined(CPUARM)
@@ -89,9 +91,9 @@
 #endif
 
 #if defined(CPUARM) || defined(CPUM2560)
-#define IF_PERSISTENT_TIMERS(x) x,
+  #define CASE_PERSISTENT_TIMERS(x) x,
 #else
-#define IF_PERSISTENT_TIMERS(x)
+  #define CASE_PERSISTENT_TIMERS(x)
 #endif
 
 #if defined(RTCLOCK)
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index 50368a789..024c5b0b0 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -490,6 +490,10 @@ const pm_char STR_BLCOLOR[]  PROGMEM = TR_BLCOLOR;
   const pm_char STR_MODULE_BIND[] PROGMEM  = TR_MODULE_BIND;
   const pm_char STR_CHANNELRANGE[] PROGMEM = TR_CHANNELRANGE;
   const pm_char STR_SET[] PROGMEM = TR_SET;
+  const pm_char STR_PREFLIGHT[] PROGMEM = TR_PREFLIGHT;
+  const pm_char STR_CHECKLIST[] PROGMEM = TR_CHECKLIST;
+  const pm_char STR_VIEW_NOTES[] PROGMEM = TR_VIEW_NOTES;
+  const pm_char STR_RESET_SUBMENU[] PROGMEM = TR_RESET_SUBMENU;
 #endif
 
 #if defined(PCBTARANIS)
@@ -505,7 +509,6 @@ const pm_char STR_BLCOLOR[]  PROGMEM = TR_BLCOLOR;
   const pm_char STR_MIRROR[] PROGMEM = TR_MIRROR;
   const pm_char STR_CLEAR[] PROGMEM = TR_CLEAR;
   const pm_char STR_RESET[] PROGMEM = TR_RESET;
-  const pm_char STR_RESET_SUBMENU[] PROGMEM = TR_RESET_SUBMENU;
   const pm_char STR_COUNT[] PROGMEM = TR_COUNT;
   const pm_char STR_PT[] PROGMEM = TR_PT;
   const pm_char STR_PTS[] PROGMEM = TR_PTS;
@@ -515,10 +518,7 @@ const pm_char STR_BLCOLOR[]  PROGMEM = TR_BLCOLOR;
   const pm_char STR_ALTITUDE[] PROGMEM = TR_ALTITUDE;
   const pm_char STR_SCALE[] PROGMEM = TR_SCALE;
   const pm_char STR_VIEW_CHANNELS[] PROGMEM = TR_VIEW_CHANNELS;
-  const pm_char STR_VIEW_NOTES[] PROGMEM = TR_VIEW_NOTES;
   const pm_char STR_POTWARNING[] PROGMEM = TR_POTWARNING;
-  const pm_char STR_PREFLIGHT[] PROGMEM = TR_PREFLIGHT;
-  const pm_char STR_CHECKLIST[] PROGMEM = TR_CHECKLIST;
   const pm_char STR_UART3MODE[] PROGMEM = TR_UART3MODE;
   const pm_char STR_THROTTLE_LABEL[] PROGMEM = TR_THROTTLE_LABEL;
   const pm_char STR_SCRIPT[] PROGMEM = TR_SCRIPT;
diff --git a/radio/src/translations.h b/radio/src/translations.h
index ca9aecbe3..ddfed0677 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -670,6 +670,10 @@ extern const pm_char STR_BLCOLOR[];
   extern const pm_char STR_MODULE_BIND[];
   extern const pm_char STR_CHANNELRANGE[];
   extern const pm_char STR_SET[];
+  extern const pm_char STR_PREFLIGHT[];
+  extern const pm_char STR_CHECKLIST[];
+  extern const pm_char STR_VIEW_NOTES[];
+  extern const pm_char STR_RESET_SUBMENU[];
 #endif
 
 #if defined(PCBTARANIS)
@@ -685,7 +689,6 @@ extern const pm_char STR_BLCOLOR[];
   extern const pm_char STR_MIRROR[];
   extern const pm_char STR_CLEAR[];
   extern const pm_char STR_RESET[];
-  extern const pm_char STR_RESET_SUBMENU[];
   extern const pm_char STR_COUNT[];
   extern const pm_char STR_PT[];
   extern const pm_char STR_PTS[];
@@ -695,10 +698,7 @@ extern const pm_char STR_BLCOLOR[];
   extern const pm_char STR_ALTITUDE[];
   extern const pm_char STR_SCALE[];
   extern const pm_char STR_VIEW_CHANNELS[];
-  extern const pm_char STR_VIEW_NOTES[];
   extern const pm_char STR_POTWARNING[];
-  extern const pm_char STR_PREFLIGHT[];
-  extern const pm_char STR_CHECKLIST[];
   extern const pm_char STR_UART3MODE[];
   extern const pm_char STR_THROTTLE_LABEL[];
   extern const pm_char STR_SCRIPT[];
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index b7d1bc817..fdbb5b71b 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -556,11 +556,11 @@
 #define TR_BLOFFBRIGHTNESS     INDENT "OFF Brightness"
 #define TR_BLCOLOR             INDENT "Color"
 #define TR_SPLASHSCREEN        "Splash screen"
-#define TR_THROTTLEWARNING     TR("T-Warning", INDENT "Throttle State")
-#define TR_SWITCHWARNING       TR("S-Warning", INDENT "Switch Positions")
-#define TR_POTWARNING          TR("Pot Warn.", INDENT "Pot Positions")
-#define TR_TIMEZONE            TR("Time Zone","GPS Time zone")
-#define TR_RXCHANNELORD        TR("Rx Channel Ord","Default channel order")
+#define TR_THROTTLEWARNING     TR(IF_CPUARM(INDENT) "T-Warning", INDENT "Throttle State")
+#define TR_SWITCHWARNING       TR(IF_CPUARM(INDENT) "S-Warning", INDENT "Switch Positions")
+#define TR_POTWARNING          TR(IF_CPUARM(INDENT) "Pot Warn.", INDENT "Pot Positions")
+#define TR_TIMEZONE            TR("Time Zone", "GPS Time zone")
+#define TR_RXCHANNELORD        TR("Rx Channel Ord", "Default channel order")
 #define TR_SLAVE               CENTER "Slave"
 #define TR_MODESRC             "Mode\006% Source"
 #define TR_MULTIPLIER          "Multiplier"
@@ -780,7 +780,7 @@
 #define TR_COPY_TRIMS_TO_OFS   "Copy Trim To Subtrim"
 #define TR_PERSISTENT_MAH      TR(INDENT "Str mAh", INDENT "Persistent mAh")
 #define TR_PREFLIGHT           "Preflight Checks"
-#define TR_CHECKLIST           INDENT "Display Checklist"
+#define TR_CHECKLIST           TR(INDENT "Checklist", INDENT "Display Checklist")
 #define TR_FAS_OFFSET          TR(INDENT "FAS Ofs", INDENT "FAS Offset")
 #define TR_UART3MODE           "Serial port"
 #define TR_SCRIPT              "Script"
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index 6ce5983cb..968dee537 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -550,9 +550,9 @@
 #define TR_BLOFFBRIGHTNESS     INDENT "Luminosité OFF"
 #define TR_BLCOLOR             INDENT "Couleur"
 #define TR_SPLASHSCREEN        "Logo d'accueil"
-#define TR_THROTTLEWARNING     TR("Alerte gaz", INDENT "Alerte gaz")
-#define TR_SWITCHWARNING       TR("Alerte int", INDENT "Pos. interrupteurs")
-#define TR_POTWARNING          TR("Alerte pot", INDENT "Pos. potentiom.")
+#define TR_THROTTLEWARNING     TR(IF_CPUARM(INDENT) "Alerte gaz", INDENT "Alerte gaz")
+#define TR_SWITCHWARNING       TR(IF_CPUARM(INDENT) "Alerte int", INDENT "Pos. interrupteurs")
+#define TR_POTWARNING          TR(IF_CPUARM(INDENT) "Alerte pot", INDENT "Pos. potentiom.")
 #define TR_TIMEZONE            "Fuseau horaire"
 #define TR_RXCHANNELORD        TR("Ordre voies RX","Ordre des voies préféré")
 #define TR_SLAVE               "Elève"
@@ -774,7 +774,7 @@
 #define TR_COPY_TRIMS_TO_OFS   "Trim vers subtrim"
 #define TR_PERSISTENT_MAH      TR(INDENT "Enr. mAh", INDENT "Enregistrer mAh")
 #define TR_PREFLIGHT           "Vérifications avant vol"
-#define TR_CHECKLIST           INDENT "Afficher notes"
+#define TR_CHECKLIST           TR(INDENT "Notes", INDENT "Afficher notes")
 #define TR_FAS_OFFSET          TR(INDENT "Corr FAS", INDENT "Correction FAS")
 #define TR_UART3MODE           "Port série"
 #define TR_SCRIPT              "Script"