diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h
index 061beb95a..0c218020d 100644
--- a/radio/src/gui/128x64/gui.h
+++ b/radio/src/gui/128x64/gui.h
@@ -265,8 +265,7 @@ uint8_t editDelay(coord_t y, event_t event, uint8_t attr, const char * str, uint
 
 #define WARNING_TYPE_ASTERISK          0
 #define WARNING_TYPE_CONFIRM           1
-#define WARNING_TYPE_INPUT             2
-#define WARNING_TYPE_INFO              4
+#define WARNING_TYPE_INFO              2
 
 extern const char * warningText;
 extern const char * warningInfoText;
diff --git a/radio/src/gui/128x64/model_curve_edit.cpp b/radio/src/gui/128x64/model_curve_edit.cpp
index 3a0112109..741aca4b1 100644
--- a/radio/src/gui/128x64/model_curve_edit.cpp
+++ b/radio/src/gui/128x64/model_curve_edit.cpp
@@ -20,17 +20,39 @@
 
 #include "opentx.h"
 
-void displayPresetChoice(event_t event)
+void runPopupCurvePreset(event_t event)
 {
-  runPopupWarning(event);
-  lcdDrawNumber(WARNING_LINE_X+FW*7, WARNING_LINE_Y, 45*warningInputValue/4, LEFT|INVERS);
+  warningResult = false;
+
+  drawMessageBox();
+
+  lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, STR_POPUPS_ENTER_EXIT);
+
+  switch (event) {
+    case EVT_KEY_BREAK(KEY_ENTER):
+      warningResult = true;
+      // no break
+
+    case EVT_KEY_BREAK(KEY_EXIT):
+      warningText = NULL;
+      warningType = WARNING_TYPE_ASTERISK;
+      break;
+
+    default:
+      s_editMode = EDIT_MODIFY_FIELD;
+      reusableBuffer.curveEdit.preset = checkIncDec(event, reusableBuffer.curveEdit.preset, -4, 4);
+      s_editMode = EDIT_SELECT_FIELD;
+      break;
+  }
+
+  lcdDrawNumber(WARNING_LINE_X+FW*7, WARNING_LINE_Y, 45 * reusableBuffer.curveEdit.preset / 4, LEFT|INVERS);
   lcdDrawChar(lcdLastRightPos, WARNING_LINE_Y, '@', INVERS);
 
   if (warningResult) {
     warningResult = 0;
     CurveInfo & crv = g_model.curves[s_curveChan];
     int8_t * points = curveAddress(s_curveChan);
-    int k = 25 * warningInputValue;
+    int k = 25 * reusableBuffer.curveEdit.preset;
     int dx = 2000 / (5+crv.points-1);
     for (uint8_t i=0; i<5+crv.points; i++) {
       int x = -1000 + i * dx;
@@ -45,7 +67,8 @@ void displayPresetChoice(event_t event)
 void onCurveOneMenu(const char * result)
 {
   if (result == STR_CURVE_PRESET) {
-    POPUP_INPUT(STR_PRESET, displayPresetChoice, 0, -4, 4);
+    reusableBuffer.curveEdit.preset = 4; // 45°
+    POPUP_INPUT(STR_PRESET, runPopupCurvePreset);
   }
   else if (result == STR_MIRROR) {
     CurveInfo & crv = g_model.curves[s_curveChan];
diff --git a/radio/src/gui/128x64/popups.cpp b/radio/src/gui/128x64/popups.cpp
index 873b5163c..202628769 100644
--- a/radio/src/gui/128x64/popups.cpp
+++ b/radio/src/gui/128x64/popups.cpp
@@ -27,9 +27,6 @@ uint8_t         warningType;
 uint8_t         warningResult = 0;
 
 uint8_t         warningInfoFlags = ZCHAR;
-int16_t         warningInputValue;
-int16_t         warningInputValueMin;
-int16_t         warningInputValueMax;
 
 void drawMessageBox()
 {
@@ -97,7 +94,7 @@ void runPopupWarning(event_t event)
   if (warningInfoText) {
     lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH, warningInfoText, warningInfoLength, WARNING_INFO_FLAGS);
   }
-  lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS));
+  lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT));
   switch (event) {
     case EVT_KEY_BREAK(KEY_ENTER):
       if (warningType == WARNING_TYPE_ASTERISK)
@@ -108,11 +105,5 @@ void runPopupWarning(event_t event)
       warningText = NULL;
       warningType = WARNING_TYPE_ASTERISK;
       break;
-    default:
-      if (warningType != WARNING_TYPE_INPUT) break;
-      s_editMode = EDIT_MODIFY_FIELD;
-      warningInputValue = checkIncDec(event, warningInputValue, warningInputValueMin, warningInputValueMax);
-      s_editMode = EDIT_SELECT_FIELD;
-      break;
   }
 }
