From 4c39aa115c66a0db07ca73f9fc30180a20355963 Mon Sep 17 00:00:00 2001
From: Daniel <danielgorbea@hotmail.com>
Date: Mon, 7 Dec 2020 09:41:04 +0000
Subject: [PATCH 1/2] Fix thr trim typo

---
 companion/src/modeledit/setup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index d6768c850..7037f4590 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -1377,7 +1377,7 @@ void SetupPanel::populateThrottleTrimSwitchCB()
   int idx=0;
   for (int i=0; i<getBoardCapability(board, Board::NumTrims); i++, idx++) {
     QString trim = RawSource(SOURCE_TYPE_TRIM, i).toString(model, &generalSettings);
-    trim = (trim == "TrmR") ? "TrmT" : (trim == "TmrT") ? "TmrR" : trim;
+    trim = (trim == "TrmR") ? "TrmT" : (trim == "TrmT") ? "TrmR" : trim;
     ui->throttleTrimSwitch->addItem(trim, idx);
   }
 

From 4be12eb5d19d5ecde614429e9ff43ae095e80639 Mon Sep 17 00:00:00 2001
From: Daniel <danielgorbea@hotmail.com>
Date: Mon, 7 Dec 2020 15:04:43 +0000
Subject: [PATCH 2/2] Make strings translatables

---
 companion/src/modeledit/setup.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 7037f4590..e4f67178d 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -1375,9 +1375,15 @@ void SetupPanel::populateThrottleTrimSwitchCB()
   lock = true;
   ui->throttleTrimSwitch->clear();
   int idx=0;
+  QString trim;
   for (int i=0; i<getBoardCapability(board, Board::NumTrims); i++, idx++) {
-    QString trim = RawSource(SOURCE_TYPE_TRIM, i).toString(model, &generalSettings);
-    trim = (trim == "TrmR") ? "TrmT" : (trim == "TrmT") ? "TrmR" : trim;
+    // here order is TERA instead of RETA
+    if (i == 0)
+      trim = RawSource(SOURCE_TYPE_TRIM, 2).toString(model, &generalSettings);
+    else if (i == 2)
+      trim = RawSource(SOURCE_TYPE_TRIM, 0).toString(model, &generalSettings);
+    else
+      trim = RawSource(SOURCE_TYPE_TRIM, i).toString(model, &generalSettings);
     ui->throttleTrimSwitch->addItem(trim, idx);
   }