diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index c7905725f..b0867917f 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -1611,14 +1611,14 @@ void MainWindow::createActions()
     }
     updateProfilesActions();
 
-    newAct =             addAct("new.png",    tr("New Models+Settings"),        tr("Create a new Models and Settings file"), QKeySequence::New,    SLOT(newFile()));
-    openAct =            addAct("open.png",   tr("Open Models+Settings..."),    tr("Open Models and Settings file"),         QKeySequence::Open,   SLOT(openFile()));
-    saveAct =            addAct("save.png",   tr("Save Models+Settings..."),    tr("Save Models and Settings file"),         QKeySequence::Save,   SLOT(save()));
-    saveAsAct =          addAct("saveas.png", tr("Save Models+Settings as..."), tr("Save Models and Settings file"),         QKeySequence::SaveAs, SLOT(saveAs()));
-    exitAct =            addAct("exit.png",   tr("Exit"),                       tr("Exit the application"),                  QKeySequence::Quit,   SLOT(closeAllWindows()), qApp);
-    cutAct =             addAct("cut.png",    tr("Cut Model"),                  tr("Cut current model to the clipboard"),    QKeySequence::Cut,    SLOT(cut()));
-    copyAct =            addAct("copy.png",   tr("Copy Model..."),              tr("Copy current model to the clipboard"),   QKeySequence::Copy,   SLOT(copy()));
-    pasteAct =           addAct("paste.png",  tr("Paste Model..."),             tr("Paste model from clipboard"),            QKeySequence::Paste,  SLOT(paste()));
+    newAct =             addAct("new.png",    tr("New"),                    tr("Create a new Models and Settings file"), QKeySequence::New,    SLOT(newFile()));
+    openAct =            addAct("open.png",   tr("Open..."),                tr("Open Models and Settings file"),         QKeySequence::Open,   SLOT(openFile()));
+    saveAct =            addAct("save.png",   tr("Save"),                   tr("Save Models and Settings file"),         QKeySequence::Save,   SLOT(save()));
+    saveAsAct =          addAct("saveas.png", tr("Save As..."),             tr("Save Models and Settings file"),         QKeySequence::SaveAs, SLOT(saveAs()));
+    exitAct =            addAct("exit.png",   tr("Exit"),                   tr("Exit the application"),                  QKeySequence::Quit,   SLOT(closeAllWindows()), qApp);
+    cutAct =             addAct("cut.png",    tr("Cut Model"),              tr("Cut current model to the clipboard"),    QKeySequence::Cut,    SLOT(cut()));
+    copyAct =            addAct("copy.png",   tr("Copy Model"),             tr("Copy current model to the clipboard"),   QKeySequence::Copy,   SLOT(copy()));
+    pasteAct =           addAct("paste.png",  tr("Paste Model"),            tr("Paste model from clipboard"),            QKeySequence::Paste,  SLOT(paste()));
  
     QActionGroup *themeAlignGroup = new QActionGroup(this);
     classicThemeAct =    addAct( themeAlignGroup,    tr("Classical"),       tr("The classic companion9x icon theme"),   SLOT(setClassicTheme()));
