From 6f11ecd18d399e54ffc449d2950e64c0da92ce1e Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Tue, 12 Jan 2021 17:59:52 +0100
Subject: [PATCH] Merge issues

---
 radio/src/opentx.cpp            | 2 +-
 radio/src/translations/cz.h.txt | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 79f0a4d87..0d71be69b 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -375,7 +375,7 @@ void defaultInputs()
     expo->mode = 3; // TODO constant
 #if defined(TRANSLATIONS_CZ)
     for (int c = 0; c < 4; c++) {
-      g_model.inputNames[i][c] = STR_INPUTNAMES[1+4*(stick_index-1)+c];
+      g_model.inputNames[i][c] = STR_INPUTNAMES[1 + 4 * stick_index + c];
     }
 #else
     for (int c = 0; c < 3; c++) {
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 2f5a68a9e..861c82138 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -105,6 +105,9 @@
 #define LEN_VBEEPCOUNTDOWN             "\007"
 #define TR_VBEEPCOUNTDOWN              "Ne\0    ""Zvuk\0  ""Hlas\0  ""Vibrace"
 
+#define LEN_COUNTDOWNVALUES            "\003"
+#define TR_COUNTDOWNVALUES             "5s\0""10s""20s""30s"
+
 #define LEN_VVARIOCENTER               "\005"
 #define TR_VVARIOCENTER                "Tón\0 ""Ticho"
 
@@ -566,6 +569,7 @@
 #define TR_CAL                         "Kal."
 #define TR_VTRIM                       "Trim- +"
 #define TR_BG                          "Poz:"
+#define TR_CALIB_DONE                  "Calibration completed"
 #if defined(PCBHORUS)
   #define TR_MENUTOSTART               "Stickem [Enter] začneme"
   #define TR_SETMIDPOINT               "Vycentruj páky/poty/slidery a stiskni [Enter]"