diff --git a/radio/src/gui/128x64/popups.h b/radio/src/gui/128x64/popups.h
index 6fbead268..24321ab75 100644
--- a/radio/src/gui/128x64/popups.h
+++ b/radio/src/gui/128x64/popups.h
@@ -37,9 +37,6 @@ void runPopupWarning(event_t event);
 #define DRAW_MESSAGE_BOX(title)        (warningText = title, drawMessageBox(), warningText = NULL)
 
 extern void (*popupFunc)(event_t event);
-extern int16_t warningInputValue;
-extern int16_t warningInputValueMin;
-extern int16_t warningInputValueMax;
 extern uint8_t warningInfoFlags;
 
 #if !defined(GUI)
@@ -54,7 +51,7 @@ extern uint8_t warningInfoFlags;
   #define POPUP_INFORMATION(s)        (warningText = s, warningType = WARNING_TYPE_INFO, warningInfoText = 0, popupFunc = runPopupWarning)
   #define POPUP_WARNING(s)             (warningText = s, warningInfoText = 0, popupFunc = runPopupWarning)
   #define POPUP_CONFIRMATION(s)        (warningText = s, warningType = WARNING_TYPE_CONFIRM, warningInfoText = 0, popupFunc = runPopupWarning)
-  #define POPUP_INPUT(s, func, start, min, max) (warningText = s, warningType = WARNING_TYPE_INPUT, popupFunc = func, warningInputValue = start, warningInputValueMin = min, warningInputValueMax = max)
+  #define POPUP_INPUT(s, func)         (warningText = s, popupFunc = func)
   #define WARNING_INFO_FLAGS           warningInfoFlags
   #define SET_WARNING_INFO(info, len, flags) (warningInfoText = info, warningInfoLength = len, warningInfoFlags = flags)
 #endif
diff --git a/radio/src/gui/212x64/model_curve_edit.cpp b/radio/src/gui/212x64/model_curve_edit.cpp
index 30bc33b78..3d3b083a8 100644
--- a/radio/src/gui/212x64/model_curve_edit.cpp
+++ b/radio/src/gui/212x64/model_curve_edit.cpp
@@ -20,17 +20,41 @@
 
 #include "opentx.h"
 