@@ -1681,7 +1681,7 @@ void MainWindow::createActions()
 void MainWindow::createMenus()
 
 {
-    QMenu *recentFileMenu=new QMenu(tr("Recent Models+Settings"));
+    QMenu *recentFileMenu=new QMenu(tr("Recent Files"));
     QMenu *languageMenu=new QMenu(tr("Set Menu Language"));
     QMenu *themeMenu=new QMenu(tr("Set Icon Theme"));
     QMenu *iconThemeSizeMenu=new QMenu(tr("Set Icon Size"));
@@ -1843,7 +1843,7 @@ void MainWindow::createToolBars()
     profileButton->setMenu(createProfilesMenu());
     profileButton->setIcon(CompanionIcon("profiles.png"));
     profileButton->setToolTip(tr("Radio Profile"));
-    profileButton->setStatusTip(tr("Show a selection list of radio profiles"));
+    profileButton->setStatusTip(tr("Show the list of radio profiles"));
 
     fileToolBar->addWidget(profileButton);
     fileToolBar->addAction(editSplashAct);
diff --git a/companion/src/modeledit/mixerdialog.ui b/companion/src/modeledit/mixerdialog.ui
index 04d876b80..4339313d8 100644
--- a/companion/src/modeledit/mixerdialog.ui
+++ b/companion/src/modeledit/mixerdialog.ui
@@ -204,7 +204,7 @@ p, li { white-space: pre-wrap; }
        <item row="0" column="0">
         <widget class="QLabel" name="lb_FP0">
          <property name="text">
-          <string>0</string>
+          <string notr="true">0</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -214,7 +214,7 @@ p, li { white-space: pre-wrap; }
        <item row="0" column="1">
         <widget class="QLabel" name="lb_FP1">
          <property name="text">
-          <string>1</string>
+          <string notr="true">1</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -224,7 +224,7 @@ p, li { white-space: pre-wrap; }
        <item row="0" column="2">
         <widget class="QLabel" name="lb_FP2">
          <property name="text">
-          <string>2</string>
+          <string notr="true">2</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -234,7 +234,7 @@ p, li { white-space: pre-wrap; }
        <item row="0" column="3">
         <widget class="QLabel" name="lb_FP3">
          <property name="text">
-          <string>3</string>
+          <string notr="true">3</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -244,7 +244,7 @@ p, li { white-space: pre-wrap; }
        <item row="0" column="4">
         <widget class="QLabel" name="lb_FP4">
          <property name="text">
-          <string>4</string>
+          <string notr="true">4</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -254,7 +254,7 @@ p, li { white-space: pre-wrap; }
        <item row="0" column="5">
         <widget class="QLabel" name="lb_FP5">
          <property name="text">
-          <string>5</string>
+          <string notr="true">5</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -264,7 +264,7 @@ p, li { white-space: pre-wrap; }
        <item row="0" column="6">
         <widget class="QLabel" name="lb_FP6">
          <property name="text">
-          <string>6</string>
+          <string notr="true">6</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -274,7 +274,7 @@ p, li { white-space: pre-wrap; }
        <item row="0" column="7">
         <widget class="QLabel" name="lb_FP7">
          <property name="text">
-          <string>7</string>
+          <string notr="true">7</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -284,7 +284,7 @@ p, li { white-space: pre-wrap; }
        <item row="0" column="8">
         <widget class="QLabel" name="lb_FP8">
          <property name="text">
-          <string>8</string>
+          <string notr="true">8</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
diff --git a/companion/src/modeledit/setup.ui b/companion/src/modeledit/setup.ui
index 2f13d807e..d0fd4a9fb 100644
--- a/companion/src/modeledit/setup.ui
+++ b/companion/src/modeledit/setup.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -153,7 +153,7 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
         </font>
        </property>
        <property name="text">
-        <string>Timer2</string>
+        <string>Timer 2</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -169,7 +169,7 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
         </font>
        </property>
        <property name="text">
-        <string>Timer1</string>
+        <string>Timer 1</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
diff --git a/companion/src/modeledit/setup_module.ui b/companion/src/modeledit/setup_module.ui
index ae8cc9783..7815a75ca 100644
--- a/companion/src/modeledit/setup_module.ui
+++ b/companion/src/modeledit/setup_module.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
@@ -42,7 +42,7 @@
       </font>
      </property>
      <property name="text">
-      <string>Label</string>
+      <string notr="true">Label</string>
      </property>
     </widget>
    </item>
@@ -85,7 +85,10 @@
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="suffix">
-         <string>ch</string>
+         <string/>
+        </property>
+        <property name="prefix">
+         <string>CH </string>
         </property>
         <property name="minimum">
          <number>1</number>
@@ -192,7 +195,7 @@
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="suffix">
-         <string> usec</string>
+         <string> us</string>
         </property>
         <property name="minimum">
          <number>100</number>
@@ -307,7 +310,7 @@
          </size>
         </property>
         <property name="suffix">
-         <string> mSec</string>
+         <string> ms</string>
         </property>
         <property name="decimals">
          <number>1</number>
@@ -338,7 +341,7 @@
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="suffix">
-         <string>ch</string>
+         <string/>
         </property>
         <property name="minimum">
          <number>1</number>
diff --git a/companion/src/simulation/simulatordialog-9x.ui b/companion/src/simulation/simulatordialog-9x.ui
index 71d514645..c69845de0 100644
--- a/companion/src/simulation/simulatordialog-9x.ui
+++ b/companion/src/simulation/simulatordialog-9x.ui
@@ -73,7 +73,7 @@
        <number>6</number>
       </property>
       <item row="0" column="0">
-       <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0,0">
+       <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0">
         <item row="1" column="1">
          <widget class="QGraphicsView" name="leftStick">
           <property name="minimumSize">
@@ -121,7 +121,7 @@ QPushButton:checked {
  }</string>
             </property>
             <property name="text">
-             <string>THR</string>
+             <string notr="true">THR</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
@@ -151,7 +151,7 @@ QPushButton:checked {
  }</string>
             </property>
             <property name="text">
-             <string>RUD</string>
+             <string notr="true">RUD</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
@@ -181,7 +181,7 @@ QPushButton:checked {
  }</string>
             </property>
             <property name="text">
-             <string>ELE</string>
+             <string notr="true">ELE</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
@@ -211,7 +211,7 @@ QPushButton:checked {
  }</string>
             </property>
             <property name="text">
-             <string>AIL</string>
+             <string notr="true">AIL</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
@@ -355,7 +355,7 @@ QPushButton:checked {
           <item>
            <widget class="QLabel" name="leftXPerc">
             <property name="text">
-             <string>TextLabel</string>
+             <string notr="true">TextLabel</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignCenter</set>
@@ -365,7 +365,7 @@ QPushButton:checked {
           <item>
            <widget class="QLabel" name="leftYPerc">
             <property name="text">
-             <string>TextLabel</string>
+             <string notr="true">TextLabel</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignCenter</set>
@@ -535,7 +535,7 @@ QPushButton:pressed {
  }</string>
             </property>
             <property name="text">
-             <string>TRN</string>
+             <string notr="true">TRN</string>
             </property>
            </widget>
           </item>
@@ -562,7 +562,7 @@ QPushButton:checked {
  }</string>
             </property>
             <property name="text">
-             <string>GEA</string>
+             <string notr="true">GEA</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
@@ -595,7 +595,7 @@ QPushButton:checked {
  }</string>
             </property>
             <property name="text">
-             <string>ID0</string>
+             <string notr="true">ID0</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
@@ -632,7 +632,7 @@ QPushButton:checked {
  }</string>
             </property>
             <property name="text">
-             <string>ID1</string>
+             <string notr="true">ID1</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
@@ -665,7 +665,7 @@ QPushButton:checked {
  }</string>
             </property>
             <property name="text">
-             <string>ID2</string>
+             <string notr="true">ID2</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
@@ -812,7 +812,7 @@ QPushButton:checked {
           <item>
            <widget class="QLabel" name="rightXPerc">
             <property name="text">
-             <string>TextLabel</string>
+             <string notr="true">TextLabel</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignCenter</set>
@@ -822,7 +822,7 @@ QPushButton:checked {
           <item>
            <widget class="QLabel" name="rightYPerc">
             <property name="text">
-             <string>TextLabel</string>
+             <string notr="true">TextLabel</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignCenter</set>
@@ -1010,7 +1010,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>P1</string>
+           <string notr="true">P1</string>
           </property>
           <property name="minimum">
            <number>-1024</number>
@@ -1032,7 +1032,7 @@ QPushButton:checked {
         <item>
          <widget class="QLabel" name="dialP_1value">
           <property name="text">
-           <string>0 %</string>
+           <string notr="true">0 %</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -1067,7 +1067,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>P2</string>
+           <string notr="true">P2</string>
           </property>
           <property name="minimum">
            <number>-1024</number>
@@ -1092,7 +1092,7 @@ QPushButton:checked {
         <item>
          <widget class="QLabel" name="dialP_2value">
           <property name="text">
-           <string>0 %</string>
+           <string notr="true">0 %</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -1127,7 +1127,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>P3</string>
+           <string notr="true">P3</string>
           </property>
           <property name="minimum">
            <number>-1024</number>
@@ -1149,7 +1149,7 @@ QPushButton:checked {
         <item>
          <widget class="QLabel" name="dialP_3value">
           <property name="text">
-           <string>0 %</string>
+           <string notr="true">0 %</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
diff --git a/companion/src/simulation/simulatordialog-taranis.ui b/companion/src/simulation/simulatordialog-taranis.ui
index 9dd1608e0..9ef223cae 100644
--- a/companion/src/simulation/simulatordialog-taranis.ui
+++ b/companion/src/simulation/simulatordialog-taranis.ui
@@ -555,7 +555,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>S1</string>
+           <string/>
           </property>
           <property name="minimum">
            <number>-1024</number>
@@ -585,7 +585,7 @@ QPushButton:checked {
           <item>
            <widget class="QLabel" name="leftXPerc">
             <property name="text">
-             <string>TextLabel</string>
+             <string notr="true">TextLabel</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignCenter</set>
@@ -595,7 +595,7 @@ QPushButton:checked {
           <item>
            <widget class="QLabel" name="leftYPerc">
             <property name="text">
-             <string>TextLabel</string>
+             <string notr="true">TextLabel</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignCenter</set>
@@ -619,7 +619,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SB</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>2</number>
@@ -675,7 +675,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SA</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>2</number>
@@ -715,7 +715,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SE</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>2</number>
@@ -743,7 +743,7 @@ QPushButton:checked {
         <item row="3" column="0">
          <widget class="QLabel" name="label">
           <property name="text">
-           <string>SF</string>
+           <string notr="true">SF</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -765,10 +765,10 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SF</string>
+           <string/>
           </property>
           <property name="statusTip">
-           <string>SF</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>1</number>
@@ -811,7 +811,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>LS</string>
+           <string/>
           </property>
           <property name="minimum">
            <number>-1024</number>
@@ -833,7 +833,7 @@ QPushButton:checked {
         <item row="3" column="6">
          <widget class="QLabel" name="label_2">
           <property name="text">
-           <string>SA</string>
+           <string notr="true">SA</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -843,7 +843,7 @@ QPushButton:checked {
         <item row="3" column="8">
          <widget class="QLabel" name="label_3">
           <property name="text">
-           <string>SB</string>
+           <string notr="true">SB</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -853,7 +853,7 @@ QPushButton:checked {
         <item row="3" column="5">
          <widget class="QLabel" name="label_5">
           <property name="text">
-           <string>SE</string>
+           <string notr="true">SE</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -863,7 +863,7 @@ QPushButton:checked {
         <item row="3" column="3">
          <widget class="QLabel" name="label_9">
           <property name="text">
-           <string>LS</string>
+           <string notr="true">LS</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -873,7 +873,7 @@ QPushButton:checked {
         <item row="3" column="10">
          <widget class="QLabel" name="label_10">
           <property name="text">
-           <string>S1</string>
+           <string notr="true">S1</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -1038,7 +1038,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>S2</string>
+           <string/>
           </property>
           <property name="minimum">
            <number>-1024</number>
@@ -1060,7 +1060,7 @@ QPushButton:checked {
         <item row="3" column="1">
          <widget class="QLabel" name="label_11">
           <property name="text">
-           <string>S2</string>
+           <string notr="true">S2</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -1254,7 +1254,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SD</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>2</number>
@@ -1294,7 +1294,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SC</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>2</number>
@@ -1360,7 +1360,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SG</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>2</number>
@@ -1403,7 +1403,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>RS</string>
+           <string/>
           </property>
           <property name="minimum">
            <number>-1024</number>
@@ -1437,7 +1437,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SH</string>
+           <string/>
           </property>
           <property name="styleSheet">
            <string notr="true"/>
@@ -1468,7 +1468,7 @@ QPushButton:checked {
         <item row="3" column="3">
          <widget class="QLabel" name="label_4">
           <property name="text">
-           <string>SC</string>
+           <string notr="true">SC</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -1478,7 +1478,7 @@ QPushButton:checked {
         <item row="3" column="5">
          <widget class="QLabel" name="label_6">
           <property name="text">
-           <string>SD</string>
+           <string notr="true">SD</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -1488,7 +1488,7 @@ QPushButton:checked {
         <item row="3" column="6">
          <widget class="QLabel" name="label_7">
           <property name="text">
-           <string>SG</string>
+           <string notr="true">SG</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -1498,7 +1498,7 @@ QPushButton:checked {
         <item row="3" column="11">
          <widget class="QLabel" name="label_8">
           <property name="text">
-           <string>SH</string>
+           <string notr="true">SH</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -1508,7 +1508,7 @@ QPushButton:checked {
         <item row="3" column="8">
          <widget class="QLabel" name="label_12">
           <property name="text">
-           <string>RS</string>
+           <string notr="true">RS</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -1526,7 +1526,7 @@ QPushButton:checked {
           <item>
            <widget class="QLabel" name="rightXPerc">
             <property name="text">
-             <string>TextLabel</string>
+             <string notr="true">TextLabel</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignCenter</set>
@@ -1536,7 +1536,7 @@ QPushButton:checked {
           <item>
            <widget class="QLabel" name="rightYPerc">
             <property name="text">
-             <string>TextLabel</string>
+             <string notr="true">TextLabel</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignCenter</set>