-void displayPresetChoice(event_t event)
+void runPopupCurvePreset(event_t event)
 {
-  runPopupWarning(event);
-  lcdDrawNumber(WARNING_LINE_X+FW*7, WARNING_LINE_Y, 45*warningInputValue/4, LEFT|INVERS);
+  warningResult = false;
+
+  drawMessageBox(warningText);
+
+  lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, STR_POPUPS_ENTER_EXIT);
+
+  switch (event) {
+    case EVT_KEY_BREAK(KEY_ENTER):
+      if (warningType == WARNING_TYPE_ASTERISK)
+        break;
+      warningResult = true;
+      // no break
+
+    case EVT_KEY_BREAK(KEY_EXIT):
+      warningText = NULL;
+      warningType = WARNING_TYPE_ASTERISK;
+      break;
+
+    default:
+      s_editMode = EDIT_MODIFY_FIELD;
+      reusableBuffer.curveEdit.preset = checkIncDec(event, reusableBuffer.curveEdit.preset, -4, +4);
+      s_editMode = EDIT_SELECT_FIELD;
+      break;
+  }
+
+  lcdDrawNumber(WARNING_LINE_X+FW*7, WARNING_LINE_Y, 45 * reusableBuffer.curveEdit.preset / 4, LEFT|INVERS);
   lcdDrawChar(lcdLastRightPos, WARNING_LINE_Y, '@', INVERS);
 
   if (warningResult) {
     warningResult = 0;
     CurveInfo & crv = g_model.curves[s_curveChan];
     int8_t * points = curveAddress(s_curveChan);
-    int k = 25 * warningInputValue;
+    int k = 25 * reusableBuffer.curveEdit.preset;
     int dx = 2000 / (5+crv.points-1);
     for (uint8_t i=0; i<5+crv.points; i++) {
       int x = -1000 + i * dx;
@@ -45,7 +69,8 @@ void displayPresetChoice(event_t event)
 void onCurveOneMenu(const char * result)
 {
   if (result == STR_CURVE_PRESET) {
-    POPUP_INPUT(STR_PRESET, displayPresetChoice, 0, -4, 4);
+    reusableBuffer.curveEdit.preset = 4; // 45°
+    POPUP_INPUT(STR_PRESET, runPopupCurvePreset);
   }
   else if (result == STR_MIRROR) {
     CurveInfo & crv = g_model.curves[s_curveChan];
diff --git a/radio/src/gui/212x64/popups.cpp b/radio/src/gui/212x64/popups.cpp
index 50265e0c6..c233a1df0 100644
--- a/radio/src/gui/212x64/popups.cpp
+++ b/radio/src/gui/212x64/popups.cpp
@@ -26,9 +26,6 @@ uint8_t      warningInfoLength;
 uint8_t      warningType;
 uint8_t      warningResult = 0;
 uint8_t      warningInfoFlags = ZCHAR;
-int16_t      warningInputValue;
-int16_t      warningInputValueMin;
-int16_t      warningInputValueMax;
 
 void drawMessageBox(const char * title)
 {
@@ -94,23 +91,17 @@ void runPopupWarning(event_t event)
   if (warningInfoText) {
     lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH, warningInfoText, warningInfoLength, WARNING_INFO_FLAGS);
   }
-  lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH,  WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS));
+  lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT));
   switch (event) {
     case EVT_KEY_BREAK(KEY_ENTER):
       if (warningType == WARNING_TYPE_ASTERISK)
         break;
       warningResult = true;
       // no break
+
     case EVT_KEY_BREAK(KEY_EXIT):
       warningText = NULL;
       warningType = WARNING_TYPE_ASTERISK;
       break;
-    default:
-      if (warningType == WARNING_TYPE_INPUT) {
-        s_editMode = EDIT_MODIFY_FIELD;
-        warningInputValue = checkIncDec(event, warningInputValue, warningInputValueMin, warningInputValueMax);
-        s_editMode = EDIT_SELECT_FIELD;
-      }
-      break;
   }
 }
diff --git a/radio/src/gui/212x64/popups.h b/radio/src/gui/212x64/popups.h
index 28b1a81b0..3ee4dea46 100644
--- a/radio/src/gui/212x64/popups.h
+++ b/radio/src/gui/212x64/popups.h
@@ -34,16 +34,13 @@ void runPopupWarning(event_t event);
 #define DRAW_MESSAGE_BOX(title)        drawMessageBox(title)
 
 extern void (*popupFunc)(event_t event);
-extern int16_t warningInputValue;
-extern int16_t warningInputValueMin;
-extern int16_t warningInputValueMax;
 extern uint8_t warningInfoFlags;
 
 #define DISPLAY_WARNING                (*popupFunc)
 #define POPUP_INFORMATION(s)           (warningText = s, warningType = WARNING_TYPE_INFO, warningInfoText = 0, popupFunc = runPopupWarning)
 #define POPUP_WARNING(s)               (warningText = s, warningInfoText = 0, popupFunc = runPopupWarning)
 #define POPUP_CONFIRMATION(s)          (warningText = s, warningType = WARNING_TYPE_CONFIRM, warningInfoText = 0, popupFunc = runPopupWarning)
-#define POPUP_INPUT(s, func, start, min, max) (warningText = s, warningType = WARNING_TYPE_INPUT, popupFunc = func, warningInputValue = start, warningInputValueMin = min, warningInputValueMax = max)
+#define POPUP_INPUT(s, func)           (warningText = s, popupFunc = func)
 #define WARNING_INFO_FLAGS             warningInfoFlags
 #define SET_WARNING_INFO(info, len, flags) (warningInfoText = info, warningInfoLength = len, warningInfoFlags = flags)
 
diff --git a/radio/src/gui/480x272/menus.h b/radio/src/gui/480x272/menus.h
index c6e1cb3ef..753c34a24 100644
--- a/radio/src/gui/480x272/menus.h
+++ b/radio/src/gui/480x272/menus.h
@@ -469,9 +469,6 @@ void showMessageBox(const char * title);
 void runPopupWarning(event_t event);
 
 extern void (* popupFunc)(event_t event);
-extern int16_t warningInputValue;
-extern int16_t warningInputValueMin;
-extern int16_t warningInputValueMax;
 extern uint8_t warningInfoFlags;
 
 #define DISPLAY_WARNING                (*popupFunc)
@@ -479,7 +476,7 @@ extern uint8_t warningInfoFlags;
 #define POPUP_INFORMATION(s)           (warningText = s, warningType = WARNING_TYPE_INFO, warningInfoText = 0, popupFunc = runPopupWarning)
 #define POPUP_WARNING(s)               (warningType = WARNING_TYPE_ASTERISK, warningText = s, warningInfoText = 0, popupFunc = runPopupWarning)
 #define POPUP_CONFIRMATION(s)          (warningText = s, warningType = WARNING_TYPE_CONFIRM, warningInfoText = 0, popupFunc = runPopupWarning)
-#define POPUP_INPUT(s, func, start, min, max) (warningText = s, warningType = WARNING_TYPE_INPUT, popupFunc = func, warningInputValue = start, warningInputValueMin = min, warningInputValueMax = max)
+#define POPUP_INPUT(s, func)           (warningText = s, popupFunc = func)
 #define WARNING_INFO_FLAGS             warningInfoFlags
 #define SET_WARNING_INFO(info, len, flags)    (warningInfoText = info, warningInfoLength = len, warningInfoFlags = flags)
 
diff --git a/radio/src/gui/480x272/model_curves.cpp b/radio/src/gui/480x272/model_curves.cpp
index a918585bf..7d15edcaf 100644
--- a/radio/src/gui/480x272/model_curves.cpp
+++ b/radio/src/gui/480x272/model_curves.cpp
@@ -25,16 +25,36 @@ void drawCurve(int x, int y, int width)
   drawFunction(applyCurrentCurve, x, y, width);
 }
 
-void displayPresetChoice(event_t event)
+void runPopupCurvePreset(event_t event)
 {
-  runPopupWarning(event);
-  lcdDrawNumber(WARNING_LINE_X, WARNING_INFOLINE_Y-10, 45*warningInputValue/4, LEFT|INVERS, 0, NULL, "@");
+  warningResult = false;
+
+  theme->drawMessageBox(warningText, warningInfoText, STR_POPUPS_ENTER_EXIT, warningType);
+
+  switch (event) {
+    case EVT_KEY_BREAK(KEY_ENTER):
+      warningResult = true;
+      // no break
+
+    case EVT_KEY_BREAK(KEY_EXIT):
+      warningText = NULL;
+      warningType = WARNING_TYPE_ASTERISK;
+      break;
+
+    default:
+      s_editMode = EDIT_MODIFY_FIELD;
+      reusableBuffer.curveEdit.preset = checkIncDec(event, reusableBuffer.curveEdit.preset, -4, +4);
+      s_editMode = EDIT_SELECT_FIELD;
+      break;
+  }
+
+  lcdDrawNumber(WARNING_LINE_X, WARNING_INFOLINE_Y-10, 45 * reusableBuffer.curveEdit.preset / 4, LEFT|INVERS, 0, NULL, "@");
 
   if (warningResult) {
     warningResult = 0;
     CurveInfo & crv = g_model.curves[s_curveChan];
     int8_t * points = curveAddress(s_curveChan);
-    int k = 25 * warningInputValue;
+    int k = 25 * reusableBuffer.curveEdit.preset;
     int dx = 2000 / (5+crv.points-1);
     for (uint8_t i=0; i<5+crv.points; i++) {
       int x = -1000 + i * dx;
@@ -49,7 +69,8 @@ void displayPresetChoice(event_t event)
 void onCurveOneMenu(const char * result)
 {
   if (result == STR_CURVE_PRESET) {
-    POPUP_INPUT(STR_PRESET, displayPresetChoice, 0, -4, 4);
+    reusableBuffer.curveEdit.preset = 4; // 45°
+    POPUP_INPUT(STR_PRESET, runPopupCurvePreset);
   }
   else if (result == STR_MIRROR) {
     CurveInfo & crv = g_model.curves[s_curveChan];
diff --git a/radio/src/gui/480x272/popups.cpp b/radio/src/gui/480x272/popups.cpp
index 1678afefc..4a39cb1b6 100644
--- a/radio/src/gui/480x272/popups.cpp
+++ b/radio/src/gui/480x272/popups.cpp
@@ -26,9 +26,6 @@ uint8_t     warningInfoLength;
 uint8_t     warningType;
 uint8_t     warningResult = 0;
 uint8_t     warningInfoFlags = ZCHAR;
-int16_t     warningInputValue;
-int16_t     warningInputValueMin;
-int16_t     warningInputValueMax;
 void        (*popupFunc)(event_t event) = NULL;
 const char *popupMenuItems[POPUP_MENU_MAX_LINES];
 uint8_t     s_menu_item = 0;
@@ -80,7 +77,7 @@ void runPopupWarning(event_t event)
 {
   warningResult = false;
 
-  theme->drawMessageBox(warningText, warningInfoText,  WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS), warningType);
+  theme->drawMessageBox(warningText, warningInfoText,  WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT_ENTER_EXIT), warningType);
 
   switch (event) {
     case EVT_KEY_BREAK(KEY_ENTER):
@@ -88,16 +85,11 @@ void runPopupWarning(event_t event)
         break;
       warningResult = true;
       // no break
+
     case EVT_KEY_BREAK(KEY_EXIT):
       warningText = NULL;
       warningType = WARNING_TYPE_ASTERISK;
       break;
-    default:
-      if (warningType != WARNING_TYPE_INPUT) break;
-      s_editMode = EDIT_MODIFY_FIELD;
-      warningInputValue = checkIncDec(event, warningInputValue, warningInputValueMin, warningInputValueMax);
-      s_editMode = EDIT_SELECT_FIELD;
-      break;
   }
 }
 
diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp
index d0b74ecdd..2e681d3f7 100644
--- a/radio/src/lua/api_general.cpp
+++ b/radio/src/lua/api_general.cpp
@@ -930,55 +930,6 @@ static int luaGetGeneralSettings(lua_State * L)
   return 1;
 }
 
-/*luadoc
-@function popupInput(title, event, input, min, max)
-
-Raises a pop-up on screen that allows uses input
-
-@param title (string) text to display
-
-@param event (number) the event variable that is passed in from the
-Run function (key pressed)
-
-@param input (number) value that can be adjusted by the +/­- keys
-
-@param min  (number) min value that input can reach (by pressing the -­ key)
-
-@param max  (number) max value that input can reach
-
-@retval number result of the input adjustment
-
-@retval "OK" user pushed ENT key
-
-@retval "CANCEL" user pushed EXIT key
-
-@notice Use only from stand-alone and telemetry scripts.
-
-@status current Introduced in 2.0.0
-*/
-static int luaPopupInput(lua_State * L)
-{
-  event_t event = luaL_checkinteger(L, 2);
-  warningInputValue = luaL_checkinteger(L, 3);
-  warningInputValueMin = luaL_checkinteger(L, 4);
-  warningInputValueMax = luaL_checkinteger(L, 5);
-  warningText = luaL_checkstring(L, 1);
-  warningType = WARNING_TYPE_INPUT;
-  runPopupWarning(event);
-  if (warningResult) {
-    warningResult = 0;
-    lua_pushstring(L, "OK");
-  }
-  else if (!warningText) {
-    lua_pushstring(L, "CANCEL");
-  }
-  else {
-    lua_pushinteger(L, warningInputValue);
-  }
-  warningText = NULL;
-  return 1;
-}
-
 /*luadoc
 @function popupWarning(title, event)
 
@@ -1338,7 +1289,7 @@ const luaL_Reg opentxLib[] = {
   { "playDuration", luaPlayDuration },
   { "playTone", luaPlayTone },
   { "playHaptic", luaPlayHaptic },
-  { "popupInput", luaPopupInput },
+  // { "popupInput", luaPopupInput },
   { "popupWarning", luaPopupWarning },
   { "popupConfirmation", luaPopupConfirmation },
   { "defaultStick", luaDefaultStick },
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 55e67ee6d..257643d42 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -1171,6 +1171,11 @@ union ReusableBuffer
     uint32_t step;
   } spectrum;
 
+  struct
+  {
+    int8_t preset;
+  } curveEdit;
+
 #if defined(STM32)
   // Data for the USB mass storage driver. If USB mass storage runs no menu is not allowed to be displayed
   uint8_t MSC_BOT_Data[MSC_MEDIA_PACKET];
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index 978f27b94..4cb7812bc 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -115,7 +115,7 @@ const char STR_OPEN9X[]  =
     ;
 
 // The 0-terminated-strings
-const char STR_POPUPS[]  = TR_POPUPS;
+const char STR_POPUPS_ENTER_EXIT[]  = TR_POPUPS_ENTER_EXIT;
 const char STR_OK[]  = TR_OK;
 #if !defined(OFS_EXIT)
   const char STR_EXIT[]  = TR_EXIT;
diff --git a/radio/src/translations.h b/radio/src/translations.h
index b344c1ae9..306daac08 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -328,11 +328,11 @@ extern const char STR_BLUETOOTH_LOCAL_ADDR[];
 // The 0-terminated-strings
 #define NO_INDENT(x) (x)+LEN_INDENT
 
-extern const char STR_POPUPS[];
+extern const char STR_POPUPS_ENTER_EXIT[];
 extern const char STR_OK[];
 
 #if defined(OFS_EXIT)
-  #define STR_EXIT (STR_POPUPS + OFS_EXIT)
+  #define STR_EXIT (STR_POPUPS_ENTER_EXIT + OFS_EXIT)
 #else
   extern const char STR_EXIT[];
 #endif
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 24af76b03..6e9885e3a 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -533,10 +533,10 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_POPUPS            TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER)
+  #define TR_POPUPS_ENTER_EXIT            TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER)
   #define TR_OK                TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
 #else
-  #define TR_POPUPS            TR_ENTER "\010" TR_EXIT
+  #define TR_POPUPS_ENTER_EXIT            TR_ENTER "\010" TR_EXIT
   #define OFS_EXIT             sizeof(TR_ENTER)
 #endif
 
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index a18253063..d26046232 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -539,10 +539,10 @@
 #define TR_EXIT                "[EXIT]"
 
 #if defined(PCBTARANIS)
-  #define TR_POPUPS            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
+  #define TR_POPUPS_ENTER_EXIT            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
   #define TR_OK                TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
 #else
-  #define TR_POPUPS            TR_ENTER "\010" TR_EXIT
+  #define TR_POPUPS_ENTER_EXIT            TR_ENTER "\010" TR_EXIT
   #define OFS_EXIT             sizeof(TR_ENTER)
 #endif
 
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index ad5aa0303..3681a0eab 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -538,10 +538,10 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_POPUPS                    TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER)
+  #define TR_POPUPS_ENTER_EXIT                    TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER)
   #define TR_OK                        TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
 #else
-  #define TR_POPUPS                    TR_ENTER "\010" TR_EXIT
+  #define TR_POPUPS_ENTER_EXIT                    TR_ENTER "\010" TR_EXIT
   #define OFS_EXIT                     sizeof(TR_ENTER)
 #endif
 
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index 38e21a94b..de3915e4e 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -537,10 +537,10 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_POPUPS            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
+  #define TR_POPUPS_ENTER_EXIT            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
   #define TR_OK                TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
 #else
-  #define TR_POPUPS            TR_ENTER "\010" TR_EXIT
+  #define TR_POPUPS_ENTER_EXIT            TR_ENTER "\010" TR_EXIT
   #define OFS_EXIT             sizeof(TR_ENTER)
 #endif
 
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index 9f7802cf6..577f896a5 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -529,10 +529,10 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_POPUPS            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
+  #define TR_POPUPS_ENTER_EXIT            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
   #define TR_OK                TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
 #else
-  #define TR_POPUPS            TR_ENTER "\010" TR_EXIT
+  #define TR_POPUPS_ENTER_EXIT            TR_ENTER "\010" TR_EXIT
   #define OFS_EXIT             sizeof(TR_ENTER)
 #endif
 
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index 6e8d46d08..86b42022a 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -550,10 +550,10 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_POPUPS                    TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER)
+  #define TR_POPUPS_ENTER_EXIT                    TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER)
   #define TR_OK                        TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
 #else
-  #define TR_POPUPS                    TR_ENTER "\010" TR_EXIT
+  #define TR_POPUPS_ENTER_EXIT                    TR_ENTER "\010" TR_EXIT
   #define OFS_EXIT                     sizeof(TR_ENTER)
 #endif
 
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index 9d45a1dcc..7a513832e 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -539,10 +539,10 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_POPUPS            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
+  #define TR_POPUPS_ENTER_EXIT            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
   #define TR_OK                TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
 #else
-  #define TR_POPUPS            TR_ENTER "\010" TR_EXIT
+  #define TR_POPUPS_ENTER_EXIT            TR_ENTER "\010" TR_EXIT
   #define OFS_EXIT             sizeof(TR_ENTER)
 #endif
 
diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt
index c58cd490b..35747d20a 100644
--- a/radio/src/translations/nl.h.txt
+++ b/radio/src/translations/nl.h.txt
@@ -534,10 +534,10 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_POPUPS            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
+  #define TR_POPUPS_ENTER_EXIT            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
   #define TR_OK                TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
 #else
-  #define TR_POPUPS            TR_ENTER "\010" TR_EXIT
+  #define TR_POPUPS_ENTER_EXIT            TR_ENTER "\010" TR_EXIT
   #define OFS_EXIT             sizeof(TR_ENTER)
 #endif
 
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index 7209acd10..9cdebc205 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -540,10 +540,10 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_POPUPS            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
+  #define TR_POPUPS_ENTER_EXIT            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
   #define TR_OK                TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
 #else
-  #define TR_POPUPS            TR_ENTER "\010" TR_EXIT
+  #define TR_POPUPS_ENTER_EXIT            TR_ENTER "\010" TR_EXIT
   #define OFS_EXIT             sizeof(TR_ENTER)
 #endif
 
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index edbacef11..d3162ac61 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -536,10 +536,10 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_POPUPS            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
+  #define TR_POPUPS_ENTER_EXIT            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
   #define TR_OK                TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
 #else
-  #define TR_POPUPS            TR_ENTER "\010" TR_EXIT
+  #define TR_POPUPS_ENTER_EXIT            TR_ENTER "\010" TR_EXIT
   #define OFS_EXIT             sizeof(TR_ENTER)
 #endif
 
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index 53f41e570..02a1d3549 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -548,10 +548,10 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_POPUPS            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
+  #define TR_POPUPS_ENTER_EXIT            TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
   #define TR_OK                TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
 #else
-  #define TR_POPUPS            TR_ENTER "\010" TR_EXIT
+  #define TR_POPUPS_ENTER_EXIT            TR_ENTER "\010" TR_EXIT
   #define OFS_EXIT             sizeof(TR_ENTER)
 #endif