diff --git a/DONATIONS.txt b/DONATIONS.txt
index ab36b7cd4..573271369 100644
--- a/DONATIONS.txt
+++ b/DONATIONS.txt
@@ -370,3 +370,5 @@ Uwe Kuehn
 David Beatty
 Aaron Stringer
 Alan J Wasserman
+Wolfgang Rauser
+Samuel Cook
diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui
index e98f88498..e0d4a0264 100644
--- a/companion/src/apppreferencesdialog.ui
+++ b/companion/src/apppreferencesdialog.ui
@@ -134,9 +134,7 @@ Mode 4:
           </size>
          </property>
          <property name="whatsThis">
-          <string>Channel order
-
-This is used by the templated to determine which channel goes to what number output.</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Channel order&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Defines the order of the default mixes created on a new model.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="currentIndex">
           <number>0</number>
@@ -318,7 +316,7 @@ This is used by the templated to determine which channel goes to what number out
           </sizepolicy>
          </property>
          <property name="text">
-          <string>Channel Order</string>
+          <string>Default Channel Order</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -559,7 +557,7 @@ This is used by the templated to determine which channel goes to what number out
           <bool>true</bool>
          </property>
          <property name="text">
-          <string>General Settings Label</string>
+          <string notr="true">General Settings Label</string>
          </property>
         </widget>
        </item>
diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp
index 97d27d870..aad8c884e 100644
--- a/companion/src/burndialog.cpp
+++ b/companion/src/burndialog.cpp
@@ -353,7 +353,7 @@ void burnDialog::on_useProfileImageCB_clicked()
   if (!fileName.isEmpty()){
     QImage image(fileName);
     if (image.isNull()) {
-      QMessageBox::critical(this, tr("Error"), tr("The profile image %1 does not contain an image.").arg(fileName));
+      QMessageBox::critical(this, tr("Error"), tr("Profile image %1 is invalid.").arg(fileName));
     }
     else {
       imageSource = PROFILE;
diff --git a/companion/src/comparedialog.cpp b/companion/src/comparedialog.cpp
index 90b7d905f..95fab3fe0 100644
--- a/companion/src/comparedialog.cpp
+++ b/companion/src/comparedialog.cpp
@@ -971,7 +971,7 @@ void compareDialog::printCurves()
   QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-after:always;\" width=\"100%\"><tr><td><h2>";
   str.append(tr("Curves"));
   str.append("</h2></td></tr><tr><td>");
-  str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=11><b>"+tr("5 Points Curves")+"</b></td></tr><tr>");
+  str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=11><b>"+tr("5 Point Curves")+"</b></td></tr><tr>");
   for(i=0; i<5; i++) 
     str.append(doTC(tr("pt %1").arg(i+1), "", true));
   str.append("<td></td>");
@@ -1001,7 +1001,7 @@ void compareDialog::printCurves()
   }
   str.append("</table></td></tr><tr><td>");
 
-  str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=19><b>"+tr("9 Points Curves")+"</b></td></tr><tr>");
+  str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=19><b>"+tr("9 Point Curves")+"</b></td></tr><tr>");
   for(i=0; i<9; i++) 
     str.append(doTC(tr("pt %1").arg(i+1), "", true));
   str.append("<td></td>");
diff --git a/companion/src/contributorsdialog.ui b/companion/src/contributorsdialog.ui
index 5d7d670c1..1301c22ba 100644
--- a/companion/src/contributorsdialog.ui
+++ b/companion/src/contributorsdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string/>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp
index 3e9ed21c9..cf125d35c 100644
--- a/companion/src/customizesplashdialog.cpp
+++ b/companion/src/customizesplashdialog.cpp
@@ -225,7 +225,7 @@ void customizeSplashDialog::loadProfile(Side side)
 
   if (!fileName.isEmpty()) {
     if (!side.displayImage( fileName, PROFILE ))
-      QMessageBox::critical(this, tr("Error"), tr("Cannot load the profile image %1.").arg(fileName));
+      QMessageBox::critical(this, tr("Error"), tr("Cannot load profile image %1.").arg(fileName));
   }
   side.markSourceButton();
 }
diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 7edf6aa4b..ada1e3f63 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -308,10 +308,7 @@ QString RawSource::toString()
     case SOURCE_TYPE_PPM:
       return QObject::tr("TR%1").arg(index+1);
     case SOURCE_TYPE_CH:
-      if (index < GetEepromInterface()->getCapability(Outputs))
-        return QObject::tr("CH%1%2").arg((index+1)/10).arg((index+1)%10);
-      else
-        return QObject::tr("X%1").arg(index-GetEepromInterface()->getCapability(Outputs)+1);
+      return QObject::tr("CH%1").arg(index+1);
     case SOURCE_TYPE_TELEMETRY:
       return CHECK_IN_ARRAY(telemetry, index);
     case SOURCE_TYPE_GVAR:
diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 49921735c..b9845163f 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -1022,7 +1022,6 @@ enum Capability {
  RotaryEncoders,
  Outputs,
  ChannelsName,
- ExtraChannels,
  ExtraInputs,
  ExtendedTrims,
  NumCurves,
diff --git a/companion/src/firmwares/er9x/er9xinterface.cpp b/companion/src/firmwares/er9x/er9xinterface.cpp
index bde6ef768..d3c7e2af5 100644
--- a/companion/src/firmwares/er9x/er9xinterface.cpp
+++ b/companion/src/firmwares/er9x/er9xinterface.cpp
@@ -239,8 +239,6 @@ int Er9xInterface::getCapability(const Capability capability)
       return 13;
     case Outputs:
       return 16;
-    case ExtraChannels:
-      return 0;
     case Simulation:
       return 1;
     case Telemetry:
diff --git a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
index 91ae4ec59..262ee48de 100644
--- a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
+++ b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
@@ -283,8 +283,6 @@ int Ersky9xInterface::getCapability(const Capability capability)
       return 13;
     case Outputs:
       return ERSKY9X_NUM_CHNOUT_V11;
-    case ExtraChannels:
-      return 0;
     case Simulation:
       return 1;
     case Telemetry:
diff --git a/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp b/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp
index 2afe8ba03..3feffa44b 100644
--- a/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp
+++ b/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp
@@ -241,8 +241,6 @@ int Gruvin9xInterface::getCapability(const Capability capability)
       return 13;
     case Outputs:
       return 16;
-    case ExtraChannels:
-      return 0;
     case ExtendedTrims:
       return 500;
     case Simulation:
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 21e3424c0..90c5b5125 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -705,8 +705,9 @@ class FlightModeField: public TransformedField {
         }
       }
       else {
-        for (int i=0; i<NUM_STICKS; i++)
+        for (int i=0; i<NUM_STICKS; i++) {
           internalField.Append(new SignedField<16>(trimBase[i]));
+        }
       }
 
       internalField.Append(new SwitchField<8>(phase.swtch, board, version));
@@ -776,22 +777,29 @@ class FlightModeField: public TransformedField {
           }
         }
         else {
-          int trim;
-          if (board == BOARD_STOCK || (board == BOARD_M128 && version >= 215))
-            trim = ((trimBase[i]) << 2) + (trimExt[i] & 0x03);
-          else
-            trim = trimBase[i];
-          if (trim > 500) {
-            phase.trimRef[i] = trim - 501;
-            if (phase.trimRef[i] >= index)
-              phase.trimRef[i] += 1;
+          if (phase.swtch == RawSwitch(SWITCH_TYPE_NONE)) {
+            phase.trimRef[i] = 0;
             phase.trimMode[i] = 0;
             phase.trim[i] = 0;
           }
           else {
-            phase.trimRef[i] = index;
-            phase.trimMode[i] = 0;
-            phase.trim[i] = trim;
+            int trim;
+            if (board == BOARD_STOCK || (board == BOARD_M128 && version >= 215))
+              trim = ((trimBase[i]) << 2) + (trimExt[i] & 0x03);
+            else
+              trim = trimBase[i];
+            if (trim > 500) {
+              phase.trimRef[i] = trim - 501;
+              if (phase.trimRef[i] >= index)
+                phase.trimRef[i] += 1;
+              phase.trimMode[i] = 0;
+              phase.trim[i] = 0;
+            }
+            else {
+              phase.trimRef[i] = index/*own trim*/;
+              phase.trimMode[i] = 0;
+              phase.trim[i] = trim;
+            }
           }
         }
       }
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index dad382017..595faacd6 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -581,8 +581,6 @@ int OpenTxInterface::getCapability(const Capability capability)
       return (IS_ARM(board) ? 23 : 7);
     case HasSoundMixer:
       return (IS_ARM(board) ? 1 : 0);
-    case ExtraChannels:
-      return 0;
     case ExtraInputs:
       return 1;
     case ExtendedTrims:
diff --git a/companion/src/firmwares/th9x/th9xinterface.cpp b/companion/src/firmwares/th9x/th9xinterface.cpp
index aefe77d8c..01030b1b8 100644
--- a/companion/src/firmwares/th9x/th9xinterface.cpp
+++ b/companion/src/firmwares/th9x/th9xinterface.cpp
@@ -159,8 +159,6 @@ int Th9xInterface::getCapability(const Capability capability)
       return TH9X_MAX_SWITCHES;
     case Outputs:
       return 8;
-    case ExtraChannels:
-      return 4;
     case OffsetWeight:
       return 125;      
     case Simulation:
diff --git a/companion/src/fwpreferencesdialog.ui b/companion/src/fwpreferencesdialog.ui
index d095e2cb7..78b4f64cb 100644
--- a/companion/src/fwpreferencesdialog.ui
+++ b/companion/src/fwpreferencesdialog.ui
@@ -51,7 +51,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -64,7 +64,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -77,7 +77,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -100,7 +100,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -113,7 +113,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -126,7 +126,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -139,7 +139,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -152,7 +152,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -214,7 +214,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -227,7 +227,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -240,7 +240,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -253,7 +253,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -266,7 +266,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -279,7 +279,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -292,7 +292,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -305,7 +305,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -318,7 +318,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -331,7 +331,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -344,7 +344,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -357,7 +357,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -370,7 +370,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -383,7 +383,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -396,7 +396,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -409,7 +409,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -422,7 +422,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -435,7 +435,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -448,7 +448,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -461,7 +461,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -474,7 +474,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -487,7 +487,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -500,7 +500,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -513,7 +513,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -574,7 +574,7 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -587,7 +587,7 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -614,7 +614,7 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -627,7 +627,7 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -640,7 +640,7 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -653,7 +653,7 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -666,7 +666,7 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -679,7 +679,7 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -699,7 +699,7 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
@@ -712,7 +712,7 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>FwInfo</string>
+      <string notr="true">FwInfo</string>
      </property>
     </widget>
    </item>
@@ -725,7 +725,7 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>CheckBox</string>
+      <string notr="true">CheckBox</string>
      </property>
     </widget>
    </item>
diff --git a/companion/src/generaledit.ui b/companion/src/generaledit.ui
index b94149ef3..1b59ef886 100644
--- a/companion/src/generaledit.ui
+++ b/companion/src/generaledit.ui
@@ -540,7 +540,7 @@ Mode 4:
           </sizepolicy>
          </property>
          <property name="text">
-          <string>Channel Order (For Templates)</string>
+          <string>Default Channel Order</string>
          </property>
         </widget>
        </item>
@@ -683,9 +683,7 @@ Mode 4:
           <string/>
          </property>
          <property name="whatsThis">
-          <string>Channel order
-
-This is used by the templated to determine which channel goes to what number output.</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Channel order&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Defines the order of the default mixes created on a new model.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="currentIndex">
           <number>0</number>
@@ -1628,12 +1626,7 @@ p, li { white-space: pre-wrap; }
           <string/>
          </property>
          <property name="whatsThis">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;LCD Screen Contrast&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Values can be 20-45&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string/>
          </property>
          <property name="minimum">
           <number>10</number>
@@ -2388,7 +2381,7 @@ Acceptable values are 5v..10v</string>
        <item row="4" column="5">
         <widget class="QLabel" name="label_pot4">
          <property name="text">
-          <string>POT 4</string>
+          <string>Pot. 4</string>
          </property>
         </widget>
        </item>
@@ -2402,7 +2395,7 @@ Acceptable values are 5v..10v</string>
        <item row="3" column="5">
         <widget class="QLabel" name="label_pot3">
          <property name="text">
-          <string>POT 3</string>
+          <string>Pot. 3</string>
          </property>
         </widget>
        </item>
@@ -2422,14 +2415,14 @@ Acceptable values are 5v..10v</string>
        <item row="2" column="5">
         <widget class="QLabel" name="label_pot2">
          <property name="text">
-          <string>POT 2</string>
+          <string>Pot. 2</string>
          </property>
         </widget>
        </item>
        <item row="1" column="5">
         <widget class="QLabel" name="label_pot1">
          <property name="text">
-          <string>POT 1</string>
+          <string>Pot. 1</string>
          </property>
         </widget>
        </item>
@@ -2456,7 +2449,7 @@ Acceptable values are 5v..10v</string>
        <item row="3" column="0">
         <widget class="QLabel" name="label_17">
          <property name="text">
-          <string>STICK 3</string>
+          <string>Stick 3</string>
          </property>
         </widget>
        </item>
@@ -2493,7 +2486,7 @@ Acceptable values are 5v..10v</string>
        <item row="1" column="0">
         <widget class="QLabel" name="label_15">
          <property name="text">
-          <string>STICK 1</string>
+          <string>Stick 1</string>
          </property>
         </widget>
        </item>
@@ -2542,7 +2535,7 @@ Acceptable values are 5v..10v</string>
        <item row="2" column="0">
         <widget class="QLabel" name="label_16">
          <property name="text">
-          <string>STICK 2</string>
+          <string>Stick 2</string>
          </property>
         </widget>
        </item>
@@ -2627,7 +2620,7 @@ Acceptable values are 5v..10v</string>
        <item row="4" column="0">
         <widget class="QLabel" name="label_18">
          <property name="text">
-          <string>STICK 4</string>
+          <string>Stick 4</string>
          </property>
         </widget>
        </item>
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index 17d296d35..1d75b75e7 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -605,7 +605,7 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
       if (item == source) b->setCurrentIndex(b->count()-1);
     }
 
-    for (int i=0; i<GetEepromInterface()->getCapability(Outputs)+GetEepromInterface()->getCapability(ExtraChannels); i++) {
+    for (int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
       item = RawSource(SOURCE_TYPE_CH, i);
       b->addItem(item.toString(), item.toValue());
       if (item == source) b->setCurrentIndex(b->count()-1);
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index 46f5c814a..bdab7907c 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -277,7 +277,7 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply)
           }
         }
 #else
-        QMessageBox::warning(this, tr("New release available"), tr("A new release of Companion is available please check the OpenTX website!"));
+        QMessageBox::warning(this, tr("New release available"), tr("A new release of Companion is available, please check the OpenTX website!"));
 #endif            
       } else {
         if (showcheckForUpdatesResult && check1done && check2done)
@@ -341,7 +341,7 @@ void MainWindow::reply1Accepted()
           int errnum=hline.mid(6).toInt();
           switch(errnum) {
             case 1:
-              errormsg=tr("Firmware does not longer fit in the radio, due to selected firmware options");
+              errormsg=tr("Not enough memory for all the selected firmware options");
               break;
             case 2:
               errormsg=tr("Compilation server temporary failure, try later");
@@ -380,7 +380,7 @@ void MainWindow::reply1Accepted()
         int errnum=hline.mid(6).toInt();
         switch(errnum) {
           case 1:
-            errormsg=tr("Firmware does not fit in the radio, due to selected firmware options");
+            errormsg=tr("Not enough memory for all the selected firmware options");
             break;
           case 2:
             errormsg=tr("Compilation server termporary failure, try later");
@@ -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()));
@@ -1641,12 +1641,12 @@ void MainWindow::createActions()
     finnishLangAct =     addAct( langAlignGroup,     tr("Finnish"),         tr("Use Finnish in menus"),                 SLOT(setFILanguage()));
     frenchLangAct =      addAct( langAlignGroup,     tr("French"),          tr("Use French in menus"),                  SLOT(setFRLanguage()));
     italianLangAct =     addAct( langAlignGroup,     tr("Italian"),         tr("Use Italian in menus"),                 SLOT(setITLanguage()));
-    hebrewLangAct =      addAct( langAlignGroup,     tr("Hebrew"),          tr("Use Hebrew in menus"),                  SLOT(setHELanguage()));
+//    hebrewLangAct =      addAct( langAlignGroup,     tr("Hebrew"),          tr("Use Hebrew in menus"),                  SLOT(setHELanguage()));
     polishLangAct =      addAct( langAlignGroup,     tr("Polish"),          tr("Use Polish in menus"),                  SLOT(setPLLanguage()));
-    portugueseLangAct =  addAct( langAlignGroup,     tr("Portuguese"),      tr("Use Portuguese in menus"),              SLOT(setPTLanguage()));
+//    portugueseLangAct =  addAct( langAlignGroup,     tr("Portuguese"),      tr("Use Portuguese in menus"),              SLOT(setPTLanguage()));
     swedishLangAct =     addAct( langAlignGroup,     tr("Swedish"),         tr("Use Swedish in menus"),                 SLOT(setSELanguage()));
-    russianLangAct =     addAct( langAlignGroup,     tr("Russian"),         tr("Use Russian in menus"),                 SLOT(setRULanguage()));
-    dutchLangAct =       addAct( langAlignGroup,     tr("Dutch"),           tr("Use Dutch in menus"),                   SLOT(setNLLanguage()));
+//    russianLangAct =     addAct( langAlignGroup,     tr("Russian"),         tr("Use Russian in menus"),                 SLOT(setRULanguage()));
+//    dutchLangAct =       addAct( langAlignGroup,     tr("Dutch"),           tr("Use Dutch in menus"),                   SLOT(setNLLanguage()));
 
     aboutAct =           addAct("information.png",   tr("About..."),                tr("Show the application's About box"),   SLOT(about()));
     printAct =           addAct("print.png",         tr("Print..."),                tr("Print current model"),                SLOT(print()));
@@ -1681,7 +1681,7 @@ void MainWindow::createActions()
 void MainWindow::createMenus()
 
 {
-    QMenu *recentFileMenu=new QMenu(tr("Recent Models+Settings"), this);
+    QMenu *recentFileMenu=new QMenu(tr("Recent Files"), this);
     QMenu *languageMenu=new QMenu(tr("Set Menu Language"), this);
     QMenu *themeMenu=new QMenu(tr("Set Icon Theme"), this);
     QMenu *iconThemeSizeMenu=new QMenu(tr("Set Icon Size"), this);
@@ -1718,13 +1718,13 @@ void MainWindow::createMenus()
       languageMenu->addAction(germanLangAct);
       languageMenu->addAction(finnishLangAct);
       languageMenu->addAction(frenchLangAct);
-      languageMenu->addAction(hebrewLangAct);
+//      languageMenu->addAction(hebrewLangAct);
       languageMenu->addAction(italianLangAct);
       languageMenu->addAction(polishLangAct);
-      languageMenu->addAction(portugueseLangAct);
+//      languageMenu->addAction(portugueseLangAct);
       languageMenu->addAction(swedishLangAct);
-      languageMenu->addAction(russianLangAct);
-      languageMenu->addAction(dutchLangAct);
+//      languageMenu->addAction(russianLangAct);
+//      languageMenu->addAction(dutchLangAct);
 
     settingsMenu->addMenu(themeMenu);
       themeMenu->addAction(classicThemeAct);
@@ -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/curves.ui b/companion/src/modeledit/curves.ui
index 7c08f5a3f..1be96eecd 100644
--- a/companion/src/modeledit/curves.ui
+++ b/companion/src/modeledit/curves.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
@@ -65,12 +65,12 @@
           <widget class="QComboBox" name="curveCustom">
            <item>
             <property name="text">
-             <string>Standard</string>
+             <string>Fixed X</string>
             </property>
            </item>
            <item>
             <property name="text">
-             <string>Custom</string>
+             <string>Custom X</string>
             </property>
            </item>
           </widget>
diff --git a/companion/src/modeledit/expodialog.ui b/companion/src/modeledit/expodialog.ui
index 82d16dbc2..b51d1e82a 100644
--- a/companion/src/modeledit/expodialog.ui
+++ b/companion/src/modeledit/expodialog.ui
@@ -33,7 +33,7 @@
    <item row="2" column="1">
     <widget class="QComboBox" name="sourceCB">
      <property name="whatsThis">
-      <string>The source for the mixer</string>
+      <string>Source for the mixer.</string>
      </property>
     </widget>
    </item>
@@ -73,7 +73,7 @@
      <item>
       <widget class="QComboBox" name="weightCB">
        <property name="whatsThis">
-        <string>Phase used by the input.</string>
+        <string/>
        </property>
       </widget>
      </item>
@@ -104,7 +104,7 @@
      <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>
@@ -114,7 +114,7 @@
      <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>
@@ -124,7 +124,7 @@
      <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>
@@ -134,7 +134,7 @@
      <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>
@@ -144,7 +144,7 @@
      <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>
@@ -154,7 +154,7 @@
      <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>
@@ -164,7 +164,7 @@
      <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>
@@ -174,7 +174,7 @@
      <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>
@@ -184,7 +184,7 @@
      <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>
@@ -266,7 +266,7 @@
    <item row="9" column="1">
     <widget class="QComboBox" name="switchesCB">
      <property name="whatsThis">
-      <string>Switch used by the input.
+      <string>Switch used to enable the line.
 If blank then the input is considered to be &quot;ON&quot; all the time.</string>
      </property>
     </widget>
@@ -332,17 +332,7 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</string
    <item row="3" column="1">
     <widget class="QDoubleSpinBox" name="scale">
      <property name="whatsThis">
-      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If Slow is not zero then the speed of the mix will be set by the value specified -&amp;gt; the value states the number of seconds it takes to transit from -100 to 100.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string/>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -395,7 +385,7 @@ p, li { white-space: pre-wrap; }
         <string/>
        </property>
        <property name="whatsThis">
-        <string>The curve used by the input</string>
+        <string>Curve applied to the source.</string>
        </property>
       </widget>
      </item>
diff --git a/companion/src/modeledit/flightmode.ui b/companion/src/modeledit/flightmode.ui
index 15158c258..b2ff04752 100644
--- a/companion/src/modeledit/flightmode.ui
+++ b/companion/src/modeledit/flightmode.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -169,7 +169,7 @@
           <item row="1" column="0">
            <widget class="QLabel" name="trim1Label">
             <property name="text">
-             <string>trim1</string>
+             <string notr="true">trim1</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -277,7 +277,7 @@
           <item row="0" column="0">
            <widget class="QLabel" name="trim2Label">
             <property name="text">
-             <string>trim2</string>
+             <string notr="true">trim2</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -303,7 +303,7 @@
           <item row="1" column="0">
            <widget class="QLabel" name="trim4Label">
             <property name="text">
-             <string>trim4</string>
+             <string notr="true">trim4</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -313,7 +313,7 @@
           <item row="0" column="0">
            <widget class="QLabel" name="trim3Label">
             <property name="text">
-             <string>trim3</string>
+             <string notr="true">trim3</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
diff --git a/companion/src/modeledit/heli.ui b/companion/src/modeledit/heli.ui
index c9741fde9..a248c9df7 100644
--- a/companion/src/modeledit/heli.ui
+++ b/companion/src/modeledit/heli.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QGridLayout" name="gridLayout" columnstretch="0,1" columnminimumwidth="100,0">
    <property name="horizontalSpacing">
diff --git a/companion/src/modeledit/mixerdialog.cpp b/companion/src/modeledit/mixerdialog.cpp
index b96719dfc..19dbee5f3 100644
--- a/companion/src/modeledit/mixerdialog.cpp
+++ b/companion/src/modeledit/mixerdialog.cpp
@@ -16,10 +16,7 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
     QLabel * lb_fp[] = {ui->lb_FP0,ui->lb_FP1,ui->lb_FP2,ui->lb_FP3,ui->lb_FP4,ui->lb_FP5,ui->lb_FP6,ui->lb_FP7,ui->lb_FP8 };
     QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
 
-    if (md->destCh > (unsigned int)GetEepromInterface()->getCapability(Outputs))
-      this->setWindowTitle(tr("DEST -> X%1").arg(md->destCh-GetEepromInterface()->getCapability(Outputs)));
-    else
-      this->setWindowTitle(tr("DEST -> CH%1%2").arg(md->destCh/10).arg(md->destCh%10));
+    this->setWindowTitle(tr("DEST -> CH%1").arg(md->destCh));
 
     populateSourceCB(ui->sourceCB, md->srcRaw, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
     ui->sourceCB->removeItem(0);
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/mixes.cpp b/companion/src/modeledit/mixes.cpp
index 1cd47484f..7f0b1dedc 100644
--- a/companion/src/modeledit/mixes.cpp
+++ b/companion/src/modeledit/mixes.cpp
@@ -5,7 +5,8 @@
 
 MixesPanel::MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings):
   ModelPanel(parent, model, generalSettings),
-  mixInserted(false)
+  mixInserted(false), 
+  highlightedSource(0)
 {
   QGridLayout * mixesLayout = new QGridLayout(this);
 
@@ -46,20 +47,15 @@ QString MixesPanel::getChannelLabel(int curDest)
 {
   QString str;
   int outputs = GetEepromInterface()->getCapability(Outputs);
-  if (curDest > outputs) {
-    str = QObject::tr("X%1  ").arg(curDest-outputs);
-  }
-  else {
-    str = QObject::tr("CH%1").arg(curDest);
-    str.append(" ");
-    if (GetEepromInterface()->getCapability(HasChNames)) {
-      QString name = model.limitData[curDest-1].name;
-      if (!name.isEmpty()) {
-        name = QString("(") + name + QString(")");
-      }
-      name.append("        ");
-      str += name.left(8);
+  str = QObject::tr("CH%1").arg(curDest);
+  (str.length() < 4) ? str.append("  ") : str.append(" ");
+  if (GetEepromInterface()->getCapability(HasChNames)) {
+    QString name = model.limitData[curDest-1].name;
+    if (!name.isEmpty()) {
+      name = QString("(") + name + QString(")");
     }
+    name.append("        ");
+    str += name.left(8);
   }
   return str;
 }
@@ -73,25 +69,84 @@ void MixesPanel::update()
   unsigned int curDest = 0;
   int i;
   unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
+
   for (i=0; i<GetEepromInterface()->getCapability(Mixes); i++) {
     MixData *md = &model.mixData[i];
-    if ((md->destCh==0) || (md->destCh>outputs+(unsigned int)GetEepromInterface()->getCapability(ExtraChannels))) continue;
+    // qDebug() << "md->destCh: " << md->destCh;
+    if (md->destCh==0 || md->destCh>outputs) continue;
     QString str = "";
     while (curDest < md->destCh-1) {
       curDest++;
-      str = getChannelLabel(curDest);
-      qba.clear();
-      qba.append((quint8)-curDest);
-      QListWidgetItem *itm = new QListWidgetItem(str);
-      itm->setData(Qt::UserRole,qba);
-      MixerlistWidget->addItem(itm);
+      AddMixerLine(-curDest);
     }
+    if (AddMixerLine(i)) {
+      curDest++;
+    }
+  }
 
+  while (curDest < outputs) {
+    curDest++;
+    AddMixerLine(-curDest);
+  }
+}
+
+#define MIX_ROW_HEIGHT_INCREASE     8   //how much space is added above mixer row (for new channel), if 0 space adding is disabled
+
+bool MixesPanel::AddMixerLine(int dest)
+{
+  bool new_ch;
+  QString str = getMixerText(dest, &new_ch);
+  QListWidgetItem *itm = new QListWidgetItem();
+  itm->setData(Qt::UserRole, QByteArray(1, (quint8)dest));  
+#if MIX_ROW_HEIGHT_INCREASE > 0
+  if ((new_ch && (dest > 0)) || (dest < 0)) {
+    //increase size of this row
+    QFontMetrics * fm = new QFontMetrics(itm->font());
+    QRect rect = fm->boundingRect("C)");
+    itm->setSizeHint(QSize(-1, (rect.height() * (14+MIX_ROW_HEIGHT_INCREASE))/10));    
+  }
+#endif
+  MixerlistWidget->addItem(itm);
+  MixerlistWidget->setItemWidget(itm, getMixerWidget(str));
+  // qDebug() << "MixesPanel::AddMixerLine(): " << str;
+  return new_ch;
+}
+
+QWidget * MixesPanel::getMixerWidget(const QString & mixer_text)
+{
+  QLabel * l = new QLabel();
+  l->setFont(QFont("Courier New",12));
+  l->setTextFormat(Qt::RichText);
+  l->setAlignment(Qt::AlignBottom);
+  QString formated_str(mixer_text);
+  formated_str.replace(" ", "&nbsp;");
+  l->setText(formated_str);
+  return l;
+}
+
+QString MixesPanel::getMixerText(int dest, bool * new_ch)
+{
+  QString str;
+  *new_ch = 0;
+  if (dest < 0) {
+    str = getChannelLabel(-dest);
+    //highlight channell if needed
+    if (-dest == (int)highlightedSource) {
+      str = "<b>" + str + "</b>";
+    }
+  }
+  else {
+    MixData *md = &model.mixData[dest];
+    //md->destCh from 1 to 32
     str = getChannelLabel(md->destCh);
 
-    if (curDest != md->destCh) {
-      curDest = md->destCh;
-    }
+    if ((dest == 0) || (model.mixData[dest-1].destCh != md->destCh)) {
+      *new_ch = 1;
+      //highlight channell if needed
+      if (md->destCh == highlightedSource) {
+        str = "<b>" + str + "</b>";
+      }
+     }
     else {
       str.fill(' ');
     }
@@ -102,63 +157,53 @@ void MixesPanel::update()
       default:  str += "  "; break;
     };
 
-    str += " " + md->srcRaw.toString();
+    //highlight source if needed
+    if ( (md->srcRaw.type == SOURCE_TYPE_CH) && (md->srcRaw.index+1 == (int)highlightedSource) ) {
+      str += " <b>" + Qt::escape(md->srcRaw.toString()) + "</b>"; 
+    }
+    else {
+      str += " " + Qt::escape(md->srcRaw.toString());
+    }
 
-    str += " " + tr("Weight(%1)").arg(getGVarString(md->weight, true));
+    str += " " + Qt::escape(tr("Weight(%1)").arg(getGVarString(md->weight, true)));
 
     QString phasesStr = getPhasesStr(md->phases, model);
-    if (!phasesStr.isEmpty()) str += " " + phasesStr;
+    if (!phasesStr.isEmpty()) str += " " + Qt::escape(phasesStr);
 
     if (md->swtch.type != SWITCH_TYPE_NONE) {
-      str += " " + tr("Switch(%1)").arg(md->swtch.toString());
+      str += " " + Qt::escape(tr("Switch(%1)").arg(md->swtch.toString()));
     }
 
     if (md->carryTrim>0) {
-      str += " " + tr("No Trim");
+      str += " " + Qt::escape(tr("No Trim"));
     }
     else if (md->carryTrim<0) {
-      str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
+      str += " " + Qt::escape(RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString());
     }
 
-    if (md->noExpo)      str += " " + tr("No DR/Expo");
-    if (md->sOffset)     str += " " + tr("Offset(%1)").arg(getGVarString(md->sOffset));
-    if (md->curve.value) str += " " + md->curve.toString();
+    if (md->noExpo)      str += " " + Qt::escape(tr("No DR/Expo"));
+    if (md->sOffset)     str += " " + Qt::escape(tr("Offset(%1)").arg(getGVarString(md->sOffset)));
+    if (md->curve.value) str += " " + Qt::escape(md->curve.toString());
 
     int scale = GetEepromInterface()->getCapability(SlowScale);
     if (scale == 0)
       scale = 1;
     if (md->delayDown || md->delayUp)
-      str += tr(" Delay(u%1:d%2)").arg((double)md->delayUp/scale).arg((double)md->delayDown/scale);
+      str += Qt::escape(tr(" Delay(u%1:d%2)").arg((double)md->delayUp/scale).arg((double)md->delayDown/scale));
     if (md->speedDown || md->speedUp)
-      str += tr(" Slow(u%1:d%2)").arg((double)md->speedUp/scale).arg((double)md->speedDown/scale);
-    if (md->mixWarn)  str += tr(" Warn(%1)").arg(md->mixWarn);
+      str += Qt::escape(tr(" Slow(u%1:d%2)").arg((double)md->speedUp/scale).arg((double)md->speedDown/scale));
+    if (md->mixWarn)  str += Qt::escape(tr(" Warn(%1)").arg(md->mixWarn));
     if (GetEepromInterface()->getCapability(HasMixerNames)) {
       QString MixerName;
       MixerName.append(md->name);
       if (!MixerName.isEmpty()) {
-        str += QString("(%1)").arg(MixerName);
+        str += Qt::escape(QString("(%1)").arg(MixerName));
       }
     }
-    qba.clear();
-    qba.append((quint8)i);
-    qba.append((const char*)md, sizeof(MixData));
-    QListWidgetItem *itm = new QListWidgetItem(str);
-    itm->setData(Qt::UserRole, qba);  // mix number
-    MixerlistWidget->addItem(itm); //(str);
-  }
-
-  while(curDest<outputs+GetEepromInterface()->getCapability(ExtraChannels)) {
-    curDest++;
-    QString str = getChannelLabel(curDest);
-    qba.clear();
-    qba.append((quint8)-curDest);
-    QListWidgetItem *itm = new QListWidgetItem(str);
-    itm->setData(Qt::UserRole,qba); // add new mixer
-    MixerlistWidget->addItem(itm);
   }
+  return str;
 }
 
-
 bool MixesPanel::gm_insertMix(int idx)
 {
     if (idx<0 || idx>=GetEepromInterface()->getCapability(Mixes) || model.mixData[GetEepromInterface()->getCapability(Mixes)-1].destCh > 0) {
@@ -367,6 +412,26 @@ void MixesPanel::mixerOpen()
     gm_openMix(idx);
 }
 
+void MixesPanel::mixerHighlight()
+{
+  int idx = MixerlistWidget->currentItem()->data(Qt::UserRole).toByteArray().at(0);
+  int dest;
+  if (idx<0) {
+    dest = -idx;
+  }
+  else {
+    dest = model.mixData[idx].destCh;
+  }
+  highlightedSource = ( (int)highlightedSource ==  dest) ? 0 : dest;
+  // qDebug() << "MixesPanel::mixerHighlight(): " << highlightedSource ;
+  for(int i=0; i<MixerlistWidget->count(); i++) {
+    int t = MixerlistWidget->item(i)->data(Qt::UserRole).toByteArray().at(0);
+    bool dummy;
+    QWidget *w = getMixerWidget(getMixerText(t, &dummy));
+    MixerlistWidget->setItemWidget(MixerlistWidget->item(i), w);
+  }
+}
+
 void MixesPanel::mixerAdd()
 {
     if (!MixerlistWidget->currentItem())
@@ -401,10 +466,11 @@ void MixesPanel::mixerlistWidget_customContextMenuRequested(QPoint pos)
     QMenu contextMenu;
     contextMenu.addAction(CompanionIcon("add.png"), tr("&Add"),this,SLOT(mixerAdd()),tr("Ctrl+A"));
     contextMenu.addAction(CompanionIcon("edit.png"), tr("&Edit"),this,SLOT(mixerOpen()),tr("Enter"));
+    contextMenu.addAction(CompanionIcon("fuses.png"), tr("&Toogle &highlight"),this,SLOT(mixerHighlight()),tr("Ctrl+T"));
     contextMenu.addSeparator();
     contextMenu.addAction(CompanionIcon("clear.png"), tr("&Delete"),this,SLOT(mixersDelete()),tr("Delete"));
     contextMenu.addAction(CompanionIcon("copy.png"), tr("&Copy"),this,SLOT(mixersCopy()),tr("Ctrl+C"));
-    contextMenu.addAction(CompanionIcon("cut.png"), tr("&Cut"),this,SLOT(mixersCut()),tr("Ctrl+X"));
+    contextMenu.addAction(CompanionIcon("cut.png"), tr("C&ut"),this,SLOT(mixersCut()),tr("Ctrl+X"));
     contextMenu.addAction(CompanionIcon("paste.png"), tr("&Paste"),this,SLOT(mixersPaste()),tr("Ctrl+V"))->setEnabled(hasData);
     contextMenu.addAction(CompanionIcon("duplicate.png"), tr("Du&plicate"),this,SLOT(mixersDuplicate()),tr("Ctrl+U"));
     contextMenu.addSeparator();
@@ -433,6 +499,7 @@ void MixesPanel::mixerlistWidget_KeyPress(QKeyEvent *event)
     if(event->matches(QKeySequence::Cut))       mixersCut();
     if(event->matches(QKeySequence::Paste))     mixersPaste();
     if(event->matches(QKeySequence::Underline)) mixersDuplicate();
+    if(event->matches(QKeySequence::AddTab))    mixerHighlight();
 
     if(event->key()==Qt::Key_Return || event->key()==Qt::Key_Enter) mixerOpen();
     if(event->matches(QKeySequence::MoveToNextLine))
@@ -443,11 +510,14 @@ void MixesPanel::mixerlistWidget_KeyPress(QKeyEvent *event)
 
 int MixesPanel::gm_moveMix(int idx, bool dir) //true=inc=down false=dec=up
 {
-    if(idx>GetEepromInterface()->getCapability(Mixes) || (idx==0 && !dir) || (idx==GetEepromInterface()->getCapability(Mixes) && dir)) return idx;
+    if(idx>GetEepromInterface()->getCapability(Mixes) || (idx==GetEepromInterface()->getCapability(Mixes) && dir)) return idx;
 
     int tdx = dir ? idx+1 : idx-1;
     MixData &src=model.mixData[idx];
     MixData &tgt=model.mixData[tdx];
+    
+    if (src.destCh == 1 && !dir)
+      return idx;
 
     unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
     if((src.destCh==0) || (src.destCh>outputs) || (tgt.destCh>outputs)) return idx;
diff --git a/companion/src/modeledit/mixes.h b/companion/src/modeledit/mixes.h
index 72bb0e0d5..36b0b1fff 100644
--- a/companion/src/modeledit/mixes.h
+++ b/companion/src/modeledit/mixes.h
@@ -27,6 +27,8 @@ class MixesPanel : public ModelPanel
     void mixerAdd();
     void moveMixUp();
     void moveMixDown();
+    void mixerHighlight();
+
 
     void mixerlistWidget_customContextMenuRequested(QPoint pos);
     void mixerlistWidget_doubleClicked(QModelIndex index);
@@ -40,6 +42,7 @@ class MixesPanel : public ModelPanel
   private:
     MixersList *MixerlistWidget;
     bool mixInserted;
+    unsigned int highlightedSource;
 
     int getMixerIndex(unsigned int dch);
     bool gm_insertMix(int idx);
@@ -50,6 +53,9 @@ class MixesPanel : public ModelPanel
     QList<int> createMixListFromSelected();
     void setSelectedByMixList(QList<int> list);
     QString getChannelLabel(int curDest);
+    bool AddMixerLine(int dest);
+    QString getMixerText(int dest, bool * new_ch);
+    QWidget * getMixerWidget(const QString & mixer_text);
 };
 
 #endif // MIXES_H
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/modeledit/setup_timer.ui b/companion/src/modeledit/setup_timer.ui
index e869af71a..7ee2ae523 100644
--- a/companion/src/modeledit/setup_timer.ui
+++ b/companion/src/modeledit/setup_timer.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
    <property name="margin">
@@ -26,7 +26,7 @@
       <enum>QDateTimeEdit::MinuteSection</enum>
      </property>
      <property name="displayFormat">
-      <string>mm:ss</string>
+      <string notr="true">mm:ss</string>
      </property>
     </widget>
    </item>
@@ -60,7 +60,7 @@
    <item>
     <widget class="QLabel" name="persistentValue">
      <property name="text">
-      <string> (00:00:00)</string>
+      <string notr="true"> (00:00:00)</string>
      </property>
     </widget>
    </item>
diff --git a/companion/src/modeledit/telemetry.ui b/companion/src/modeledit/telemetry.ui
index 6cd6ee036..2f5b14a62 100644
--- a/companion/src/modeledit/telemetry.ui
+++ b/companion/src/modeledit/telemetry.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0,0">
    <property name="spacing">
@@ -534,7 +534,7 @@
             </item>
             <item>
              <property name="text">
-              <string>CEL</string>
+              <string>CELS</string>
              </property>
             </item>
            </widget>
diff --git a/companion/src/modeledit/telemetry_analog.ui b/companion/src/modeledit/telemetry_analog.ui
index 10a28bcd9..980b5328f 100644
--- a/companion/src/modeledit/telemetry_analog.ui
+++ b/companion/src/modeledit/telemetry_analog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
diff --git a/companion/src/modeledit/telemetry_customscreen.ui b/companion/src/modeledit/telemetry_customscreen.ui
index b01417450..8abc7de10 100644
--- a/companion/src/modeledit/telemetry_customscreen.ui
+++ b/companion/src/modeledit/telemetry_customscreen.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/companion/src/preferencesdialog.ui b/companion/src/preferencesdialog.ui
index 1b1b2c46b..d432c66bb 100644
--- a/companion/src/preferencesdialog.ui
+++ b/companion/src/preferencesdialog.ui
@@ -968,7 +968,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -981,7 +981,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -994,7 +994,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1007,7 +1007,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1020,7 +1020,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1033,7 +1033,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1046,7 +1046,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1059,7 +1059,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1072,7 +1072,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1085,7 +1085,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1098,7 +1098,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1111,7 +1111,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1124,7 +1124,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1137,7 +1137,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1150,7 +1150,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1163,7 +1163,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1176,7 +1176,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1189,7 +1189,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1202,7 +1202,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1215,7 +1215,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1228,7 +1228,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1241,7 +1241,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1254,7 +1254,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1267,7 +1267,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1280,7 +1280,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1293,7 +1293,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1306,7 +1306,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1319,7 +1319,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1332,7 +1332,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1345,7 +1345,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1358,7 +1358,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1371,7 +1371,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1384,7 +1384,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1397,7 +1397,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1410,7 +1410,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1423,7 +1423,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1436,7 +1436,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1449,7 +1449,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1462,7 +1462,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1475,7 +1475,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1488,7 +1488,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
@@ -1501,7 +1501,7 @@ May be different from firmware language</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>CheckBox</string>
+        <string notr="true">CheckBox</string>
        </property>
       </widget>
      </item>
diff --git a/companion/src/printdialog.ui b/companion/src/printdialog.ui
index c041efd7c..b87534676 100644
--- a/companion/src/printdialog.ui
+++ b/companion/src/printdialog.ui
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/companion/src/simulation/simulatordialog-9x.ui b/companion/src/simulation/simulatordialog-9x.ui
index 71d514645..b9e76f77e 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>
@@ -393,6 +393,9 @@ QPushButton:checked {
             <property name="text">
              <string notr="true">&lt;-</string>
             </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item>
@@ -428,6 +431,9 @@ QPushButton:checked {
             <property name="text">
              <string notr="true">-&gt;</string>
             </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
          </layout>
@@ -451,6 +457,9 @@ QPushButton:checked {
             <property name="text">
              <string notr="true">^</string>
             </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item>
@@ -486,6 +495,9 @@ QPushButton:checked {
             <property name="text">
              <string notr="true">v</string>
             </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
          </layout>
@@ -535,7 +547,7 @@ QPushButton:pressed {
  }</string>
             </property>
             <property name="text">
-             <string>TRN</string>
+             <string notr="true">TRN</string>
             </property>
            </widget>
           </item>
@@ -562,7 +574,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 +607,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 +644,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 +677,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 +824,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 +834,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>
@@ -850,6 +862,9 @@ QPushButton:checked {
             <property name="text">
              <string notr="true">&lt;-</string>
             </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item>
@@ -885,6 +900,9 @@ QPushButton:checked {
             <property name="text">
              <string notr="true">-&gt;</string>
             </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
          </layout>
@@ -908,6 +926,9 @@ QPushButton:checked {
             <property name="text">
              <string notr="true">^</string>
             </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item>
@@ -943,6 +964,9 @@ QPushButton:checked {
             <property name="text">
              <string notr="true">v</string>
             </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
          </layout>
@@ -1010,7 +1034,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 +1056,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 +1091,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 +1116,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 +1151,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 +1173,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..f889d0257 100644
--- a/companion/src/simulation/simulatordialog-taranis.ui
+++ b/companion/src/simulation/simulatordialog-taranis.ui
@@ -301,6 +301,9 @@
               <property name="text">
                <string notr="true">^</string>
               </property>
+              <property name="autoDefault">
+               <bool>false</bool>
+              </property>
              </widget>
             </item>
             <item alignment="Qt::AlignHCenter">
@@ -342,6 +345,9 @@
               <property name="text">
                <string notr="true">v</string>
               </property>
+              <property name="autoDefault">
+               <bool>false</bool>
+              </property>
              </widget>
             </item>
            </layout>
@@ -555,7 +561,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>S1</string>
+           <string/>
           </property>
           <property name="minimum">
            <number>-1024</number>
@@ -585,7 +591,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 +601,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 +625,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SB</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>2</number>
@@ -675,7 +681,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SA</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>2</number>
@@ -715,7 +721,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SE</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>2</number>
@@ -743,7 +749,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 +771,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 +817,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>LS</string>
+           <string/>
           </property>
           <property name="minimum">
            <number>-1024</number>
@@ -833,7 +839,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 +849,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 +859,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 +869,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 +879,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>
@@ -899,6 +905,9 @@ QPushButton:checked {
             <property name="text">
              <string notr="true">&lt;-</string>
             </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item>
@@ -934,6 +943,9 @@ QPushButton:checked {
             <property name="text">
              <string notr="true">-&gt;</string>
             </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
          </layout>
@@ -982,6 +994,9 @@ QPushButton:checked {
               <property name="text">
                <string notr="true">^</string>
               </property>
+              <property name="autoDefault">
+               <bool>false</bool>
+              </property>
              </widget>
             </item>
             <item alignment="Qt::AlignHCenter">
@@ -1017,6 +1032,9 @@ QPushButton:checked {
               <property name="text">
                <string notr="true">v</string>
               </property>
+              <property name="autoDefault">
+               <bool>false</bool>
+              </property>
              </widget>
             </item>
            </layout>
@@ -1038,7 +1056,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>S2</string>
+           <string/>
           </property>
           <property name="minimum">
            <number>-1024</number>
@@ -1060,7 +1078,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 +1272,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SD</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>2</number>
@@ -1294,7 +1312,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SC</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>2</number>
@@ -1360,7 +1378,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SG</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>2</number>
@@ -1403,7 +1421,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>RS</string>
+           <string/>
           </property>
           <property name="minimum">
            <number>-1024</number>
@@ -1437,7 +1455,7 @@ QPushButton:checked {
            </size>
           </property>
           <property name="toolTip">
-           <string>SH</string>
+           <string/>
           </property>
           <property name="styleSheet">
            <string notr="true"/>
@@ -1468,7 +1486,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 +1496,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 +1506,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 +1516,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 +1526,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 +1544,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 +1554,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>
@@ -1564,6 +1582,9 @@ QPushButton:checked {
             <property name="text">
              <string notr="true">&lt;-</string>
             </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item>
@@ -1605,6 +1626,9 @@ QPushButton:checked {
             <property name="text">
              <string notr="true">-&gt;</string>
             </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
          </layout>
diff --git a/companion/src/translations/companion_fr.ts b/companion/src/translations/companion_fr.ts
index 8cc595ac9..205df48a7 100644
--- a/companion/src/translations/companion_fr.ts
+++ b/companion/src/translations/companion_fr.ts
@@ -3,81 +3,81 @@
 <TS version="2.0" language="fr_FR">
 <context>
     <name>AileronsPage</name>
-    <message>
-        <location filename="../wizarddialog.cpp" line="391"/>
-        <source>No</source>
-        <translation type="unfinished">Non</translation>
-    </message>
     <message>
         <location filename="../wizarddialog.cpp" line="392"/>
-        <source>Yes, controlled by a single channel</source>
-        <translation type="unfinished"></translation>
+        <source>No</source>
+        <translation>Non</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="393"/>
+        <source>Yes, controlled by a single channel</source>
+        <translation>Oui, contrôlés par un seul canal</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="394"/>
         <source>Yes, controlled by two channels</source>
-        <translation type="unfinished"></translation>
+        <translation>Oui, contrôlés par 2 canaux</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="405"/>
+        <location filename="../wizarddialog.cpp" line="406"/>
         <source>&lt;br&gt;First Aileron Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;Premier canal d&apos;ailerons:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="407"/>
+        <location filename="../wizarddialog.cpp" line="408"/>
         <source>Second Aileron Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Deuxième canal d&apos;ailerons:</translation>
     </message>
 </context>
 <context>
     <name>AirbrakesPage</name>
-    <message>
-        <location filename="../wizarddialog.cpp" line="489"/>
-        <source>No</source>
-        <translation type="unfinished">Non</translation>
-    </message>
     <message>
         <location filename="../wizarddialog.cpp" line="490"/>
-        <source>Yes, controlled by a single channel</source>
-        <translation type="unfinished"></translation>
+        <source>No</source>
+        <translation>Non</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="491"/>
+        <source>Yes, controlled by a single channel</source>
+        <translation>Oui, contrôlés par un seul canal</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="492"/>
         <source>Yes, controlled by two channels</source>
-        <translation type="unfinished"></translation>
+        <translation>Oui, contrôlés par 2 canaux</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="503"/>
+        <location filename="../wizarddialog.cpp" line="504"/>
         <source>&lt;br&gt;First Airbrake Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;Premier canal de volets:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="505"/>
+        <location filename="../wizarddialog.cpp" line="506"/>
         <source>Second Airbrake Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Deuxième canal de volets:</translation>
     </message>
 </context>
 <context>
     <name>BankPage</name>
-    <message>
-        <location filename="../wizarddialog.cpp" line="538"/>
-        <source>One</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../wizarddialog.cpp" line="539"/>
+        <source>One</source>
+        <translation>Un</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="540"/>
         <source>Two</source>
-        <translation type="unfinished"></translation>
+        <translation>Deux</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="549"/>
+        <location filename="../wizarddialog.cpp" line="550"/>
         <source>&lt;br&gt;First Elevon Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;Premier canal d&apos;élevons:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="551"/>
+        <location filename="../wizarddialog.cpp" line="552"/>
         <source>Second Elevon Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Deuxième canal d&apos;élevons:</translation>
     </message>
 </context>
 <context>
@@ -85,65 +85,65 @@
     <message>
         <location filename="../modeledit/channels.cpp" line="19"/>
         <source>Name</source>
-        <translation type="unfinished">Nom</translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location filename="../modeledit/channels.cpp" line="22"/>
         <source>Min</source>
-        <translation type="unfinished">Min</translation>
+        <translation>Min</translation>
     </message>
     <message>
         <location filename="../modeledit/channels.cpp" line="23"/>
         <source>Max</source>
-        <translation type="unfinished">Max</translation>
+        <translation>Max</translation>
     </message>
     <message>
         <location filename="../modeledit/channels.cpp" line="21"/>
         <source>Subtrim</source>
-        <translation type="unfinished"></translation>
+        <translation>Subtrim</translation>
     </message>
     <message>
         <location filename="../modeledit/channels.cpp" line="24"/>
         <source>Direction</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/channels.cpp" line="26"/>
         <source>Curve</source>
-        <translation type="unfinished">Courbe</translation>
+        <translation>Courbe</translation>
     </message>
     <message>
         <location filename="../modeledit/channels.cpp" line="28"/>
         <source>PPM Center</source>
-        <translation type="unfinished"></translation>
+        <translation>Neutre PPM</translation>
     </message>
     <message>
         <location filename="../modeledit/channels.cpp" line="30"/>
         <source>Linear Subtrim</source>
-        <translation type="unfinished"></translation>
+        <translation>Subtrim linéaire</translation>
     </message>
     <message>
         <location filename="../modeledit/channels.cpp" line="37"/>
         <source>Channel %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal %1</translation>
     </message>
     <message>
         <location filename="../modeledit/channels.cpp" line="96"/>
         <source>---</source>
-        <translation type="unfinished">---</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/channels.cpp" line="96"/>
         <source>INV</source>
-        <translation type="unfinished">Inversion</translation>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>ConclusionPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="838"/>
+        <location filename="../wizarddialog.cpp" line="839"/>
         <source>OK, I understand.</source>
-        <translation type="unfinished"></translation>
+        <translation>OK, compris!</translation>
     </message>
 </context>
 <context>
@@ -151,262 +151,261 @@
     <message>
         <location filename="../helpers.cpp" line="222"/>
         <source>Diff</source>
-        <translation type="unfinished">Diff</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../helpers.cpp" line="223"/>
         <source>Expo</source>
-        <translation type="unfinished">Expo</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../helpers.cpp" line="224"/>
         <source>Func</source>
-        <translation type="unfinished"></translation>
+        <translation>Fonc</translation>
     </message>
     <message>
         <location filename="../helpers.cpp" line="225"/>
         <source>Curve</source>
-        <translation type="unfinished">Courbe</translation>
+        <translation>Courbe</translation>
     </message>
 </context>
 <context>
     <name>Curves</name>
     <message>
-        <location filename="../modeledit/curves.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
+        <source>Custom</source>
+        <translation type="obsolete">Personnalisé</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="68"/>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
+        <source>Fixed X</source>
+        <translation>X fixe</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="73"/>
-        <source>Custom</source>
-        <translation type="unfinished">Prédéfini</translation>
+        <source>Custom X</source>
+        <translation>X configurable</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="82"/>
         <source>Lines</source>
-        <translation type="unfinished"></translation>
+        <translation>Linéaire</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="87"/>
         <source>Smooth</source>
-        <translation type="unfinished"></translation>
+        <translation>Adoucie</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="104"/>
         <location filename="../modeledit/curves.ui" line="293"/>
         <source>Curve type</source>
-        <translation type="unfinished">Type de courbe</translation>
+        <translation>Type de courbe</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="173"/>
         <source>Curve Creator</source>
-        <translation type="unfinished"></translation>
+        <translation>Créateur de courbe</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="179"/>
         <source>Y at X=0</source>
-        <translation type="unfinished">Y pour X=0</translation>
+        <translation>Y pour X=0</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="202"/>
         <source>Y at X=100</source>
-        <translation type="unfinished">Y pour X=100</translation>
+        <translation>Y pour X=100</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="226"/>
         <source>Both</source>
-        <translation type="unfinished">Les 2</translation>
+        <translation>Les 2</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="231"/>
         <source>x&gt;0</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="236"/>
         <source>x&lt;0</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="260"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation>Appliquer</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="267"/>
         <source>Side</source>
-        <translation type="unfinished">Direction</translation>
+        <translation>Côté</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="300"/>
         <source>Y at X=-100</source>
-        <translation type="unfinished">Y pour X=-100</translation>
+        <translation>Y pour X=-100</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="307"/>
         <source>Coefficient</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="49"/>
         <source>Curve name</source>
-        <translation type="unfinished">Nom de la courbe</translation>
+        <translation>Nom de la courbe</translation>
     </message>
     <message>
-        <location filename="../modeledit/curves.cpp" line="170"/>
+        <location filename="../modeledit/curves.cpp" line="137"/>
         <source>Curve %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Courbe %1</translation>
     </message>
     <message>
-        <location filename="../modeledit/curves.cpp" line="207"/>
+        <location filename="../modeledit/curves.cpp" line="174"/>
         <source>%1 points</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/curves.cpp" line="211"/>
+        <location filename="../modeledit/curves.cpp" line="178"/>
         <source>Linear</source>
-        <translation type="unfinished">Linéaire</translation>
+        <translation>Linéaire</translation>
     </message>
     <message>
-        <location filename="../modeledit/curves.cpp" line="212"/>
+        <location filename="../modeledit/curves.cpp" line="179"/>
         <source>Single Expo</source>
-        <translation type="unfinished">Expo simple</translation>
+        <translation>Expo simple</translation>
     </message>
     <message>
-        <location filename="../modeledit/curves.cpp" line="213"/>
+        <location filename="../modeledit/curves.cpp" line="180"/>
         <source>Symmetrical f(x)=-f(-x)</source>
-        <translation type="unfinished">Symétrique f(x)=-f(-x)</translation>
+        <translation>Symétrique f(x)=-f(-x)</translation>
     </message>
     <message>
-        <location filename="../modeledit/curves.cpp" line="214"/>
+        <location filename="../modeledit/curves.cpp" line="181"/>
         <source>Symmetrical f(x)=f(-x)</source>
-        <translation type="unfinished">Symétrique f(x)=f(-x)</translation>
+        <translation>Symétrique f(x)=f(-x)</translation>
     </message>
     <message>
-        <location filename="../modeledit/curves.cpp" line="236"/>
+        <location filename="../modeledit/curves.cpp" line="203"/>
         <source>Are you sure you want to reset curve %1 ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Voulez-vous vraiment réinitialiser la courbe %1 ?</translation>
     </message>
     <message>
-        <location filename="../modeledit/curves.cpp" line="314"/>
+        <location filename="../modeledit/curves.cpp" line="281"/>
         <source>Editing curve %1</source>
-        <translation type="unfinished">Édition de la courbe %1</translation>
+        <translation>Édition de la courbe %1</translation>
     </message>
     <message>
-        <location filename="../modeledit/curves.cpp" line="453"/>
+        <location filename="../modeledit/curves.cpp" line="420"/>
         <source>Not enough free points in EEPROM to store the curve.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pas assez de points disponibles en mémoire pour enregistrer la courbe.</translation>
     </message>
 </context>
 <context>
     <name>CustomFunctionsPanel</name>
-    <message>
-        <location filename="../modeledit/customfunctions.cpp" line="59"/>
-        <source>Switch</source>
-        <translation type="unfinished">Interrupteur</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/customfunctions.cpp" line="60"/>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/customfunctions.cpp" line="61"/>
-        <source>Parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../modeledit/customfunctions.cpp" line="62"/>
+        <source>Switch</source>
+        <translation>Interrupteur</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/customfunctions.cpp" line="63"/>
+        <source>Action</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../modeledit/customfunctions.cpp" line="64"/>
+        <source>Parameters</source>
+        <translation>Paramètres</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/customfunctions.cpp" line="65"/>
         <source>Enable</source>
-        <translation type="unfinished">Actif</translation>
+        <translation>Actif</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="109"/>
+        <location filename="../modeledit/customfunctions.cpp" line="112"/>
         <source>SF%1</source>
-        <translation type="unfinished"></translation>
+        <translation>FS%1</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="178"/>
+        <location filename="../modeledit/customfunctions.cpp" line="181"/>
         <source>ON</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="242"/>
+        <location filename="../modeledit/customfunctions.cpp" line="245"/>
         <source>Error</source>
-        <translation type="unfinished">Erreur</translation>
+        <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="242"/>
+        <location filename="../modeledit/customfunctions.cpp" line="245"/>
         <source>Unable to find sound file %1!</source>
-        <translation type="unfinished">Impossible de trouver le fichier %1!</translation>
+        <translation>Impossible de trouver le fichier son %1!</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="546"/>
+        <location filename="../modeledit/customfunctions.cpp" line="552"/>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Supprimer</translation>
+        <translation>&amp;Supprimer</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="546"/>
+        <location filename="../modeledit/customfunctions.cpp" line="552"/>
         <source>Delete</source>
-        <translation type="unfinished">Supprimer</translation>
+        <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="547"/>
+        <location filename="../modeledit/customfunctions.cpp" line="553"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copier</translation>
+        <translation>&amp;Copier</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="547"/>
+        <location filename="../modeledit/customfunctions.cpp" line="553"/>
         <source>Ctrl+C</source>
-        <translation type="unfinished">Ctrl+C</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="548"/>
+        <location filename="../modeledit/customfunctions.cpp" line="554"/>
         <source>&amp;Cut</source>
-        <translation type="unfinished">C&amp;ouper</translation>
+        <translation>C&amp;ouper</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="548"/>
+        <location filename="../modeledit/customfunctions.cpp" line="554"/>
         <source>Ctrl+X</source>
-        <translation type="unfinished">Ctrl+X</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="549"/>
+        <location filename="../modeledit/customfunctions.cpp" line="555"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">Co&amp;ller</translation>
+        <translation>Co&amp;ller</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="549"/>
+        <location filename="../modeledit/customfunctions.cpp" line="555"/>
         <source>Ctrl+V</source>
-        <translation type="unfinished">Ctrl+V</translation>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>CyclicPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="684"/>
+        <location filename="../wizarddialog.cpp" line="685"/>
         <source>90</source>
-        <translation type="unfinished">90</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.cpp" line="686"/>
-        <source>120</source>
-        <translation type="unfinished">120</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="687"/>
-        <source>120x</source>
-        <translation type="unfinished">120x</translation>
+        <source>120</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="688"/>
+        <source>120x</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="689"/>
         <source>140</source>
-        <translation type="unfinished">140</translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -416,76 +415,57 @@
         <source>Weight</source>
         <translation>Ratio</translation>
     </message>
-    <message>
-        <location filename="../modeledit/expodialog.ui" line="107"/>
-        <source>0</source>
-        <translation>0</translation>
-    </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="98"/>
         <source>Flight modes</source>
         <translation>Phases de vol</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="36"/>
         <source>The source for the mixer</source>
-        <translation type="unfinished">La voie maître pour le mixage</translation>
+        <translation type="obsolete">La voie maître du mixage</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="43"/>
         <source>Input name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom de l&apos;entrée</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="66"/>
-        <location filename="../modeledit/expodialog.ui" line="405"/>
+        <location filename="../modeledit/expodialog.ui" line="395"/>
         <source>GV</source>
         <translation>VG</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="76"/>
-        <source>Phase used by the input.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/expodialog.ui" line="117"/>
         <source>1</source>
-        <translation>1</translation>
+        <translation type="obsolete">1</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="127"/>
         <source>2</source>
-        <translation>2</translation>
+        <translation type="obsolete">2</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="137"/>
         <source>3</source>
-        <translation>3</translation>
+        <translation type="obsolete">3</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="147"/>
         <source>4</source>
-        <translation>4</translation>
+        <translation type="obsolete">4</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="157"/>
         <source>5</source>
-        <translation>5</translation>
+        <translation type="obsolete">5</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="167"/>
         <source>6</source>
-        <translation>6</translation>
+        <translation type="obsolete">6</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="177"/>
         <source>7</source>
-        <translation>7</translation>
+        <translation type="obsolete">7</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="187"/>
         <source>8</source>
-        <translation>8</translation>
+        <translation type="obsolete">8</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="262"/>
@@ -493,25 +473,19 @@
         <translation>Interrupteur</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="269"/>
-        <source>Switch used by the input.
-If blank then the input is considered to be &quot;ON&quot; all the time.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../modeledit/expodialog.ui" line="388"/>
+        <source>Curve applied to the source.</source>
+        <translation>Courbe appliquée à la source.</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="398"/>
-        <source>The curve used by the input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/expodialog.ui" line="424"/>
+        <location filename="../modeledit/expodialog.ui" line="414"/>
         <source>Source</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="431"/>
+        <location filename="../modeledit/expodialog.ui" line="421"/>
         <source>Line name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom de la ligne</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="277"/>
@@ -519,7 +493,18 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</source
         <translation>Direction</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="335"/>
+        <location filename="../modeledit/expodialog.ui" line="36"/>
+        <source>Source for the mixer.</source>
+        <translation>La voie maître du mixage.</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/expodialog.ui" line="269"/>
+        <source>Switch used to enable the line.
+If blank then the input is considered to be &quot;ON&quot; all the time.</source>
+        <translation>Interrupteur utilisé pour activer la ligne.
+Si vide, la ligne est toujours active.</translation>
+    </message>
+    <message>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -531,7 +516,7 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If Slow is not zero then the speed of the mix will be set by the value specified -&amp;gt; the value states the number of seconds it takes to transit from -100 to 100.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
@@ -544,240 +529,220 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Si Ralentissement est différent de 0, la vitesse du mixage sera la valeur spécifiée -&amp;gt; La valeur représente le nombre de secondes nécessaires à la course -100/100.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="358"/>
+        <location filename="../modeledit/expodialog.ui" line="348"/>
         <source>Scale</source>
-        <translation type="unfinished">Echelle</translation>
+        <translation>Echelle</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="365"/>
+        <location filename="../modeledit/expodialog.ui" line="355"/>
         <source>Include Trim</source>
-        <translation type="unfinished">Inclure Trim</translation>
+        <translation>Inclure Trim</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="373"/>
+        <location filename="../modeledit/expodialog.ui" line="363"/>
         <source>No</source>
-        <translation type="unfinished">Non</translation>
+        <translation>Non</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="378"/>
+        <location filename="../modeledit/expodialog.ui" line="368"/>
         <source>Yes</source>
-        <translation type="unfinished">Oui</translation>
+        <translation>Oui</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="386"/>
+        <location filename="../modeledit/expodialog.ui" line="376"/>
         <source>Curve</source>
         <translation>Courbe</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="285"/>
         <source>NEG</source>
-        <translation>Négatif</translation>
+        <translation>Négative</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="290"/>
         <source>POS</source>
-        <translation>Positif</translation>
+        <translation>Positive</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="295"/>
         <source>ALL</source>
-        <translation>Partout</translation>
+        <translation>Les 2</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.cpp" line="17"/>
         <source>Edit %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Editer %1</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.cpp" line="66"/>
         <source>Rud</source>
-        <translation type="unfinished">Dir</translation>
+        <translation>Dir</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.cpp" line="67"/>
         <source>Ele</source>
-        <translation type="unfinished">Prf</translation>
+        <translation>Prf</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.cpp" line="68"/>
         <source>Thr</source>
-        <translation type="unfinished">Gaz</translation>
+        <translation>Gaz</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.cpp" line="69"/>
         <source>Ail</source>
-        <translation type="unfinished">Ail</translation>
+        <translation>Ail</translation>
     </message>
 </context>
 <context>
     <name>FblPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="738"/>
-        <source>Trottle Channel:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../wizarddialog.cpp" line="739"/>
+        <source>Throttle Channel:</source>
+        <translation>Canal des gaz:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="740"/>
+        <location filename="../wizarddialog.cpp" line="741"/>
         <source>Yaw Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal du lacet:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="742"/>
+        <location filename="../wizarddialog.cpp" line="743"/>
         <source>Pitch Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal du tangage:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="744"/>
+        <location filename="../wizarddialog.cpp" line="745"/>
         <source>Roll Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal du roulis:</translation>
     </message>
 </context>
 <context>
     <name>FlapsPage</name>
-    <message>
-        <location filename="../wizarddialog.cpp" line="440"/>
-        <source>No</source>
-        <translation type="unfinished">Non</translation>
-    </message>
     <message>
         <location filename="../wizarddialog.cpp" line="441"/>
-        <source>Yes, controlled by a single channel</source>
-        <translation type="unfinished"></translation>
+        <source>No</source>
+        <translation>Non</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="442"/>
+        <source>Yes, controlled by a single channel</source>
+        <translation>Oui, contrôlés par un seul canal</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="443"/>
         <source>Yes, controlled by two channels</source>
-        <translation type="unfinished"></translation>
+        <translation>Oui, contrôlés par 2 canaux</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="454"/>
+        <location filename="../wizarddialog.cpp" line="455"/>
         <source>&lt;br&gt;First Flap Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;Premier canal de volets:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="456"/>
+        <location filename="../wizarddialog.cpp" line="457"/>
         <source>Second Flap Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Deuxième canal de volets:</translation>
     </message>
 </context>
 <context>
     <name>FlightMode</name>
-    <message>
-        <location filename="../modeledit/flightmode.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../modeledit/flightmode.ui" line="22"/>
         <source>Fade In</source>
-        <translation type="unfinished">Fondu en entrée</translation>
+        <translation>Fondu en entrée</translation>
     </message>
     <message>
         <location filename="../modeledit/flightmode.ui" line="43"/>
         <source>Fade Out</source>
-        <translation type="unfinished">Fondu en sortie</translation>
+        <translation>Fondu en sortie</translation>
     </message>
     <message>
         <location filename="../modeledit/flightmode.ui" line="57"/>
         <source>Name</source>
-        <translation type="unfinished">Nom</translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location filename="../modeledit/flightmode.ui" line="77"/>
         <source>Switch</source>
-        <translation type="unfinished">Interrupteur</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/flightmode.ui" line="172"/>
-        <source>trim1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/flightmode.ui" line="280"/>
-        <source>trim2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/flightmode.ui" line="306"/>
-        <source>trim4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/flightmode.ui" line="316"/>
-        <source>trim3</source>
-        <translation type="unfinished"></translation>
+        <translation>Interrupteur</translation>
     </message>
     <message>
         <location filename="../modeledit/flightmodes.cpp" line="60"/>
         <source>Rud</source>
-        <translation type="unfinished">Dir</translation>
+        <translation>Dir</translation>
     </message>
     <message>
         <location filename="../modeledit/flightmodes.cpp" line="60"/>
         <source>Ele</source>
-        <translation type="unfinished">Prf</translation>
+        <translation>Prf</translation>
     </message>
     <message>
         <location filename="../modeledit/flightmodes.cpp" line="60"/>
         <source>Thr</source>
-        <translation type="unfinished">Gaz</translation>
+        <translation>Gaz</translation>
     </message>
     <message>
         <location filename="../modeledit/flightmodes.cpp" line="60"/>
         <source>Ail</source>
-        <translation type="unfinished">Ail</translation>
+        <translation>Ail</translation>
     </message>
     <message>
         <location filename="../modeledit/flightmodes.cpp" line="97"/>
         <source>Rotary Encoder %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Encodeur rotatif %1</translation>
     </message>
     <message>
         <location filename="../modeledit/flightmodes.cpp" line="130"/>
         <source>GVAR%1</source>
-        <translation type="unfinished"></translation>
+        <translation>VG%1</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/flightmodes.cpp" line="164"/>
+        <source>Popup enabled</source>
+        <translation>Indication activée</translation>
     </message>
 </context>
 <context>
     <name>FlightModes</name>
     <message>
-        <location filename="../modeledit/flightmodes.cpp" line="431"/>
+        <location filename="../modeledit/flightmodes.cpp" line="450"/>
         <source>Flight Mode %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Phase de vol %1</translation>
     </message>
     <message>
-        <location filename="../modeledit/flightmodes.cpp" line="434"/>
+        <location filename="../modeledit/flightmodes.cpp" line="453"/>
         <source> (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/flightmodes.cpp" line="437"/>
+        <location filename="../modeledit/flightmodes.cpp" line="456"/>
         <source> (default)</source>
-        <translation type="unfinished"></translation>
+        <translation> (par défaut)</translation>
     </message>
 </context>
 <context>
     <name>FlybarSelectionPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="333"/>
+        <location filename="../wizarddialog.cpp" line="334"/>
         <source>Has Flybar</source>
-        <translation type="unfinished"></translation>
+        <translation>Avec barre de Bell</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="336"/>
         <source>Flybarless</source>
-        <translation type="unfinished"></translation>
+        <translation>Sans barre de Bell</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="338"/>
+        <location filename="../wizarddialog.cpp" line="339"/>
         <source>Flybar:</source>
-        <translation type="unfinished"></translation>
+        <translation>Barre de Bell:</translation>
     </message>
 </context>
 <context>
     <name>GeneralEdit</name>
     <message>
-        <location filename="../generaledit.ui" line="2702"/>
+        <location filename="../generaledit.ui" line="2695"/>
         <source>v</source>
         <translation></translation>
     </message>
@@ -787,7 +752,7 @@ p, li { white-space: pre-wrap; }
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1821"/>
+        <location filename="../generaledit.ui" line="1814"/>
         <source> sec</source>
         <translation></translation>
     </message>
@@ -797,8 +762,7 @@ p, li { white-space: pre-wrap; }
         <translation>Configuration</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="892"/>
-        <location filename="../generaledit.ui" line="1631"/>
+        <location filename="../generaledit.ui" line="890"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -813,7 +777,7 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Plage de valeurs: 20...45&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1591"/>
+        <location filename="../generaledit.ui" line="1589"/>
         <source>Inactivity Timer</source>
         <translation>Alerte d&apos;inactivité</translation>
     </message>
@@ -829,7 +793,7 @@ Réinitialisation en agissant sur n&apos;importe lequel des manches / touches de
         <translation>Paramètres généraux</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1708"/>
+        <location filename="../generaledit.ui" line="1701"/>
         <source>This is the switch selectrion for turning on the backlight (if installed).
 
 </source>
@@ -842,17 +806,17 @@ Réinitialisation en agissant sur n&apos;importe lequel des manches / touches de
     </message>
     <message>
         <location filename="../generaledit.ui" line="453"/>
-        <location filename="../generaledit.ui" line="1976"/>
-        <location filename="../generaledit.ui" line="2010"/>
-        <location filename="../generaledit.ui" line="2081"/>
-        <location filename="../generaledit.ui" line="2115"/>
-        <location filename="../generaledit.ui" line="2154"/>
-        <location filename="../generaledit.ui" line="2225"/>
-        <location filename="../generaledit.ui" line="2272"/>
-        <location filename="../generaledit.ui" line="2306"/>
-        <location filename="../generaledit.ui" line="3059"/>
-        <location filename="../generaledit.ui" line="3100"/>
-        <location filename="../generaledit.ui" line="3148"/>
+        <location filename="../generaledit.ui" line="1969"/>
+        <location filename="../generaledit.ui" line="2003"/>
+        <location filename="../generaledit.ui" line="2074"/>
+        <location filename="../generaledit.ui" line="2108"/>
+        <location filename="../generaledit.ui" line="2147"/>
+        <location filename="../generaledit.ui" line="2218"/>
+        <location filename="../generaledit.ui" line="2265"/>
+        <location filename="../generaledit.ui" line="2299"/>
+        <location filename="../generaledit.ui" line="3052"/>
+        <location filename="../generaledit.ui" line="3093"/>
+        <location filename="../generaledit.ui" line="3141"/>
         <source>Beeper volume
 
 0 - Quiet.  No beeps at all.
@@ -869,12 +833,12 @@ Long : bips plus longs.
 Extra long : bips extra longs.</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1539"/>
+        <location filename="../generaledit.ui" line="1537"/>
         <source>Battery Warning</source>
         <translation>Alerte batterie</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1549"/>
+        <location filename="../generaledit.ui" line="1547"/>
         <source>Contrast</source>
         <translation>Contraste</translation>
     </message>
@@ -937,7 +901,7 @@ These will be relevant for all models in the same EEPROM.</source>
 Communs à tous les modèles d&apos;une même EEPROM.</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1664"/>
+        <location filename="../generaledit.ui" line="1657"/>
         <source>Battery warning voltage.
 This is the threashhold where the battery warning sounds.
 
@@ -948,7 +912,7 @@ Seuil auquel se déclenche l&apos;alarme de batterie.
 Plage de valeurs: 5v...10v</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2372"/>
+        <location filename="../generaledit.ui" line="2365"/>
         <source>Calibration</source>
         <translation>Étalonnage</translation>
     </message>
@@ -958,26 +922,26 @@ Plage de valeurs: 5v...10v</translation>
         <translation>Mode</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="686"/>
         <source>Channel order
 
 This is used by the templated to determine which channel goes to what number output.</source>
-        <translation>Ordre des voies
-Indique l&apos;affectation voie / numéro d&apos;entrée pour les présélections (=Templates).</translation>
+        <translation type="obsolete">Ordre des voies
+
+Détermine l&apos;ordre des mixages par défaut sur un nouveau modèle.</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1818"/>
+        <location filename="../generaledit.ui" line="1811"/>
         <source>If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds.</source>
         <translation>Si cette valeur est différente de 0, l&apos;appui sur une touche de navigation déclenche le rétroéclairage qui s&apos;éteint après la durée spécifiée (en secondes).</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="913"/>
+        <location filename="../generaledit.ui" line="911"/>
         <source>Beeper Mode</source>
         <translation>Réglage des bips</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1500"/>
-        <location filename="../generaledit.ui" line="1568"/>
+        <location filename="../generaledit.ui" line="1498"/>
+        <location filename="../generaledit.ui" line="1566"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1007,18 +971,17 @@ p, li { white-space: pre-wrap; }
         <translation>Mode 1 (DIR PROF GAZ AIL)</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="543"/>
         <source>Channel Order (For Templates)</source>
-        <translation>Ordre des voies par défaut</translation>
+        <translation type="obsolete">Ordre des voies par défaut</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1529"/>
+        <location filename="../generaledit.ui" line="1527"/>
         <source>Show Splash Screen on Startup</source>
         <translation>Afficher l&apos;écran de démarrage</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1734"/>
-        <location filename="../generaledit.ui" line="1737"/>
+        <location filename="../generaledit.ui" line="1727"/>
+        <location filename="../generaledit.ui" line="1730"/>
         <source>Show splash screen on startup</source>
         <translation>Affiche l&apos;écran d&apos;accueil au démarrage</translation>
     </message>
@@ -1038,91 +1001,91 @@ p, li { white-space: pre-wrap; }
         <location filename="../generaledit.ui" line="588"/>
         <location filename="../generaledit.ui" line="655"/>
         <source>Normal</source>
-        <translation>Normal</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="593"/>
         <location filename="../generaledit.ui" line="660"/>
         <source>Long</source>
-        <translation>Long</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1963"/>
+        <location filename="../generaledit.ui" line="1956"/>
         <source>Rud</source>
-        <translation type="unfinished">Dir</translation>
+        <translation>Dir</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2068"/>
+        <location filename="../generaledit.ui" line="2061"/>
         <source>Ele</source>
-        <translation type="unfinished">Prf</translation>
+        <translation>Prf</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2212"/>
+        <location filename="../generaledit.ui" line="2205"/>
         <source>Thr</source>
-        <translation type="unfinished">Gaz</translation>
+        <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2259"/>
+        <location filename="../generaledit.ui" line="2252"/>
         <source>Ail</source>
-        <translation type="unfinished">Ail</translation>
+        <translation>Ail</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2721"/>
+        <location filename="../generaledit.ui" line="2714"/>
         <source>PPM Multiplier</source>
         <translation>Coeff. multiplicateur PPM</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1986"/>
-        <location filename="../generaledit.ui" line="2091"/>
-        <location filename="../generaledit.ui" line="2235"/>
-        <location filename="../generaledit.ui" line="2282"/>
+        <location filename="../generaledit.ui" line="1979"/>
+        <location filename="../generaledit.ui" line="2084"/>
+        <location filename="../generaledit.ui" line="2228"/>
+        <location filename="../generaledit.ui" line="2275"/>
         <source>Off</source>
-        <translation>Aucun</translation>
+        <translation>Désactivé</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1911"/>
+        <location filename="../generaledit.ui" line="1904"/>
         <source>Trainer</source>
         <translation>Ecolage</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2452"/>
+        <location filename="../generaledit.ui" line="2445"/>
         <source>PPM 1</source>
-        <translation>PPM 1</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2020"/>
-        <location filename="../generaledit.ui" line="2125"/>
-        <location filename="../generaledit.ui" line="2164"/>
-        <location filename="../generaledit.ui" line="2316"/>
+        <location filename="../generaledit.ui" line="2013"/>
+        <location filename="../generaledit.ui" line="2118"/>
+        <location filename="../generaledit.ui" line="2157"/>
+        <location filename="../generaledit.ui" line="2309"/>
         <source>chn1</source>
         <translation>Can. 1</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2025"/>
-        <location filename="../generaledit.ui" line="2130"/>
-        <location filename="../generaledit.ui" line="2169"/>
-        <location filename="../generaledit.ui" line="2321"/>
+        <location filename="../generaledit.ui" line="2018"/>
+        <location filename="../generaledit.ui" line="2123"/>
+        <location filename="../generaledit.ui" line="2162"/>
+        <location filename="../generaledit.ui" line="2314"/>
         <source>chn2</source>
         <translation>Can. 2</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2030"/>
-        <location filename="../generaledit.ui" line="2135"/>
-        <location filename="../generaledit.ui" line="2174"/>
-        <location filename="../generaledit.ui" line="2326"/>
+        <location filename="../generaledit.ui" line="2023"/>
+        <location filename="../generaledit.ui" line="2128"/>
+        <location filename="../generaledit.ui" line="2167"/>
+        <location filename="../generaledit.ui" line="2319"/>
         <source>chn3</source>
         <translation>Can. 3</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2035"/>
-        <location filename="../generaledit.ui" line="2140"/>
-        <location filename="../generaledit.ui" line="2179"/>
-        <location filename="../generaledit.ui" line="2331"/>
+        <location filename="../generaledit.ui" line="2028"/>
+        <location filename="../generaledit.ui" line="2133"/>
+        <location filename="../generaledit.ui" line="2172"/>
+        <location filename="../generaledit.ui" line="2324"/>
         <source>chn4</source>
         <translation>Can. 4</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1936"/>
+        <location filename="../generaledit.ui" line="1929"/>
         <source>Mode</source>
         <translation>Mode</translation>
     </message>
@@ -1191,7 +1154,7 @@ p, li { white-space: pre-wrap; }
         <translation>Durée vibreur</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="830"/>
+        <location filename="../generaledit.ui" line="828"/>
         <source>GPS Coordinates</source>
         <translation>Coordonnées GPS</translation>
     </message>
@@ -1221,32 +1184,32 @@ p, li { white-space: pre-wrap; }
         <translation>Haut-parleur/Voix</translation>
     </message>
     <message utf8="true">
-        <location filename="../generaledit.ui" line="838"/>
+        <location filename="../generaledit.ui" line="836"/>
         <source>hh° (N/S) mm&apos; ss&apos;&apos;.dd</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="843"/>
+        <location filename="../generaledit.ui" line="841"/>
         <source>NMEA</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="920"/>
+        <location filename="../generaledit.ui" line="918"/>
         <source>Timeshift from UTC</source>
         <translation>Décalage horaire (UTC)</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1612"/>
+        <location filename="../generaledit.ui" line="1610"/>
         <source>LCD Display Type</source>
         <translation>Type de LCD</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1599"/>
+        <location filename="../generaledit.ui" line="1597"/>
         <source>Standard</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1604"/>
+        <location filename="../generaledit.ui" line="1602"/>
         <source>Optrex</source>
         <translation></translation>
     </message>
@@ -1261,29 +1224,29 @@ p, li { white-space: pre-wrap; }
         <translation>Puissance vibreur</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1872"/>
+        <location filename="../generaledit.ui" line="1865"/>
         <source>BackLight Brightness</source>
         <translation>Luminosité rétroéclairage</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1903"/>
+        <location filename="../generaledit.ui" line="1896"/>
         <source>RotEnc Navigation</source>
-        <translation>Navigation avec encodeur</translation>
+        <translation>Navigation avec encodeur rot.</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1886"/>
+        <location filename="../generaledit.ui" line="1879"/>
         <source>BackLight  Auto OFF after</source>
         <translation>Durée rétroéclairage</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1695"/>
+        <location filename="../generaledit.ui" line="1688"/>
         <source>BackLight Switch</source>
         <translation>Inter rétroéclairage</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="121"/>
         <source>Country Code</source>
-        <translation></translation>
+        <translation>Zone géograhpique RF</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="139"/>
@@ -1293,12 +1256,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../generaledit.ui" line="134"/>
         <source>Japan</source>
-        <translation></translation>
+        <translation>Japon</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="129"/>
         <source>America</source>
-        <translation></translation>
+        <translation>Amérique</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="551"/>
@@ -1311,9 +1274,9 @@ p, li { white-space: pre-wrap; }
         <translation>Impérial</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="866"/>
+        <location filename="../generaledit.ui" line="864"/>
         <source>Measurement Units</source>
-        <translation>Unités</translation>
+        <translation>Unités de mesure</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="373"/>
@@ -1346,7 +1309,7 @@ p, li { white-space: pre-wrap; }
         <translation>Mode FAI</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="818"/>
+        <location filename="../generaledit.ui" line="816"/>
         <source>If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.</source>
         <translation>Lorsque le mode FAI est activé, le variomètre ainsi que l&apos;écran et la lecture des valeurs de télémesure sont désactivés. Ce mode ne peut pas être désactivé sur la radio.</translation>
     </message>
@@ -1398,152 +1361,202 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../generaledit.ui" line="357"/>
         <source>Vario pitch at zero</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonalité du vario à 0</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="695"/>
+        <location filename="../generaledit.ui" line="543"/>
+        <source>Default Channel Order</source>
+        <translation>Ordre des voies par défaut</translation>
+    </message>
+    <message>
+        <location filename="../generaledit.ui" line="686"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Channel order&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Defines the order of the default mixes created on a new model.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ordre des voies&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Détermine l&apos;ordre des mixages par défaut sur un nouveau modèle.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../generaledit.ui" line="693"/>
         <source>R E T A</source>
-        <translation type="unfinished"></translation>
+        <translation>D P G A</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="700"/>
+        <location filename="../generaledit.ui" line="698"/>
         <source>R E A T</source>
-        <translation type="unfinished"></translation>
+        <translation>D P A G</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="705"/>
+        <location filename="../generaledit.ui" line="703"/>
         <source>R T E A</source>
-        <translation type="unfinished"></translation>
+        <translation>D G P A</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="710"/>
+        <location filename="../generaledit.ui" line="708"/>
         <source>R T A E</source>
-        <translation type="unfinished"></translation>
+        <translation>D G A P</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="715"/>
+        <location filename="../generaledit.ui" line="713"/>
         <source>R A E T</source>
-        <translation type="unfinished"></translation>
+        <translation>D A P G</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="720"/>
+        <location filename="../generaledit.ui" line="718"/>
         <source>R A T E</source>
-        <translation type="unfinished"></translation>
+        <translation>D A G P</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="725"/>
+        <location filename="../generaledit.ui" line="723"/>
         <source>E R T A</source>
-        <translation type="unfinished"></translation>
+        <translation>P D G A</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="730"/>
+        <location filename="../generaledit.ui" line="728"/>
         <source>E R A T</source>
-        <translation type="unfinished"></translation>
+        <translation>P D A G</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="735"/>
+        <location filename="../generaledit.ui" line="733"/>
         <source>E T R A</source>
-        <translation type="unfinished"></translation>
+        <translation>P G D A</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="740"/>
+        <location filename="../generaledit.ui" line="738"/>
         <source>E T A R</source>
-        <translation type="unfinished"></translation>
+        <translation>P G A D</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="745"/>
+        <location filename="../generaledit.ui" line="743"/>
         <source>E A R T</source>
-        <translation type="unfinished"></translation>
+        <translation>P A D G</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="750"/>
+        <location filename="../generaledit.ui" line="748"/>
         <source>E A T R</source>
-        <translation type="unfinished"></translation>
+        <translation>P A G D</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="755"/>
+        <location filename="../generaledit.ui" line="753"/>
         <source>T R E A</source>
-        <translation type="unfinished"></translation>
+        <translation>G D P A</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="760"/>
+        <location filename="../generaledit.ui" line="758"/>
         <source>T R A E</source>
-        <translation type="unfinished"></translation>
+        <translation>G D A P</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="765"/>
+        <location filename="../generaledit.ui" line="763"/>
         <source>T E R A</source>
-        <translation type="unfinished"></translation>
+        <translation>G P D A</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="770"/>
+        <location filename="../generaledit.ui" line="768"/>
         <source>T E A R</source>
-        <translation type="unfinished"></translation>
+        <translation>G P A D</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="775"/>
+        <location filename="../generaledit.ui" line="773"/>
         <source>T A R E</source>
-        <translation type="unfinished"></translation>
+        <translation>G A D P</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="780"/>
+        <location filename="../generaledit.ui" line="778"/>
         <source>T A E R</source>
-        <translation type="unfinished"></translation>
+        <translation>G A P D</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="785"/>
+        <location filename="../generaledit.ui" line="783"/>
         <source>A R E T</source>
-        <translation type="unfinished"></translation>
+        <translation>A D P G</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="790"/>
+        <location filename="../generaledit.ui" line="788"/>
         <source>A R T E</source>
-        <translation type="unfinished"></translation>
+        <translation>A D G P</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="795"/>
+        <location filename="../generaledit.ui" line="793"/>
         <source>A E R T</source>
-        <translation type="unfinished"></translation>
+        <translation>A P D G</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="800"/>
+        <location filename="../generaledit.ui" line="798"/>
         <source>A E T R</source>
-        <translation type="unfinished"></translation>
+        <translation>A P G D</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="805"/>
+        <location filename="../generaledit.ui" line="803"/>
         <source>A T R E</source>
-        <translation type="unfinished"></translation>
+        <translation>A G D P</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="810"/>
+        <location filename="../generaledit.ui" line="808"/>
         <source>A T E R</source>
-        <translation type="unfinished"></translation>
+        <translation>A G P D</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3135"/>
+        <location filename="../generaledit.ui" line="2384"/>
+        <source>Pot. 4</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../generaledit.ui" line="2398"/>
+        <source>Pot. 3</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../generaledit.ui" line="2418"/>
+        <source>Pot. 2</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../generaledit.ui" line="2425"/>
+        <source>Pot. 1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../generaledit.ui" line="2452"/>
+        <source>Stick 3</source>
+        <translation>Manche 3</translation>
+    </message>
+    <message>
+        <location filename="../generaledit.ui" line="2489"/>
+        <source>Stick 1</source>
+        <translation>Manche 1</translation>
+    </message>
+    <message>
+        <location filename="../generaledit.ui" line="2538"/>
+        <source>Stick 2</source>
+        <translation>Manche 2</translation>
+    </message>
+    <message>
+        <location filename="../generaledit.ui" line="2623"/>
+        <source>Stick 4</source>
+        <translation>Manche 4</translation>
+    </message>
+    <message>
+        <location filename="../generaledit.ui" line="3128"/>
         <source>S3 Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Type S3</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3177"/>
+        <location filename="../generaledit.ui" line="3170"/>
         <source>OFF</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3182"/>
+        <location filename="../generaledit.ui" line="3175"/>
         <source>S-Port Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation>Recopie S. Port</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3187"/>
+        <location filename="../generaledit.ui" line="3180"/>
         <source>Debug</source>
-        <translation type="unfinished"></translation>
+        <translation>Débogage</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3195"/>
+        <location filename="../generaledit.ui" line="3188"/>
         <source>Serial Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Port série</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="392"/>
@@ -1551,253 +1564,245 @@ p, li { white-space: pre-wrap; }
         <translation>Débloquage lecture seule</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="944"/>
+        <location filename="../generaledit.ui" line="942"/>
         <source>SC</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1006"/>
+        <location filename="../generaledit.ui" line="1004"/>
         <source>SE</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1301"/>
+        <location filename="../generaledit.ui" line="1299"/>
         <source>SA</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1317"/>
+        <location filename="../generaledit.ui" line="1315"/>
         <source>SF</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1333"/>
+        <location filename="../generaledit.ui" line="1331"/>
         <source>SH</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1349"/>
+        <location filename="../generaledit.ui" line="1347"/>
         <source>SD</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1365"/>
+        <location filename="../generaledit.ui" line="1363"/>
         <source>SB</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1430"/>
+        <location filename="../generaledit.ui" line="1428"/>
         <source>SG</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1455"/>
-        <location filename="../generaledit.ui" line="1834"/>
+        <location filename="../generaledit.ui" line="1453"/>
+        <location filename="../generaledit.ui" line="1827"/>
         <source> Hz</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1474"/>
+        <location filename="../generaledit.ui" line="1472"/>
         <source>&quot;No Sound&quot; Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Alerte &quot;son coupé&quot;</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1481"/>
+        <location filename="../generaledit.ui" line="1479"/>
         <source>Low Memory Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Alerte mémoire pleine</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1754"/>
+        <location filename="../generaledit.ui" line="1747"/>
         <source>---</source>
-        <translation type="unfinished">---</translation>
+        <translation>---</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1759"/>
+        <location filename="../generaledit.ui" line="1752"/>
         <source>2s</source>
-        <translation type="unfinished">2s</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1764"/>
+        <location filename="../generaledit.ui" line="1757"/>
         <source>3s</source>
-        <translation type="unfinished">3s</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1769"/>
+        <location filename="../generaledit.ui" line="1762"/>
         <source>4s</source>
-        <translation type="unfinished">4s</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1774"/>
+        <location filename="../generaledit.ui" line="1767"/>
         <source>6s</source>
-        <translation type="unfinished">6s</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1779"/>
+        <location filename="../generaledit.ui" line="1772"/>
         <source>8s</source>
-        <translation type="unfinished">8s</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1784"/>
+        <location filename="../generaledit.ui" line="1777"/>
         <source>10s</source>
-        <translation type="unfinished">10s</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1789"/>
+        <location filename="../generaledit.ui" line="1782"/>
         <source>15s</source>
-        <translation type="unfinished">15s</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1799"/>
+        <location filename="../generaledit.ui" line="1792"/>
         <source>Vario pitch at max</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonalité du vario au max</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1853"/>
+        <location filename="../generaledit.ui" line="1846"/>
         <source> ms</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1879"/>
+        <location filename="../generaledit.ui" line="1872"/>
         <source>Vario repeat at zero</source>
-        <translation type="unfinished"></translation>
+        <translation>Répétition du vario à 0</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1943"/>
+        <location filename="../generaledit.ui" line="1936"/>
         <source>Input</source>
         <translation>Entrée</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1950"/>
+        <location filename="../generaledit.ui" line="1943"/>
         <source>Weight</source>
         <translation>Ratio</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1991"/>
-        <location filename="../generaledit.ui" line="2096"/>
-        <location filename="../generaledit.ui" line="2240"/>
-        <location filename="../generaledit.ui" line="2287"/>
+        <location filename="../generaledit.ui" line="1984"/>
+        <location filename="../generaledit.ui" line="2089"/>
+        <location filename="../generaledit.ui" line="2233"/>
+        <location filename="../generaledit.ui" line="2280"/>
         <source>+= (Sum)</source>
         <translation>+= (Additionne)</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1996"/>
-        <location filename="../generaledit.ui" line="2101"/>
-        <location filename="../generaledit.ui" line="2245"/>
-        <location filename="../generaledit.ui" line="2292"/>
+        <location filename="../generaledit.ui" line="1989"/>
+        <location filename="../generaledit.ui" line="2094"/>
+        <location filename="../generaledit.ui" line="2238"/>
+        <location filename="../generaledit.ui" line="2285"/>
         <source>:= (Replace)</source>
         <translation>:= (Remplace)</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2829"/>
+        <location filename="../generaledit.ui" line="2822"/>
         <source>PPM 2</source>
-        <translation>PPM 2</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2836"/>
+        <location filename="../generaledit.ui" line="2829"/>
         <source>PPM 3</source>
         <translation>PPM 3</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2843"/>
+        <location filename="../generaledit.ui" line="2836"/>
         <source>PPM 4</source>
         <translation>PPM 4</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2391"/>
         <source>POT 4</source>
-        <translation>POT 4</translation>
+        <translation type="obsolete">POT 4</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2466"/>
-        <location filename="../generaledit.ui" line="3010"/>
+        <location filename="../generaledit.ui" line="2459"/>
+        <location filename="../generaledit.ui" line="3003"/>
         <source>Negative span</source>
         <translation>Amplitude nég.</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2476"/>
-        <location filename="../generaledit.ui" line="3020"/>
+        <location filename="../generaledit.ui" line="2469"/>
+        <location filename="../generaledit.ui" line="3013"/>
         <source>Mid value</source>
         <translation>Centre</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2486"/>
-        <location filename="../generaledit.ui" line="3030"/>
+        <location filename="../generaledit.ui" line="2479"/>
+        <location filename="../generaledit.ui" line="3023"/>
         <source>Positive span</source>
         <translation>Amplitude pos.</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2496"/>
         <source>STICK 1</source>
-        <translation>MANCHE 1</translation>
+        <translation type="obsolete">MANCHE 1</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2545"/>
         <source>STICK 2</source>
-        <translation>MANCHE 2</translation>
+        <translation type="obsolete">MANCHE 2</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2873"/>
+        <location filename="../generaledit.ui" line="2866"/>
         <source>Current</source>
         <translation>Courant</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3069"/>
-        <location filename="../generaledit.ui" line="3110"/>
-        <location filename="../generaledit.ui" line="3158"/>
+        <location filename="../generaledit.ui" line="3062"/>
+        <location filename="../generaledit.ui" line="3103"/>
+        <location filename="../generaledit.ui" line="3151"/>
         <source>None</source>
-        <translation type="unfinished">Aucun</translation>
+        <translation>Aucun</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3074"/>
-        <location filename="../generaledit.ui" line="3115"/>
-        <location filename="../generaledit.ui" line="3163"/>
+        <location filename="../generaledit.ui" line="3067"/>
+        <location filename="../generaledit.ui" line="3108"/>
+        <location filename="../generaledit.ui" line="3156"/>
         <source>Pot (normal)</source>
-        <translation type="unfinished"></translation>
+        <translation>Potentiomètre (normal)</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3079"/>
-        <location filename="../generaledit.ui" line="3120"/>
-        <location filename="../generaledit.ui" line="3168"/>
+        <location filename="../generaledit.ui" line="3072"/>
+        <location filename="../generaledit.ui" line="3113"/>
+        <location filename="../generaledit.ui" line="3161"/>
         <source>Multipos Switch</source>
-        <translation type="unfinished"></translation>
+        <translation>Inter multipos.</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3087"/>
+        <location filename="../generaledit.ui" line="3080"/>
         <source>S1 Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Type S1</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3128"/>
+        <location filename="../generaledit.ui" line="3121"/>
         <source>S2 Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Type S2</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2459"/>
         <source>STICK 3</source>
-        <translation>MANCHE 3</translation>
+        <translation type="obsolete">MANCHE 3</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2630"/>
         <source>STICK 4</source>
-        <translation>MANCHE 4</translation>
+        <translation type="obsolete">MANCHE 4</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2432"/>
         <source>POT 1</source>
-        <translation>POT 1</translation>
+        <translation type="obsolete">POT 1</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2425"/>
         <source>POT 2</source>
-        <translation>POT 2</translation>
+        <translation type="obsolete">POT 2</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2405"/>
         <source>POT 3</source>
-        <translation>POT 3</translation>
+        <translation type="obsolete">POT 3</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2692"/>
+        <location filename="../generaledit.ui" line="2685"/>
         <source>Battery</source>
         <translation>Batterie</translation>
     </message>
@@ -1838,110 +1843,105 @@ Are you sure ?</source>
 <context>
     <name>GyroPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="709"/>
+        <location filename="../wizarddialog.cpp" line="710"/>
         <source>No</source>
-        <translation type="unfinished">Non</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.cpp" line="711"/>
-        <source>Yes, controled by a switch</source>
-        <translation type="unfinished"></translation>
+        <translation>Non</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="712"/>
+        <source>Yes, controled by a switch</source>
+        <translation>Oui, contrôlé par un inter</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="713"/>
         <source>Yes, controlled by a pot</source>
-        <translation type="unfinished"></translation>
+        <translation>Oui, contrôlé par un potentiomètre</translation>
     </message>
 </context>
 <context>
     <name>Heli</name>
-    <message>
-        <location filename="../modeledit/heli.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../modeledit/heli.ui" line="25"/>
         <source>Invert Elevator</source>
-        <translation type="unfinished">Profondeur</translation>
+        <translation>Profondeur</translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="32"/>
         <source>Invert Aileron</source>
-        <translation type="unfinished">Aileron</translation>
+        <translation>Aileron</translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="39"/>
         <source>Invert Collective</source>
-        <translation type="unfinished">Pas collectif</translation>
+        <translation>Pas collectif</translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="48"/>
         <source>Invert</source>
-        <translation type="unfinished">Inversion</translation>
+        <translation>Inversion</translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="56"/>
         <source>Off</source>
-        <translation type="unfinished">Aucun</translation>
+        <translation>Aucun</translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="61"/>
         <source>120</source>
-        <translation type="unfinished">120</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="66"/>
         <source>120X</source>
-        <translation type="unfinished">120X</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="71"/>
         <source>140</source>
-        <translation type="unfinished">140</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="76"/>
         <source>90</source>
-        <translation type="unfinished">90</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="84"/>
         <source>Collective</source>
-        <translation type="unfinished">Source du pas collectif</translation>
+        <translation>Source du pas collectif</translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="94"/>
         <source>Swash Type</source>
-        <translation type="unfinished">Type de plateau cyclique</translation>
+        <translation>Type de plateau cyclique</translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="120"/>
         <source>Swash Ring</source>
-        <translation type="unfinished">Limite cyclique</translation>
+        <translation>Limite cyclique</translation>
     </message>
 </context>
 <context>
     <name>HeliPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="773"/>
-        <source>Trottle Channel:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../wizarddialog.cpp" line="774"/>
+        <source>Throttle Channel:</source>
+        <translation>Canal des gaz:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="775"/>
+        <location filename="../wizarddialog.cpp" line="776"/>
         <source>Yaw Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal du lacet:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="777"/>
+        <location filename="../wizarddialog.cpp" line="778"/>
         <source>Pitch Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal du tangage:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="779"/>
+        <location filename="../wizarddialog.cpp" line="780"/>
         <source>Roll Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal du roulis:</translation>
     </message>
 </context>
 <context>
@@ -1950,140 +1950,140 @@ Are you sure ?</source>
         <location filename="../modeledit/inputs.cpp" line="17"/>
         <location filename="../modeledit/inputs.cpp" line="371"/>
         <source>Move Up</source>
-        <translation type="unfinished">Monter</translation>
+        <translation>Monter</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="19"/>
         <location filename="../modeledit/inputs.cpp" line="371"/>
         <source>Ctrl+Up</source>
-        <translation type="unfinished">Ctrl+Haut</translation>
+        <translation>Ctrl+Haut</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="20"/>
         <location filename="../modeledit/inputs.cpp" line="372"/>
         <source>Move Down</source>
-        <translation type="unfinished">Descendre</translation>
+        <translation>Descendre</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="22"/>
         <location filename="../modeledit/inputs.cpp" line="372"/>
         <source>Ctrl+Down</source>
-        <translation type="unfinished">Ctrl+Bas</translation>
+        <translation>Ctrl+Bas</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="23"/>
         <source>Clear All Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Effacer tous les réglages</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="92"/>
         <source>Source(%1)</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="94"/>
         <source>No Trim</source>
-        <translation type="unfinished">Pas de Trim</translation>
+        <translation>Pas de Trim</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="107"/>
         <source>Weight(%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ratio(%1)</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="114"/>
         <source>Switch(%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Inter(%1)</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="146"/>
         <source>Not enough available inputs!</source>
-        <translation type="unfinished"></translation>
+        <translation>Pas assez d&apos;entrées disponibles!</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="230"/>
         <source>Delete Selected Inputs?</source>
-        <translation type="unfinished"></translation>
+        <translation>Effacer les entrées sélectionnées?</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="362"/>
         <source>&amp;Add</source>
-        <translation type="unfinished">&amp;Ajouter</translation>
+        <translation>&amp;Ajouter</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="362"/>
         <source>Ctrl+A</source>
-        <translation type="unfinished">Ctrl+A</translation>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="363"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">Éditio&amp;n</translation>
+        <translation>Éditio&amp;n</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="363"/>
         <source>Enter</source>
-        <translation type="unfinished">Entrée</translation>
+        <translation>Entrée</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="365"/>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Supprimer</translation>
+        <translation>&amp;Supprimer</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="365"/>
         <source>Delete</source>
-        <translation type="unfinished">Supprimer</translation>
+        <translation>Supprimer</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="366"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copier</translation>
+        <translation>&amp;Copier</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="366"/>
         <source>Ctrl+C</source>
-        <translation type="unfinished">Ctrl+C</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="367"/>
         <source>&amp;Cut</source>
-        <translation type="unfinished">C&amp;ouper</translation>
+        <translation>C&amp;ouper</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="367"/>
         <source>Ctrl+X</source>
-        <translation type="unfinished">Ctrl+X</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="368"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">Co&amp;ller</translation>
+        <translation>Co&amp;ller</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="368"/>
         <source>Ctrl+V</source>
-        <translation type="unfinished">Ctrl+V</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="369"/>
         <source>Du&amp;plicate</source>
-        <translation type="unfinished">Du&amp;pliquer</translation>
+        <translation>Du&amp;pliquer</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="369"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished">Ctrl+U</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="468"/>
         <source>Clear Inputs?</source>
-        <translation type="unfinished"></translation>
+        <translation>Effacer toutes les entrées?</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="468"/>
         <source>Really clear all the inputs?</source>
-        <translation type="unfinished"></translation>
+        <translation>Voulez-vous vraiment effacer toutes les entrées?</translation>
     </message>
 </context>
 <context>
@@ -2091,90 +2091,90 @@ Are you sure ?</source>
     <message>
         <location filename="../modeledit/logicalswitches.cpp" line="18"/>
         <source>V1</source>
-        <translation type="unfinished">V1</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/logicalswitches.cpp" line="19"/>
         <source>V2</source>
-        <translation type="unfinished">V2</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/logicalswitches.cpp" line="22"/>
         <source>Duration</source>
-        <translation type="unfinished">Durée</translation>
+        <translation>Durée</translation>
     </message>
     <message>
         <location filename="../modeledit/logicalswitches.cpp" line="23"/>
         <source>Delay</source>
-        <translation type="unfinished">Délai</translation>
+        <translation>Délai</translation>
     </message>
     <message>
         <location filename="../modeledit/logicalswitches.cpp" line="17"/>
         <source>Function</source>
-        <translation type="unfinished">Fonction</translation>
+        <translation>Fonction</translation>
     </message>
     <message>
         <location filename="../modeledit/logicalswitches.cpp" line="20"/>
         <source>AND Switch</source>
-        <translation type="unfinished"></translation>
+        <translation>ET supplémentaire</translation>
     </message>
     <message>
         <location filename="../modeledit/logicalswitches.cpp" line="31"/>
         <source>L%1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="405"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="396"/>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Supprimer</translation>
+        <translation>&amp;Supprimer</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="405"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="396"/>
         <source>Delete</source>
-        <translation type="unfinished">Supprimer</translation>
+        <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="406"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="397"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copier</translation>
+        <translation>&amp;Copier</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="406"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="397"/>
         <source>Ctrl+C</source>
-        <translation type="unfinished">Ctrl+C</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="407"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="398"/>
         <source>&amp;Cut</source>
-        <translation type="unfinished">C&amp;ouper</translation>
+        <translation>C&amp;ouper</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="407"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="398"/>
         <source>Ctrl+X</source>
-        <translation type="unfinished">Ctrl+X</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="408"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="399"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">Co&amp;ller</translation>
+        <translation>Co&amp;ller</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="408"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="399"/>
         <source>Ctrl+V</source>
-        <translation type="unfinished">Ctrl+V</translation>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="1686"/>
-        <location filename="../mainwindow.cpp" line="1833"/>
+        <location filename="../mainwindow.cpp" line="1708"/>
+        <location filename="../mainwindow.cpp" line="1855"/>
         <source>Edit</source>
         <translation>Edition</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1667"/>
-        <location filename="../mainwindow.cpp" line="1796"/>
+        <location filename="../mainwindow.cpp" line="1689"/>
+        <location filename="../mainwindow.cpp" line="1818"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
@@ -2194,23 +2194,23 @@ Are you sure ?</source>
         <location filename="../mainwindow.cpp" line="370"/>
         <location filename="../mainwindow.cpp" line="399"/>
         <location filename="../mainwindow.cpp" line="883"/>
-        <location filename="../mainwindow.cpp" line="2019"/>
-        <location filename="../mainwindow.cpp" line="2025"/>
-        <location filename="../mainwindow.cpp" line="2033"/>
-        <location filename="../mainwindow.cpp" line="2056"/>
-        <location filename="../mainwindow.cpp" line="2062"/>
-        <location filename="../mainwindow.cpp" line="2069"/>
-        <location filename="../mainwindow.cpp" line="2076"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
+        <location filename="../mainwindow.cpp" line="2041"/>
+        <location filename="../mainwindow.cpp" line="2047"/>
+        <location filename="../mainwindow.cpp" line="2055"/>
+        <location filename="../mainwindow.cpp" line="2078"/>
+        <location filename="../mainwindow.cpp" line="2084"/>
+        <location filename="../mainwindow.cpp" line="2091"/>
+        <location filename="../mainwindow.cpp" line="2098"/>
+        <location filename="../mainwindow.cpp" line="2102"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="332"/>
         <location filename="../mainwindow.cpp" line="371"/>
-        <location filename="../mainwindow.cpp" line="2025"/>
-        <location filename="../mainwindow.cpp" line="2033"/>
-        <location filename="../mainwindow.cpp" line="2069"/>
+        <location filename="../mainwindow.cpp" line="2047"/>
+        <location filename="../mainwindow.cpp" line="2055"/>
+        <location filename="../mainwindow.cpp" line="2091"/>
         <source>Error opening file %1:
 %2.</source>
         <translation>Erreur à l&apos;ouverture du fichier %1:
@@ -2219,44 +2219,34 @@ Are you sure ?</source>
     <message>
         <location filename="../mainwindow.cpp" line="386"/>
         <source>Compilation server termporary failure, try later</source>
-        <translation>Erreur temporaire du serveur de compilation</translation>
+        <translation>Erreur temporaire du serveur de compilation, veuillez réessayer plus tard</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="175"/>
         <source>Display previous message again at startup ?</source>
         <translation>Afficher les alertes précédentes lors du prochain démarrage ?</translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="344"/>
-        <source>Firmware does not longer fit in the radio, due to selected firmware options</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="347"/>
         <source>Compilation server temporary failure, try later</source>
-        <translation>Erreur temporaire du serveur de compilation</translation>
+        <translation>Erreur temporaire du serveur de compilation, veuillez réessayer plus tard</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="350"/>
         <location filename="../mainwindow.cpp" line="389"/>
         <source>Compilation server too busy, try later</source>
-        <translation>Serveur de compilation trop occupé</translation>
+        <translation>Serveur de compilation trop occupé, veuillez réessayer plus tard</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="356"/>
         <location filename="../mainwindow.cpp" line="395"/>
         <source>Unknown server failure, try later</source>
-        <translation>Erreur inconnue du serveur de compilation</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="383"/>
-        <source>Firmware does not fit in the radio, due to selected firmware options</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur inconnue du serveur de compilation, veuillez réessayer plus tard</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="422"/>
         <source>Do you want to write the firmware to the radio now ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Voulez vous transférer le firmware à la radio maintenant?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="475"/>
@@ -2274,13 +2264,13 @@ Are you sure ?</source>
         <location filename="../mainwindow.cpp" line="478"/>
         <location filename="../mainwindow.cpp" line="507"/>
         <source>Release Notes</source>
-        <translation>Release Notes</translation>
+        <translation>Notes de version</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="486"/>
         <location filename="../mainwindow.cpp" line="516"/>
         <source>Do you want to download release %1 now ?</source>
-        <translation>Voulez-vous télécharger la release %1 ?</translation>
+        <translation>Voulez-vous télécharger la version %1  maintenant?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="541"/>
@@ -2305,343 +2295,368 @@ Are you sure ?</source>
 %2.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1071"/>
-        <location filename="../mainwindow.cpp" line="1324"/>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1093"/>
+        <location filename="../mainwindow.cpp" line="1346"/>
+        <location filename="../mainwindow.cpp" line="1400"/>
         <source>Backup is impossible</source>
         <translation>Sauvegarde impossible</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1071"/>
-        <location filename="../mainwindow.cpp" line="1324"/>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1093"/>
+        <location filename="../mainwindow.cpp" line="1346"/>
+        <location filename="../mainwindow.cpp" line="1400"/>
         <source>The backup dir set in preferences does not exist</source>
         <translation>Le dossier de sauvegarde configuré dans les préférences n&apos;existe pas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1121"/>
-        <location filename="../mainwindow.cpp" line="1124"/>
+        <location filename="../mainwindow.cpp" line="1143"/>
+        <location filename="../mainwindow.cpp" line="1146"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1352"/>
+        <location filename="../mainwindow.cpp" line="1374"/>
         <source>Conversion failed</source>
         <translation>La conversion a échoué</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1362"/>
+        <location filename="../mainwindow.cpp" line="1384"/>
         <source>Restore failed</source>
         <translation>Erreur lors de la restauration</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1370"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>Backup failed</source>
         <translation>Erreur lors de la sauvegarde</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1632"/>
+        <source>Open File...</source>
+        <translation type="obsolete">Ouvrir...</translation>
+    </message>
+    <message>
+        <source>Save File</source>
+        <translation type="obsolete">Enregistrer</translation>
+    </message>
+    <message>
+        <source>Save File As...</source>
+        <translation type="obsolete">Enregistrer sous...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1654"/>
         <source>Load backup from file</source>
         <translation>Charger une sauvegarde à partir du fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1639"/>
+        <location filename="../mainwindow.cpp" line="1661"/>
         <source>Compare models</source>
         <translation>Comparer les modèles</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1642"/>
+        <location filename="../mainwindow.cpp" line="1664"/>
         <source>Show fuses dialog</source>
         <translation>Afficher les réglages des fusibles</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1604"/>
+        <location filename="../mainwindow.cpp" line="1626"/>
         <source>A monochrome black icon theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Thème avec icônes monochromes noires</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1605"/>
+        <location filename="../mainwindow.cpp" line="1614"/>
+        <source>New</source>
+        <translation>Nouveau</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1615"/>
+        <source>Open...</source>
+        <translation>Ouvrir...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1620"/>
+        <source>Copy Model</source>
+        <translation>Copier le modèle</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1627"/>
         <source>A monochrome white icon theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Thème avec icônes monochromes blanches</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1606"/>
+        <location filename="../mainwindow.cpp" line="1628"/>
         <source>A monochrome blue icon theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Thème avec icônes monochromes bleues</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1609"/>
+        <location filename="../mainwindow.cpp" line="1631"/>
         <source>Small</source>
-        <translation type="unfinished"></translation>
+        <translation>Petites</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1609"/>
+        <location filename="../mainwindow.cpp" line="1631"/>
         <source>Use small toolbar icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Petites icônes de barre d&apos;outils</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1610"/>
+        <location filename="../mainwindow.cpp" line="1632"/>
         <source>Use normal size toolbar icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Icônes de barre d&apos;outils normales</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1610"/>
+        <location filename="../mainwindow.cpp" line="1632"/>
         <source>Normal</source>
-        <translation type="unfinished">Normal</translation>
+        <translation>Normales</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1611"/>
+        <location filename="../mainwindow.cpp" line="1633"/>
         <source>Use big toolbar icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Grosses icônes de barre d&apos;outils</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1611"/>
+        <location filename="../mainwindow.cpp" line="1633"/>
         <source>Big</source>
-        <translation type="unfinished"></translation>
+        <translation>Grandes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1612"/>
+        <location filename="../mainwindow.cpp" line="1634"/>
         <source>Use huge toolbar icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Immenses icônes de barre d&apos;outils</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1612"/>
+        <location filename="../mainwindow.cpp" line="1634"/>
         <source>Huge</source>
-        <translation type="unfinished"></translation>
+        <translation>Immenses</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1616"/>
+        <location filename="../mainwindow.cpp" line="1638"/>
         <source>Czech</source>
-        <translation type="unfinished">Tchèque</translation>
+        <translation>Tchèque</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1616"/>
+        <location filename="../mainwindow.cpp" line="1638"/>
         <source>Use Czech in menus</source>
-        <translation type="unfinished"></translation>
+        <translation>Menus en Tchèque</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1617"/>
+        <location filename="../mainwindow.cpp" line="1639"/>
         <source>German</source>
-        <translation type="unfinished">Allemand</translation>
+        <translation>Allemand</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1617"/>
+        <location filename="../mainwindow.cpp" line="1639"/>
         <source>Use German in menus</source>
-        <translation type="unfinished"></translation>
+        <translation>Menus en Allemand</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1618"/>
+        <location filename="../mainwindow.cpp" line="1640"/>
         <source>English</source>
-        <translation type="unfinished">Anglais</translation>
+        <translation>Anglais</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1618"/>
+        <location filename="../mainwindow.cpp" line="1640"/>
         <source>Use English in menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1620"/>
-        <source>French</source>
-        <translation type="unfinished">Français</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1620"/>
-        <source>Use French in menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1621"/>
-        <source>Italian</source>
-        <translation type="unfinished">Italien</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1621"/>
-        <source>Use Italian in menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1622"/>
-        <source>Hebrew</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1622"/>
-        <source>Use Hebrew in menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1623"/>
-        <source>Polish</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1623"/>
-        <source>Use Polish in menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1624"/>
-        <source>Portuguese</source>
-        <translation type="unfinished">Portugais</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1624"/>
-        <source>Use Portuguese in menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1625"/>
-        <source>Swedish</source>
-        <translation type="unfinished">Suédois</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1625"/>
-        <source>Use Swedish in menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1626"/>
-        <source>Russian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1626"/>
-        <source>Use Russian in menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1641"/>
-        <source>List programmers...</source>
-        <translation type="unfinished"></translation>
+        <translation>Menus en Anglais</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1642"/>
-        <source>Fuses...</source>
-        <translation type="unfinished"></translation>
+        <source>French</source>
+        <translation>Français</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1642"/>
+        <source>Use French in menus</source>
+        <translation>Menus en Français</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1643"/>
-        <source>Read Firmware from Radio</source>
-        <translation type="unfinished"></translation>
+        <source>Italian</source>
+        <translation>Italien</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1643"/>
-        <source>Read firmware from Radio</source>
-        <translation type="unfinished"></translation>
+        <source>Use Italian in menus</source>
+        <translation>Menus en Italien</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1644"/>
-        <source>Write Firmware to Radio</source>
-        <translation type="unfinished"></translation>
+        <source>Hebrew</source>
+        <translation type="obsolete">Hébreu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1644"/>
-        <source>Write firmware to Radio</source>
-        <translation type="unfinished"></translation>
+        <source>Use Hebrew in menus</source>
+        <translation type="obsolete">Menus en Hébreu</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1645"/>
-        <source>Add Radio Profile</source>
-        <translation type="unfinished"></translation>
+        <source>Polish</source>
+        <translation>Polonais</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1645"/>
-        <source>Create a new Radio Setting Profile</source>
-        <translation type="unfinished"></translation>
+        <source>Use Polish in menus</source>
+        <translation>Menus en Polonais</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1646"/>
-        <source>Manuals and other Documents</source>
-        <translation type="unfinished"></translation>
+        <source>Portuguese</source>
+        <translation type="obsolete">Portugais</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1646"/>
-        <source>Open the OpenTX document page in a web browser</source>
-        <translation type="unfinished"></translation>
+        <source>Use Portuguese in menus</source>
+        <translation type="obsolete">Menus en Portuguais</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1647"/>
-        <source>Write Models and Settings To Radio</source>
-        <translation type="unfinished"></translation>
+        <source>Swedish</source>
+        <translation>Suédois</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1647"/>
-        <source>Write Models and Settings to Radio</source>
-        <translation type="unfinished"></translation>
+        <source>Use Swedish in menus</source>
+        <translation>Menus en Suédois</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1648"/>
-        <source>Read Models and Settings from Radio</source>
-        <translation type="unfinished"></translation>
+        <source>Russian</source>
+        <translation type="obsolete">Russe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1649"/>
-        <source>Configure Communications...</source>
-        <translation type="unfinished"></translation>
+        <source>Use Russian in menus</source>
+        <translation type="obsolete">Menus en Russe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1649"/>
-        <source>Configure software for communicating with the Radio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1650"/>
-        <source>Write Backup to Radio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1650"/>
-        <source>Write Backup from file to to Radio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1651"/>
-        <source>Backup Radio to File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1651"/>
-        <source>Save a complete backup file of all settings and model data in the Radio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1652"/>
-        <source>Contributors...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1652"/>
-        <source>A tribute to those who have contributed to OpenTX and Companion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1662"/>
-        <location filename="../mainwindow.cpp" line="1807"/>
-        <source>Recent Models+Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.cpp" line="1663"/>
+        <source>List programmers...</source>
+        <translation>Lister les programmateurs...</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1664"/>
-        <source>Set Icon Theme</source>
-        <translation type="unfinished"></translation>
+        <source>Fuses...</source>
+        <translation>Fusibles...</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1665"/>
-        <source>Set Icon Size</source>
-        <translation type="unfinished"></translation>
+        <source>Read Firmware from Radio</source>
+        <translation>Lire le firmware de la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1840"/>
+        <location filename="../mainwindow.cpp" line="1665"/>
+        <source>Read firmware from Radio</source>
+        <translation>Lire le firmware de la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1666"/>
+        <source>Write Firmware to Radio</source>
+        <translation>Transférer le firmware à la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1666"/>
+        <source>Write firmware to Radio</source>
+        <translation>Transférer le firmware à la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1667"/>
+        <source>Add Radio Profile</source>
+        <translation>Ajouter un profil de radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1667"/>
+        <source>Create a new Radio Setting Profile</source>
+        <translation>Créér un nouveau profil de radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1668"/>
+        <source>Manuals and other Documents</source>
+        <translation>Manuels et documents</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1668"/>
+        <source>Open the OpenTX document page in a web browser</source>
+        <translation>Ouvre la page de documentation d&apos;OpenTX dans un navigateur</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1669"/>
+        <source>Write Models and Settings To Radio</source>
+        <translation>Transférer les réglages et modèles à la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1669"/>
+        <source>Write Models and Settings to Radio</source>
+        <translation>Transférer les réglages et modèles à la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1670"/>
+        <source>Read Models and Settings from Radio</source>
+        <translation>Lire les réglages et modèles depuis la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1671"/>
+        <source>Configure Communications...</source>
+        <translation>Configurer les communications...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1671"/>
+        <source>Configure software for communicating with the Radio</source>
+        <translation>Configurer le programme gérant les communications avec la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1672"/>
+        <source>Write Backup to Radio</source>
+        <translation>Transférer une sauvegarde à la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1672"/>
+        <source>Write Backup from file to to Radio</source>
+        <translation>Transférer une sauvegarde à la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1673"/>
+        <source>Backup Radio to File</source>
+        <translation>Sauvegarder la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1673"/>
+        <source>Save a complete backup file of all settings and model data in the Radio</source>
+        <translation>Créer une copie de sauvegarde de tous les réglages et modèles de la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1674"/>
+        <source>Contributors...</source>
+        <translation>Contributeurs...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1674"/>
+        <source>A tribute to those who have contributed to OpenTX and Companion</source>
+        <translation>Remerciements à tout ceux qui ont contribué à OpenTX et Companion</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1684"/>
+        <source>Recent Files</source>
+        <translation>Fichiers récents</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1829"/>
+        <source>Recent Models+Settings</source>
+        <translation>Fichiers de réglages et modèles récents</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1686"/>
+        <source>Set Icon Theme</source>
+        <translation>Choisir le thème d&apos;icônes</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1687"/>
+        <source>Set Icon Size</source>
+        <translation>Choisir la taille des icônes</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1862"/>
         <source>Write</source>
         <translation>Ecrire</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2019"/>
+        <location filename="../mainwindow.cpp" line="2041"/>
         <source>Unable to find file %1!</source>
         <translation>Fichier %1 introuvable!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2076"/>
+        <location filename="../mainwindow.cpp" line="2098"/>
         <source>Error reading file %1:
 %2.</source>
         <translation>Fichier %1 corrompu:
@@ -2650,62 +2665,73 @@ Are you sure ?</source>
     <message>
         <location filename="../mainwindow.cpp" line="261"/>
         <source>A new version of Companion is available (version %1)&lt;br&gt;Would you like to download it?</source>
-        <translation type="unfinished"></translation>
+        <translation>Une nouvelle version de Companion est disponible (version %1)&lt;br&gt;Voulez-vous la télécharger?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="353"/>
         <location filename="../mainwindow.cpp" line="392"/>
         <source>Compilation server requires registration, please check OpenTX web site</source>
-        <translation type="unfinished"></translation>
+        <translation>Le serveur de compilation requiert l&apos;enregistrement, veuillez vous référer au site web d&apos;OpenTX</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1484"/>
+        <location filename="../mainwindow.cpp" line="1506"/>
         <source>OpenTX Home Page: &lt;a href=&apos;%1&apos;&gt;%1&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Page d&apos;accueil d&apos;OpenTX: &lt;a href=&apos;%1&apos;&gt;%1&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1486"/>
+        <location filename="../mainwindow.cpp" line="1508"/>
         <source>The OpenTX Companion project was originally forked from &lt;a href=&apos;%2&apos;&gt;eePe&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Le projet OpenTX Companion a été créé à partir d&apos;&lt;a href=&apos;%2&apos;&gt;eePe&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1488"/>
+        <location filename="../mainwindow.cpp" line="1510"/>
         <source>If you&apos;ve found this program useful, please support by &lt;a href=&apos;%1&apos;&gt;donating&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Si vous trouvez ce programme utile, merci de le supporter par une &lt;a href=&apos;%1&apos;&gt;donation&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1490"/>
+        <location filename="../mainwindow.cpp" line="1512"/>
         <source>Version %1, %3</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1864"/>
+        <location filename="../mainwindow.cpp" line="1846"/>
+        <source>Show the list of radio profiles</source>
+        <translation>Voir la liste des profils de radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1886"/>
         <source>Ready</source>
         <translation>Prêt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1629"/>
+        <location filename="../mainwindow.cpp" line="1651"/>
         <source>Show the application&apos;s About box</source>
         <translation>Afficher la fenêtre &quot;A propos&quot; de l&apos;application</translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="280"/>
-        <source>A new release of Companion is available please check the OpenTX website!</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="150"/>
         <location filename="../mainwindow.cpp" line="658"/>
         <location filename="../mainwindow.cpp" line="689"/>
-        <location filename="../mainwindow.cpp" line="2112"/>
+        <location filename="../mainwindow.cpp" line="2134"/>
         <source>File loaded</source>
         <translation>Fichier chargé</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="280"/>
+        <source>A new release of Companion is available, please check the OpenTX website!</source>
+        <translation>Une nouvelle version de companion est disponible, veuillez vous référer au site web d&apos;OpenTX!</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="344"/>
+        <location filename="../mainwindow.cpp" line="383"/>
+        <source>Not enough memory for all the selected firmware options</source>
+        <translation>Pas assez de mémoire disponible pour toutes les options sélectionnées</translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="646"/>
-        <location filename="../mainwindow.cpp" line="1593"/>
+        <location filename="../mainwindow.cpp" line="1615"/>
         <source>Open Models and Settings file</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir un fichier de réglages et modèles</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="667"/>
@@ -2714,332 +2740,315 @@ Are you sure ?</source>
         <translation>Fichier sauvegardé</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1034"/>
-        <location filename="../mainwindow.cpp" line="1041"/>
-        <location filename="../mainwindow.cpp" line="1426"/>
-        <location filename="../mainwindow.cpp" line="1648"/>
+        <location filename="../mainwindow.cpp" line="1056"/>
+        <location filename="../mainwindow.cpp" line="1063"/>
+        <location filename="../mainwindow.cpp" line="1448"/>
+        <location filename="../mainwindow.cpp" line="1670"/>
         <source>Read Models and Settings From Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Lire les réglages et modèles depuis la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1061"/>
+        <location filename="../mainwindow.cpp" line="1083"/>
         <source>Write Radio Backup from %1 to the radio?</source>
-        <translation type="unfinished"></translation>
+        <translation>Transférer la sauvegarde %1 à la radio?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1091"/>
-        <location filename="../mainwindow.cpp" line="1098"/>
-        <location filename="../mainwindow.cpp" line="1143"/>
-        <location filename="../mainwindow.cpp" line="1152"/>
-        <location filename="../mainwindow.cpp" line="1337"/>
-        <location filename="../mainwindow.cpp" line="1386"/>
+        <location filename="../mainwindow.cpp" line="1113"/>
+        <location filename="../mainwindow.cpp" line="1120"/>
+        <location filename="../mainwindow.cpp" line="1165"/>
+        <location filename="../mainwindow.cpp" line="1174"/>
+        <location filename="../mainwindow.cpp" line="1359"/>
+        <location filename="../mainwindow.cpp" line="1408"/>
         <source>Backup Models and Settings From Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauvegarder les réglages et modèles depuis la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1121"/>
+        <location filename="../mainwindow.cpp" line="1143"/>
         <source>The radio firmware belongs to another product family, check file and preferences!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce firmware ne correspond pas à la radio sélectionnée, vérifiez le fichier et les préférences!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1124"/>
+        <location filename="../mainwindow.cpp" line="1146"/>
         <source>The radio firmware is outdated, please upgrade!</source>
-        <translation type="unfinished"></translation>
+        <translation>Le firmware de la radio est obsolète, veuillez mettre à jour!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1170"/>
+        <location filename="../mainwindow.cpp" line="1192"/>
         <source>Write Backup To Radio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1394"/>
-        <source>Write Firmware To Radio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1357"/>
-        <source>Restore Models and Settings To Radio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1362"/>
-        <source>Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Transférer une sauvegarde à la radio</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1366"/>
+        <location filename="../mainwindow.cpp" line="1416"/>
+        <source>Write Firmware To Radio</source>
+        <translation>Transférer le firmware à la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1379"/>
+        <source>Restore Models and Settings To Radio</source>
+        <translation>Restaurer les réglages et modèles depuis une sauvegarde</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1384"/>
+        <source>Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1</source>
+        <translation>Impossible de restaurer les réglages et modèles sur la radio. Le fichier peut être récupéré ici: %1</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1388"/>
         <source>Could not write firmware to radio. The models and settings data file can be found at: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de transférer le firmware à la radio. Le fichier peut être récupéré ici: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1370"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>Cannot backup existing Models and Settings from Radio. Firmware write process aborted</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de sauvegarder les réglages et modèles depuis la radio. Le processus est annulé</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1404"/>
+        <location filename="../mainwindow.cpp" line="1426"/>
         <source>Save Radio Backup to File</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauvegarder la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1417"/>
+        <location filename="../mainwindow.cpp" line="1439"/>
         <source>Read Radio Backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Lire une sauvegarde</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1436"/>
+        <location filename="../mainwindow.cpp" line="1458"/>
         <source>Read Radio Firmware to File</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauvegarder le firmware de la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1522"/>
+        <location filename="../mainwindow.cpp" line="1544"/>
         <source>OpenTX Companion - FW: %1 - Profile: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenTX Companion - FW: %1 - Profil: %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1592"/>
         <source>New Models+Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Nouveau fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1592"/>
+        <location filename="../mainwindow.cpp" line="1614"/>
         <source>Create a new Models and Settings file</source>
-        <translation type="unfinished"></translation>
+        <translation>Créer un nouveau fichier de réglages et modèles</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1593"/>
-        <source>Open Models+Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>New File</source>
+        <translation type="obsolete">Nouveau fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1594"/>
-        <source>Save Models+Settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1594"/>
-        <location filename="../mainwindow.cpp" line="1595"/>
+        <location filename="../mainwindow.cpp" line="1616"/>
+        <location filename="../mainwindow.cpp" line="1617"/>
         <source>Save Models and Settings file</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer le fichier de réglages et modèles</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1595"/>
-        <source>Save Models+Settings as...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../mainwindow.cpp" line="1616"/>
+        <source>Save</source>
+        <translation>Enregistrer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1596"/>
+        <location filename="../mainwindow.cpp" line="1617"/>
+        <source>Save As...</source>
+        <translation>Enregistrer sous...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1618"/>
         <source>Exit the application</source>
         <translation>Quitter l&apos;application</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1596"/>
+        <location filename="../mainwindow.cpp" line="1618"/>
         <source>Exit</source>
-        <translation type="unfinished"></translation>
+        <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1597"/>
+        <location filename="../mainwindow.cpp" line="1619"/>
         <source>Cut Model</source>
-        <translation type="unfinished"></translation>
+        <translation>Couper le modèle</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1597"/>
+        <location filename="../mainwindow.cpp" line="1619"/>
         <source>Cut current model to the clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Couper le modèle courant dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1598"/>
-        <source>Copy Model...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1598"/>
+        <location filename="../mainwindow.cpp" line="1620"/>
         <source>Copy current model to the clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier le modèle courant dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1599"/>
-        <source>Paste Model...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1599"/>
+        <location filename="../mainwindow.cpp" line="1621"/>
         <source>Paste model from clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Coller le modèle depuis le presse-papier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1602"/>
+        <location filename="../mainwindow.cpp" line="1621"/>
+        <source>Paste Model</source>
+        <translation>Coller le modèle</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1624"/>
         <source>Classical</source>
-        <translation type="unfinished"></translation>
+        <translation>Classique</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1602"/>
+        <location filename="../mainwindow.cpp" line="1624"/>
         <source>The classic companion9x icon theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Thème d&apos;icônes classique de companion</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1603"/>
+        <location filename="../mainwindow.cpp" line="1625"/>
         <source>Yerico</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1603"/>
+        <location filename="../mainwindow.cpp" line="1625"/>
         <source>Yellow round honey sweet icon theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Thème d&apos;icônes rondes jaunes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1604"/>
+        <location filename="../mainwindow.cpp" line="1626"/>
         <source>Monochrome</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1605"/>
+        <location filename="../mainwindow.cpp" line="1627"/>
         <source>MonoWhite</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1606"/>
+        <location filename="../mainwindow.cpp" line="1628"/>
         <source>MonoBlue</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1615"/>
+        <location filename="../mainwindow.cpp" line="1637"/>
         <source>System language</source>
-        <translation type="unfinished"></translation>
+        <translation>Langue du système</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1615"/>
+        <location filename="../mainwindow.cpp" line="1637"/>
         <source>Use system language in menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1619"/>
-        <source>Finnish</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1619"/>
-        <source>Use Finnish in menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1627"/>
-        <source>Dutch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1627"/>
-        <source>Use Dutch in menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1629"/>
-        <source>About...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1630"/>
-        <source>Print...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1630"/>
-        <source>Print current model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1631"/>
-        <source>Simulate...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1631"/>
-        <source>Simulate current model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1632"/>
-        <source>Load Backup...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1633"/>
-        <source>View Log File...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1633"/>
-        <source>Open and view log file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1634"/>
-        <source>Settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1634"/>
-        <source>Edit Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1635"/>
-        <source>Download...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1635"/>
-        <source>Download firmware and voice files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1636"/>
-        <source>Check for Updates...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1636"/>
-        <source>Check OpenTX and Companion updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1637"/>
-        <source>Companion Changes...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1637"/>
-        <source>Show Companion change log</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1638"/>
-        <source>Firmware Changes...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1638"/>
-        <source>Show firmware change log</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1639"/>
-        <source>Compare Models...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1640"/>
-        <source>Edit Radio Splash Image...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1640"/>
-        <source>Edit the splash image of your Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser la langue système dans les menus</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1641"/>
+        <source>Finnish</source>
+        <translation>Finlandais</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1641"/>
+        <source>Use Finnish in menus</source>
+        <translation>Menus en Finlandais</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1651"/>
+        <source>About...</source>
+        <translation>A propos...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1652"/>
+        <source>Print...</source>
+        <translation>Imprimer...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1652"/>
+        <source>Print current model</source>
+        <translation>Imprimer le modèle courant</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1653"/>
+        <source>Simulate...</source>
+        <translation>Simuler...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1653"/>
+        <source>Simulate current model</source>
+        <translation>Simuler le modèle courant</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1654"/>
+        <source>Load Backup...</source>
+        <translation>Ouvrir la sauvegarde...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1655"/>
+        <source>View Log File...</source>
+        <translation>Ouvrir un log...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1655"/>
+        <source>Open and view log file</source>
+        <translation>Ouvrir et visualiser un log</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1656"/>
+        <source>Settings...</source>
+        <translation>Préférences...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1656"/>
+        <source>Edit Settings</source>
+        <translation>Modifier les réglages</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1657"/>
+        <source>Download...</source>
+        <translation>Télécharger...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1657"/>
+        <source>Download firmware and voice files</source>
+        <translation>Télécharger firmware et fichiers son</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1658"/>
+        <source>Check for Updates...</source>
+        <translation>Vérifier les mises à jour...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1658"/>
+        <source>Check OpenTX and Companion updates</source>
+        <translation>Vérifier les mises à jour d&apos;OpenTX et companion</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1659"/>
+        <source>Companion Changes...</source>
+        <translation>Changements de companion...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1659"/>
+        <source>Show Companion change log</source>
+        <translation>Voir l&apos;historique des changements de companion</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1660"/>
+        <source>Firmware Changes...</source>
+        <translation>Changements du firmware...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1660"/>
+        <source>Show firmware change log</source>
+        <translation>Voir l&apos;historique des changements du firmware</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1661"/>
+        <source>Compare Models...</source>
+        <translation>Comparer 2 modèles...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1662"/>
+        <source>Edit Radio Splash Image...</source>
+        <translation>Modifier l&apos;écran d&apos;accueil de la radio...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1662"/>
+        <source>Edit the splash image of your Radio</source>
+        <translation>Modifier l&apos;écran d&apos;accueil de la radio</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1663"/>
         <source>List available programmers</source>
         <translation>Lister les programmateurs supportés</translation>
     </message>
@@ -3085,9 +3094,9 @@ Do you want to download it now ?</source>
 Voulez vous la télécharger maintenant ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1492"/>
+        <location filename="../mainwindow.cpp" line="1514"/>
         <source>Copyright</source>
-        <translation>Copyright</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="533"/>
@@ -3095,8 +3104,8 @@ Voulez vous la télécharger maintenant ?</translation>
         <translation>Ignorer cette version (r%1)?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1741"/>
-        <location filename="../mainwindow.cpp" line="1855"/>
+        <location filename="../mainwindow.cpp" line="1763"/>
+        <location filename="../mainwindow.cpp" line="1877"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
@@ -3117,98 +3126,93 @@ Voulez-vous la télécharger maintenant ?</translation>
     <message>
         <location filename="../mainwindow.cpp" line="603"/>
         <source>The selected language will be used the next time you start Companion.</source>
-        <translation type="unfinished"></translation>
+        <translation>La langue sélectionnée sera utilisée lors du prochain lancement de companion.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="605"/>
         <location filename="../mainwindow.cpp" line="616"/>
         <location filename="../mainwindow.cpp" line="627"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="614"/>
         <source>The new theme will be loaded the next time you start Companion.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le nouveau thème sera utilisé lors du prochain lancement de companion.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="625"/>
         <source>The icon size will be used the next time you start Companion.</source>
-        <translation type="unfinished"></translation>
+        <translation>La nouvelle taille d&apos;icônes sera utilisée lors du prochain lancement de companion.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1064"/>
+        <location filename="../mainwindow.cpp" line="1086"/>
         <source>The file %1
 has not been recognized as a valid Models and Settings file
 Write anyway ?</source>
         <translation>Le fichier %1 
-n&apos;a pas été reconnu comme un fichier de réglage et modèles valide.
+n&apos;a pas été reconnu comme un fichier de réglages et modèles valide.
 Ecrire quand même?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1114"/>
+        <location filename="../mainwindow.cpp" line="1136"/>
         <source>Cannot check Models and Settings compatibility! Continue anyway?</source>
         <translation>Impossible de vérifier la compatibilité des réglages et modèles. Continuer quand même?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1352"/>
+        <location filename="../mainwindow.cpp" line="1374"/>
         <source>Cannot convert Models and Settings for use with this firmware, original data will be used</source>
         <translation>Impossible de convertir les réglages et modèles pour ce firmware, les données originales vont être utilisées</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1366"/>
+        <location filename="../mainwindow.cpp" line="1388"/>
         <source>Firmware write failed</source>
-        <translation>L&apos;écriture du firmware a échoué.</translation>
+        <translation>L&apos;écriture du firmware a échoué</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1495"/>
+        <location filename="../mainwindow.cpp" line="1517"/>
         <source>About Companion</source>
-        <translation type="unfinished"></translation>
+        <translation>A propos de companion</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1663"/>
+        <location filename="../mainwindow.cpp" line="1685"/>
         <source>Set Menu Language</source>
-        <translation type="unfinished"></translation>
+        <translation>Choisir la langue des menus</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1691"/>
+        <location filename="../mainwindow.cpp" line="1713"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1724"/>
+        <location filename="../mainwindow.cpp" line="1746"/>
         <source>Read/Write</source>
-        <translation type="unfinished"></translation>
+        <translation>Transfert</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1764"/>
-        <location filename="../mainwindow.cpp" line="1823"/>
+        <location filename="../mainwindow.cpp" line="1786"/>
+        <location filename="../mainwindow.cpp" line="1845"/>
         <source>Radio Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil de radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1808"/>
+        <location filename="../mainwindow.cpp" line="1830"/>
         <source>Show recent Models+Settings documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Voir les fichiers récents</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1824"/>
-        <source>Show a selection list of radio profiles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1977"/>
+        <location filename="../mainwindow.cpp" line="1999"/>
         <source>%2</source>
-        <translation type="unfinished">%1s {2?}</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2056"/>
-        <location filename="../mainwindow.cpp" line="2062"/>
+        <location filename="../mainwindow.cpp" line="2078"/>
+        <location filename="../mainwindow.cpp" line="2084"/>
         <source>Invalid Models and Settings File %1</source>
         <translation>Fichier de réglages et modèles invalide: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2080"/>
+        <location filename="../mainwindow.cpp" line="2102"/>
         <source>Invalid binary Models and Settings File %1</source>
         <translation>Fichier binaire de réglages et modèles invalide: %1</translation>
     </message>
@@ -3307,7 +3311,7 @@ Ecrire quand même?</translation>
     <message>
         <location filename="../mdichild.cpp" line="479"/>
         <source>Companion</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="283"/>
@@ -3335,17 +3339,17 @@ Ecrire quand même?</translation>
         <location filename="../mdichild.cpp" line="565"/>
         <location filename="../mdichild.cpp" line="616"/>
         <source>Backup EEPROM From Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauvegarder l&apos;EEPROM de la radio</translation>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="635"/>
         <source>Write EEPROM To Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Transférer l&apos;EEPROM à la radio</translation>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="685"/>
         <source>Open backup Models and Settings file</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir la sauvegarde de réglages et modèles</translation>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="582"/>
@@ -3361,12 +3365,12 @@ Ecrire quand même?</translation>
     <message>
         <location filename="../mdichild.cpp" line="589"/>
         <source>Firmware in radio is of a different family of eeprom written, check file and preferences!</source>
-        <translation>Le firmware de la radio n&apos;est pas compatible avec la version de l&apos;EEPROM à flasher, vérifier le fichier et les préférences!</translation>
+        <translation>Le firmware de la radio n&apos;est pas compatible avec la version de l&apos;EEPROM à transférer, vérifier le fichier et les préférences!</translation>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="592"/>
         <source>Firmware in flash is outdated, please upgrade!</source>
-        <translation>Le firmware de la radio est dépassé, veuillez mettre à jour!</translation>
+        <translation>Le firmware de la radio est obsolète, veuillez mettre à jour!</translation>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="720"/>
@@ -3497,7 +3501,7 @@ Si activée, signale par des bips que le mixage est actif.</translation>
     <message>
         <location filename="../modeledit/mixerdialog.ui" line="369"/>
         <source>Source</source>
-        <translation>Maître</translation>
+        <translation>Source</translation>
     </message>
     <message>
         <location filename="../modeledit/mixerdialog.ui" line="411"/>
@@ -3618,212 +3622,167 @@ p, li { white-space: pre-wrap; }
         <source>Include DR/Expo</source>
         <translation>Inclure DR/Expo</translation>
     </message>
-    <message>
-        <location filename="../modeledit/mixerdialog.ui" line="207"/>
-        <source>0</source>
-        <translation>0</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixerdialog.ui" line="217"/>
-        <source>1</source>
-        <translation>1</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixerdialog.ui" line="227"/>
-        <source>2</source>
-        <translation>2</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixerdialog.ui" line="237"/>
-        <source>3</source>
-        <translation>3</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixerdialog.ui" line="247"/>
-        <source>4</source>
-        <translation>4</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixerdialog.ui" line="257"/>
-        <source>5</source>
-        <translation>5</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixerdialog.ui" line="267"/>
-        <source>6</source>
-        <translation>6</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixerdialog.ui" line="277"/>
-        <source>7</source>
-        <translation>7</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixerdialog.ui" line="287"/>
-        <source>8</source>
-        <translation>8</translation>
-    </message>
 </context>
 <context>
     <name>MixesPanel</name>
     <message>
         <location filename="../modeledit/mixes.cpp" line="16"/>
-        <location filename="../modeledit/mixes.cpp" line="412"/>
+        <location filename="../modeledit/mixes.cpp" line="411"/>
         <source>Move Up</source>
-        <translation type="unfinished">Monter</translation>
+        <translation>Monter</translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="18"/>
-        <location filename="../modeledit/mixes.cpp" line="412"/>
+        <location filename="../modeledit/mixes.cpp" line="411"/>
         <source>Ctrl+Up</source>
-        <translation type="unfinished">Ctrl+Haut</translation>
+        <translation>Ctrl+Haut</translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="19"/>
-        <location filename="../modeledit/mixes.cpp" line="413"/>
+        <location filename="../modeledit/mixes.cpp" line="412"/>
         <source>Move Down</source>
-        <translation type="unfinished">Descendre</translation>
+        <translation>Descendre</translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="21"/>
-        <location filename="../modeledit/mixes.cpp" line="413"/>
+        <location filename="../modeledit/mixes.cpp" line="412"/>
         <source>Ctrl+Down</source>
-        <translation type="unfinished">Ctrl+Bas</translation>
+        <translation>Ctrl+Bas</translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="22"/>
         <source>Clear Mixes</source>
-        <translation type="unfinished">Effacer les mixages</translation>
+        <translation>Effacer les mixages</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="108"/>
+        <location filename="../modeledit/mixes.cpp" line="107"/>
         <source>Weight(%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ratio(%1)</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="114"/>
+        <location filename="../modeledit/mixes.cpp" line="113"/>
         <source>Switch(%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Inter(%1)</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="118"/>
+        <location filename="../modeledit/mixes.cpp" line="117"/>
         <source>No Trim</source>
-        <translation type="unfinished">Pas de Trim</translation>
+        <translation>Pas de Trim</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/mixes.cpp" line="123"/>
+        <source>No DR/Expo</source>
+        <translation>Pas d&apos;expo/DR</translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="124"/>
-        <source>No DR/Expo</source>
-        <translation type="unfinished">Pas d&apos;expo/DR</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixes.cpp" line="125"/>
         <source>Offset(%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Décalage(%1)</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="132"/>
+        <location filename="../modeledit/mixes.cpp" line="131"/>
         <source> Delay(u%1:d%2)</source>
-        <translation type="unfinished"> Délai(u%1:d%2)</translation>
+        <translation> Délai(h%1:b%2)</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/mixes.cpp" line="133"/>
+        <source> Slow(u%1:d%2)</source>
+        <translation> Ralenti(h%1:b%2)</translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="134"/>
-        <source> Slow(u%1:d%2)</source>
-        <translation type="unfinished"> Ralentissement(u%1:d%2)</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixes.cpp" line="135"/>
         <source> Warn(%1)</source>
-        <translation type="unfinished"> Alerte(%1)</translation>
+        <translation> Alerte(%1)</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="166"/>
+        <location filename="../modeledit/mixes.cpp" line="165"/>
         <source>Not enough available mixers!</source>
-        <translation type="unfinished">Plus de mixages disponibles !</translation>
+        <translation>Plus de mixages disponibles !</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="272"/>
+        <location filename="../modeledit/mixes.cpp" line="271"/>
         <source>Delete Selected Mixes?</source>
-        <translation type="unfinished">Supprimer mixages sélectionnés ?</translation>
+        <translation>Supprimer mixages sélectionnés ?</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="403"/>
+        <location filename="../modeledit/mixes.cpp" line="402"/>
         <source>&amp;Add</source>
-        <translation type="unfinished">&amp;Ajouter</translation>
+        <translation>&amp;Ajouter</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/mixes.cpp" line="402"/>
+        <source>Ctrl+A</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="403"/>
-        <source>Ctrl+A</source>
-        <translation type="unfinished">Ctrl+A</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixes.cpp" line="404"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">Éditio&amp;n</translation>
+        <translation>Éditio&amp;n</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="404"/>
+        <location filename="../modeledit/mixes.cpp" line="403"/>
         <source>Enter</source>
-        <translation type="unfinished">Entrée</translation>
+        <translation>Entrée</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="406"/>
+        <location filename="../modeledit/mixes.cpp" line="405"/>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Supprimer</translation>
+        <translation>&amp;Supprimer</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/mixes.cpp" line="405"/>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="406"/>
-        <source>Delete</source>
-        <translation type="unfinished">Supprimer</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixes.cpp" line="407"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copier</translation>
+        <translation>&amp;Copier</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/mixes.cpp" line="406"/>
+        <source>Ctrl+C</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="407"/>
-        <source>Ctrl+C</source>
-        <translation type="unfinished">Ctrl+C</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixes.cpp" line="408"/>
         <source>&amp;Cut</source>
-        <translation type="unfinished">C&amp;ouper</translation>
+        <translation>C&amp;ouper</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/mixes.cpp" line="407"/>
+        <source>Ctrl+X</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="408"/>
-        <source>Ctrl+X</source>
-        <translation type="unfinished">Ctrl+X</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixes.cpp" line="409"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">Co&amp;ller</translation>
+        <translation>Co&amp;ller</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/mixes.cpp" line="408"/>
+        <source>Ctrl+V</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="409"/>
-        <source>Ctrl+V</source>
-        <translation type="unfinished">Ctrl+V</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixes.cpp" line="410"/>
         <source>Du&amp;plicate</source>
-        <translation type="unfinished">Du&amp;pliquer</translation>
+        <translation>Du&amp;pliquer</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="410"/>
+        <location filename="../modeledit/mixes.cpp" line="409"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished">Ctrl+U</translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="496"/>
+        <location filename="../modeledit/mixes.cpp" line="498"/>
         <source>Clear Mixes?</source>
-        <translation type="unfinished">Effacer les mixages ?</translation>
+        <translation>Effacer tous les mixages ?</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="496"/>
+        <location filename="../modeledit/mixes.cpp" line="498"/>
         <source>Really clear all the mixes?</source>
-        <translation type="unfinished">Êtes-vous sûr de vraiment vouloir effacer tous les mixages ?</translation>
+        <translation>Êtes-vous sûr de vraiment vouloir effacer tous les mixages ?</translation>
     </message>
 </context>
 <context>
@@ -3836,12 +3795,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modeledit/modeledit.cpp" line="30"/>
         <source>Heli</source>
-        <translation type="unfinished"></translation>
+        <translation>Réglages hélico</translation>
     </message>
     <message>
         <location filename="../modeledit/modeledit.cpp" line="32"/>
         <source>Inputs</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrées</translation>
     </message>
     <message>
         <location filename="../modeledit/modeledit.cpp" line="33"/>
@@ -3851,12 +3810,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modeledit/modeledit.cpp" line="35"/>
         <source>Servos</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/modeledit.cpp" line="37"/>
         <source>Logical Switches</source>
-        <translation type="unfinished"></translation>
+        <translation>Inters logiques</translation>
     </message>
     <message>
         <location filename="../modeledit/modeledit.cpp" line="29"/>
@@ -3874,12 +3833,12 @@ p, li { white-space: pre-wrap; }
         <translation>Dialogue</translation>
     </message>
     <message>
-        <location filename="../modeledit/curves.cpp" line="594"/>
+        <location filename="../modeledit/curves.cpp" line="561"/>
         <source>Clear Curves?</source>
         <translation>Effacer les courbes ?</translation>
     </message>
     <message>
-        <location filename="../modeledit/curves.cpp" line="594"/>
+        <location filename="../modeledit/curves.cpp" line="561"/>
         <source>Really clear all the curves?</source>
         <translation>Êtes-vous sûr de vraiment vouloir effacer toutes les courbes ?</translation>
     </message>
@@ -3891,7 +3850,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modeledit/modeledit.cpp" line="39"/>
         <source>Special Functions</source>
-        <translation type="unfinished"></translation>
+        <translation>Fonctions spéciales</translation>
     </message>
     <message>
         <location filename="../modeledit/modeledit.cpp" line="41"/>
@@ -3902,29 +3861,29 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ModelSelectionPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="239"/>
+        <location filename="../wizarddialog.cpp" line="240"/>
         <source>Plane</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.cpp" line="241"/>
-        <source>Multirotor</source>
-        <translation type="unfinished"></translation>
+        <translation>Avion</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="242"/>
+        <source>Multirotor</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Helicopter</source>
-        <translation type="unfinished">Hélicoptère</translation>
+        <translation>Hélicoptère</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="248"/>
+        <location filename="../wizarddialog.cpp" line="249"/>
         <source>Model Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom du modèle:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="251"/>
+        <location filename="../wizarddialog.cpp" line="252"/>
         <source>Model Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Type de modèle:</translation>
     </message>
 </context>
 <context>
@@ -3962,7 +3921,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modelslist.cpp" line="93"/>
         <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modelslist.cpp" line="94"/>
@@ -3972,7 +3931,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modelslist.cpp" line="94"/>
         <source>Ctrl+X</source>
-        <translation>Ctrl+X</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modelslist.cpp" line="95"/>
@@ -3982,7 +3941,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modelslist.cpp" line="95"/>
         <source>Ctrl+V</source>
-        <translation>Ctrl+V</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modelslist.cpp" line="96"/>
@@ -3992,7 +3951,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modelslist.cpp" line="96"/>
         <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modelslist.cpp" line="98"/>
@@ -4007,7 +3966,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modelslist.cpp" line="102"/>
         <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modelslist.cpp" line="102"/>
@@ -4038,7 +3997,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modelslist.cpp" line="452"/>
         <source>Do you want to overwrite radio general settings?</source>
-        <translation type="unfinished"></translation>
+        <translation>Voulez-vous vraiment écraser les paramètres généraux?</translation>
     </message>
     <message>
         <location filename="../modelslist.cpp" line="463"/>
@@ -4054,126 +4013,119 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modelslist.cpp" line="100"/>
         <source>Alt+R</source>
-        <translation>Alt+R</translation>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>Module</name>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/setup_module.ui" line="134"/>
+        <location filename="../modeledit/setup_module.ui" line="137"/>
         <source>Failsafe Mode</source>
-        <translation type="unfinished">Mode Failsafe</translation>
+        <translation>Mode Failsafe</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="150"/>
+        <location filename="../modeledit/setup_module.ui" line="153"/>
         <source>Start</source>
-        <translation type="unfinished">1er canal</translation>
+        <translation>1er canal</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="176"/>
+        <location filename="../modeledit/setup_module.ui" line="179"/>
         <source>PPM delay</source>
-        <translation type="unfinished">Délai PPM</translation>
+        <translation>Impulsion</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="195"/>
-        <source> usec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/setup_module.ui" line="227"/>
+        <location filename="../modeledit/setup_module.ui" line="230"/>
         <source>Negative</source>
-        <translation type="unfinished">Négative</translation>
+        <translation>Négative</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="232"/>
+        <location filename="../modeledit/setup_module.ui" line="235"/>
         <source>Positive</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="253"/>
+        <location filename="../modeledit/setup_module.ui" line="256"/>
         <source>Master</source>
-        <translation type="unfinished">Maître</translation>
+        <translation>Maître</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="258"/>
+        <location filename="../modeledit/setup_module.ui" line="261"/>
         <source>Slave</source>
-        <translation type="unfinished">Elève</translation>
+        <translation>Elève</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="272"/>
+        <location filename="../modeledit/setup_module.ui" line="275"/>
         <source>Polarity</source>
-        <translation type="unfinished">Polarité</translation>
+        <translation>Polarité</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="288"/>
+        <location filename="../modeledit/setup_module.ui" line="291"/>
         <source>Trainer Mode</source>
-        <translation type="unfinished">Mode écolage</translation>
+        <translation>Mode écolage</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="310"/>
         <source> mSec</source>
-        <translation type="unfinished">ms</translation>
+        <translation type="obsolete"> ms</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="366"/>
+        <location filename="../modeledit/setup_module.ui" line="369"/>
         <source>PPM Frame Length</source>
-        <translation type="unfinished">Longueur de trame PPM</translation>
+        <translation>Longueur de trame PPM</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="45"/>
-        <source>Label</source>
-        <translation type="unfinished"></translation>
+        <location filename="../modeledit/setup_module.ui" line="91"/>
+        <source>CH </source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="88"/>
-        <location filename="../modeledit/setup_module.ui" line="341"/>
-        <source>ch</source>
-        <translation type="unfinished"></translation>
+        <location filename="../modeledit/setup_module.ui" line="198"/>
+        <source> us</source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="388"/>
+        <location filename="../modeledit/setup_module.ui" line="313"/>
+        <source> ms</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../modeledit/setup_module.ui" line="391"/>
         <source>Channels</source>
-        <translation type="unfinished">Voies</translation>
+        <translation>Nb de canaux</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="411"/>
+        <location filename="../modeledit/setup_module.ui" line="414"/>
         <source>Hold</source>
-        <translation type="unfinished">Maintien</translation>
+        <translation>Maintien</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="416"/>
+        <location filename="../modeledit/setup_module.ui" line="419"/>
         <source>Custom</source>
-        <translation type="unfinished">Prédéfini</translation>
+        <translation>Prédéfini</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="421"/>
+        <location filename="../modeledit/setup_module.ui" line="424"/>
         <source>No Pulses</source>
-        <translation type="unfinished">Pas d&apos;impulsions</translation>
+        <translation>Pas d&apos;impulsions</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="426"/>
+        <location filename="../modeledit/setup_module.ui" line="429"/>
         <source>Receiver</source>
-        <translation type="unfinished"></translation>
+        <translation>Récepteur</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="440"/>
+        <location filename="../modeledit/setup_module.ui" line="443"/>
         <source>Failsafe Positions</source>
-        <translation type="unfinished"></translation>
+        <translation>Positions</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="456"/>
+        <location filename="../modeledit/setup_module.ui" line="459"/>
         <source>Protocol</source>
-        <translation type="unfinished">Codage</translation>
+        <translation>Protocole</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="529"/>
+        <location filename="../modeledit/setup_module.ui" line="532"/>
         <source>Receiver No.</source>
-        <translation type="unfinished"></translation>
+        <translation>No de récepteur</translation>
     </message>
 </context>
 <context>
@@ -4181,45 +4133,45 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modeledit/setup.cpp" line="109"/>
         <source>Trainer Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Port écolage</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.cpp" line="117"/>
         <source>Internal Radio System</source>
-        <translation type="unfinished"></translation>
+        <translation>Module HF interne</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.cpp" line="119"/>
         <source>External Radio Module</source>
-        <translation type="unfinished"></translation>
+        <translation>Module HF externe</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.cpp" line="122"/>
         <source>Radio System</source>
-        <translation type="unfinished"></translation>
+        <translation>Module HF</translation>
     </message>
 </context>
 <context>
     <name>MultirotorPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="808"/>
-        <source>Trottle Channel:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../wizarddialog.cpp" line="809"/>
+        <source>Throttle Channel:</source>
+        <translation>Canal des gaz:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="810"/>
+        <location filename="../wizarddialog.cpp" line="811"/>
         <source>Yaw Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal du lacet:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="812"/>
+        <location filename="../wizarddialog.cpp" line="813"/>
         <source>Pitch Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal du tangage:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="814"/>
+        <location filename="../wizarddialog.cpp" line="815"/>
         <source>Roll Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal du roulis:</translation>
     </message>
 </context>
 <context>
@@ -4239,7 +4191,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../helpers.cpp" line="89"/>
         <source>Polish</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Polonais</translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="50"/>
@@ -4283,535 +4235,545 @@ p, li { white-space: pre-wrap; }
         <translation>Enc Rot E</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="674"/>
+        <location filename="../eeprominterface.cpp" line="697"/>
         <source>Safety %1</source>
         <translation>Sécurité %1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="676"/>
+        <location filename="../eeprominterface.cpp" line="699"/>
         <source>Trainer</source>
         <translation>Ecolage</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="678"/>
+        <location filename="../eeprominterface.cpp" line="701"/>
         <source>Trainer RUD</source>
         <translation>Ecolage Direction</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="680"/>
+        <location filename="../eeprominterface.cpp" line="703"/>
         <source>Trainer ELE</source>
         <translation>Ecolage Profondeur</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="682"/>
+        <location filename="../eeprominterface.cpp" line="705"/>
         <source>Trainer THR</source>
         <translation>Ecolage Gaz</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="684"/>
+        <location filename="../eeprominterface.cpp" line="707"/>
         <source>Trainer AIL</source>
         <translation>Ecolage Ailerons</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="686"/>
+        <location filename="../eeprominterface.cpp" line="709"/>
         <source>Instant Trim</source>
         <translation>Trims instantanés</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="688"/>
+        <location filename="../eeprominterface.cpp" line="711"/>
         <source>Play Sound</source>
         <translation>Jouer Son</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="704"/>
+        <location filename="../eeprominterface.cpp" line="727"/>
         <source>Start Logs</source>
         <translation>Démarrer les Logs</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="690"/>
+        <location filename="../eeprominterface.cpp" line="713"/>
         <source>Play Haptic</source>
         <translation>Vibreur</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="216"/>
+        <location filename="../eeprominterface.cpp" line="239"/>
         <location filename="../modeledit/setup.cpp" line="558"/>
         <source>S3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="238"/>
+        <location filename="../eeprominterface.cpp" line="261"/>
         <source>RSSI Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="238"/>
+        <location filename="../eeprominterface.cpp" line="261"/>
         <source>RSSI Rx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="238"/>
+        <location filename="../eeprominterface.cpp" line="261"/>
         <source>Rx Batt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="239"/>
+        <location filename="../eeprominterface.cpp" line="262"/>
         <source>A3</source>
         <translation type="unfinished">A3</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="239"/>
+        <location filename="../eeprominterface.cpp" line="262"/>
         <source>A4</source>
         <translation type="unfinished">A4</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="242"/>
+        <location filename="../eeprominterface.cpp" line="265"/>
         <source>Cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="244"/>
-        <source>ASpd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../eeprominterface.cpp" line="244"/>
+        <location filename="../eeprominterface.cpp" line="267"/>
         <source>dTE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="245"/>
+        <location filename="../eeprominterface.cpp" line="267"/>
+        <source>Hdg </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../eeprominterface.cpp" line="267"/>
+        <source>AirSpeed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../eeprominterface.cpp" line="268"/>
         <source>A3-</source>
         <translation type="unfinished">A3-</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="245"/>
+        <location filename="../eeprominterface.cpp" line="268"/>
         <source>A4-</source>
         <translation type="unfinished">A4-</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="246"/>
+        <location filename="../eeprominterface.cpp" line="269"/>
         <source>Speed+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="246"/>
+        <location filename="../eeprominterface.cpp" line="269"/>
         <source>Dist+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="247"/>
+        <location filename="../eeprominterface.cpp" line="269"/>
+        <source>AirSpeed+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../eeprominterface.cpp" line="270"/>
         <source>Cell-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="247"/>
+        <location filename="../eeprominterface.cpp" line="270"/>
         <source>Cells-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="247"/>
+        <location filename="../eeprominterface.cpp" line="270"/>
         <source>Vfas-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="247"/>
+        <location filename="../eeprominterface.cpp" line="270"/>
         <source>Curr+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="247"/>
+        <location filename="../eeprominterface.cpp" line="270"/>
         <source>Powr+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="248"/>
+        <location filename="../eeprominterface.cpp" line="271"/>
         <source>ACC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="252"/>
-        <location filename="../eeprominterface.cpp" line="332"/>
+        <location filename="../eeprominterface.cpp" line="275"/>
+        <location filename="../eeprominterface.cpp" line="355"/>
         <source>L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="252"/>
-        <location filename="../eeprominterface.cpp" line="332"/>
+        <location filename="../eeprominterface.cpp" line="275"/>
+        <location filename="../eeprominterface.cpp" line="355"/>
         <source>L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="252"/>
-        <location filename="../eeprominterface.cpp" line="332"/>
+        <location filename="../eeprominterface.cpp" line="275"/>
+        <location filename="../eeprominterface.cpp" line="355"/>
         <source>L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="252"/>
-        <location filename="../eeprominterface.cpp" line="332"/>
+        <location filename="../eeprominterface.cpp" line="275"/>
+        <location filename="../eeprominterface.cpp" line="355"/>
         <source>L4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="252"/>
-        <location filename="../eeprominterface.cpp" line="332"/>
+        <location filename="../eeprominterface.cpp" line="275"/>
+        <location filename="../eeprominterface.cpp" line="355"/>
         <source>L5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="252"/>
-        <location filename="../eeprominterface.cpp" line="332"/>
+        <location filename="../eeprominterface.cpp" line="275"/>
+        <location filename="../eeprominterface.cpp" line="355"/>
         <source>L6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="252"/>
-        <location filename="../eeprominterface.cpp" line="332"/>
+        <location filename="../eeprominterface.cpp" line="275"/>
+        <location filename="../eeprominterface.cpp" line="355"/>
         <source>L7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="252"/>
-        <location filename="../eeprominterface.cpp" line="332"/>
+        <location filename="../eeprominterface.cpp" line="275"/>
+        <location filename="../eeprominterface.cpp" line="355"/>
         <source>L8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="252"/>
-        <location filename="../eeprominterface.cpp" line="332"/>
+        <location filename="../eeprominterface.cpp" line="275"/>
+        <location filename="../eeprominterface.cpp" line="355"/>
         <source>L9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="252"/>
-        <location filename="../eeprominterface.cpp" line="332"/>
+        <location filename="../eeprominterface.cpp" line="275"/>
+        <location filename="../eeprominterface.cpp" line="355"/>
         <source>L10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="253"/>
-        <location filename="../eeprominterface.cpp" line="333"/>
+        <location filename="../eeprominterface.cpp" line="276"/>
+        <location filename="../eeprominterface.cpp" line="356"/>
         <source>L11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="253"/>
-        <location filename="../eeprominterface.cpp" line="333"/>
+        <location filename="../eeprominterface.cpp" line="276"/>
+        <location filename="../eeprominterface.cpp" line="356"/>
         <source>L12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="253"/>
-        <location filename="../eeprominterface.cpp" line="333"/>
+        <location filename="../eeprominterface.cpp" line="276"/>
+        <location filename="../eeprominterface.cpp" line="356"/>
         <source>L13</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="253"/>
-        <location filename="../eeprominterface.cpp" line="333"/>
+        <location filename="../eeprominterface.cpp" line="276"/>
+        <location filename="../eeprominterface.cpp" line="356"/>
         <source>L14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="253"/>
-        <location filename="../eeprominterface.cpp" line="333"/>
+        <location filename="../eeprominterface.cpp" line="276"/>
+        <location filename="../eeprominterface.cpp" line="356"/>
         <source>L15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="253"/>
-        <location filename="../eeprominterface.cpp" line="333"/>
+        <location filename="../eeprominterface.cpp" line="276"/>
+        <location filename="../eeprominterface.cpp" line="356"/>
         <source>L16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="253"/>
-        <location filename="../eeprominterface.cpp" line="333"/>
+        <location filename="../eeprominterface.cpp" line="276"/>
+        <location filename="../eeprominterface.cpp" line="356"/>
         <source>L17</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="253"/>
-        <location filename="../eeprominterface.cpp" line="333"/>
+        <location filename="../eeprominterface.cpp" line="276"/>
+        <location filename="../eeprominterface.cpp" line="356"/>
         <source>L18</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="253"/>
-        <location filename="../eeprominterface.cpp" line="333"/>
+        <location filename="../eeprominterface.cpp" line="276"/>
+        <location filename="../eeprominterface.cpp" line="356"/>
         <source>L19</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="253"/>
-        <location filename="../eeprominterface.cpp" line="333"/>
+        <location filename="../eeprominterface.cpp" line="276"/>
+        <location filename="../eeprominterface.cpp" line="356"/>
         <source>L20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="254"/>
-        <location filename="../eeprominterface.cpp" line="334"/>
+        <location filename="../eeprominterface.cpp" line="277"/>
+        <location filename="../eeprominterface.cpp" line="357"/>
         <source>L21</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="254"/>
-        <location filename="../eeprominterface.cpp" line="334"/>
+        <location filename="../eeprominterface.cpp" line="277"/>
+        <location filename="../eeprominterface.cpp" line="357"/>
         <source>L22</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="254"/>
-        <location filename="../eeprominterface.cpp" line="334"/>
+        <location filename="../eeprominterface.cpp" line="277"/>
+        <location filename="../eeprominterface.cpp" line="357"/>
         <source>L23</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="254"/>
-        <location filename="../eeprominterface.cpp" line="334"/>
+        <location filename="../eeprominterface.cpp" line="277"/>
+        <location filename="../eeprominterface.cpp" line="357"/>
         <source>L24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="254"/>
-        <location filename="../eeprominterface.cpp" line="334"/>
+        <location filename="../eeprominterface.cpp" line="277"/>
+        <location filename="../eeprominterface.cpp" line="357"/>
         <source>L25</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="254"/>
-        <location filename="../eeprominterface.cpp" line="334"/>
+        <location filename="../eeprominterface.cpp" line="277"/>
+        <location filename="../eeprominterface.cpp" line="357"/>
         <source>L26</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="254"/>
-        <location filename="../eeprominterface.cpp" line="334"/>
+        <location filename="../eeprominterface.cpp" line="277"/>
+        <location filename="../eeprominterface.cpp" line="357"/>
         <source>L27</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="254"/>
-        <location filename="../eeprominterface.cpp" line="334"/>
+        <location filename="../eeprominterface.cpp" line="277"/>
+        <location filename="../eeprominterface.cpp" line="357"/>
         <source>L28</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="254"/>
-        <location filename="../eeprominterface.cpp" line="334"/>
+        <location filename="../eeprominterface.cpp" line="277"/>
+        <location filename="../eeprominterface.cpp" line="357"/>
         <source>L29</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="254"/>
-        <location filename="../eeprominterface.cpp" line="334"/>
+        <location filename="../eeprominterface.cpp" line="277"/>
+        <location filename="../eeprominterface.cpp" line="357"/>
         <source>L30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="255"/>
-        <location filename="../eeprominterface.cpp" line="335"/>
+        <location filename="../eeprominterface.cpp" line="278"/>
+        <location filename="../eeprominterface.cpp" line="358"/>
         <source>L31</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="255"/>
-        <location filename="../eeprominterface.cpp" line="335"/>
+        <location filename="../eeprominterface.cpp" line="278"/>
+        <location filename="../eeprominterface.cpp" line="358"/>
         <source>L32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="264"/>
+        <location filename="../eeprominterface.cpp" line="287"/>
         <source>[I%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="285"/>
+        <location filename="../eeprominterface.cpp" line="308"/>
         <source>TR%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="341"/>
+        <location filename="../eeprominterface.cpp" line="364"/>
         <source>S31</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="341"/>
+        <location filename="../eeprominterface.cpp" line="364"/>
         <source>S32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="341"/>
+        <location filename="../eeprominterface.cpp" line="364"/>
         <source>S33</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="341"/>
+        <location filename="../eeprominterface.cpp" line="364"/>
         <source>S34</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="341"/>
+        <location filename="../eeprominterface.cpp" line="364"/>
         <source>S35</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="341"/>
+        <location filename="../eeprominterface.cpp" line="364"/>
         <source>S36</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="433"/>
+        <location filename="../eeprominterface.cpp" line="456"/>
         <source>a&gt;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="435"/>
+        <location filename="../eeprominterface.cpp" line="458"/>
         <source>a&lt;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="437"/>
+        <location filename="../eeprominterface.cpp" line="460"/>
         <source>|a|&gt;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="439"/>
+        <location filename="../eeprominterface.cpp" line="462"/>
         <source>|a|&lt;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="441"/>
+        <location filename="../eeprominterface.cpp" line="464"/>
         <source>AND</source>
         <translation type="unfinished">ET</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="443"/>
+        <location filename="../eeprominterface.cpp" line="466"/>
         <source>OR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="445"/>
+        <location filename="../eeprominterface.cpp" line="468"/>
         <source>XOR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="447"/>
+        <location filename="../eeprominterface.cpp" line="470"/>
         <source>a=b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="449"/>
+        <location filename="../eeprominterface.cpp" line="472"/>
         <source>a!=b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="451"/>
+        <location filename="../eeprominterface.cpp" line="474"/>
         <source>a&gt;b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="453"/>
+        <location filename="../eeprominterface.cpp" line="476"/>
         <source>a&lt;b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="455"/>
+        <location filename="../eeprominterface.cpp" line="478"/>
         <source>a&gt;=b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="457"/>
+        <location filename="../eeprominterface.cpp" line="480"/>
         <source>a&lt;=b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="459"/>
+        <location filename="../eeprominterface.cpp" line="482"/>
         <source>d&gt;=x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="461"/>
+        <location filename="../eeprominterface.cpp" line="484"/>
         <source>|d|&gt;=x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="463"/>
+        <location filename="../eeprominterface.cpp" line="486"/>
         <source>a=x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="465"/>
+        <location filename="../eeprominterface.cpp" line="488"/>
         <source>a~x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="467"/>
+        <location filename="../eeprominterface.cpp" line="490"/>
         <source>Timer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="469"/>
+        <location filename="../eeprominterface.cpp" line="492"/>
         <source>Sticky</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="473"/>
+        <location filename="../eeprominterface.cpp" line="496"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="489"/>
+        <location filename="../eeprominterface.cpp" line="512"/>
         <source>STAY(%1, [%2:%3])</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="492"/>
+        <location filename="../eeprominterface.cpp" line="515"/>
         <source>STICKY(%1, %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="495"/>
+        <location filename="../eeprominterface.cpp" line="518"/>
         <source>TIMER(%1, %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="692"/>
+        <location filename="../eeprominterface.cpp" line="715"/>
         <source>Reset</source>
         <translation>Remise à zéro</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="694"/>
+        <location filename="../eeprominterface.cpp" line="717"/>
         <source>Set Timer %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="696"/>
+        <location filename="../eeprominterface.cpp" line="719"/>
         <source>Vario</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="706"/>
+        <location filename="../eeprominterface.cpp" line="729"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="702"/>
+        <location filename="../eeprominterface.cpp" line="725"/>
         <source>Play Value</source>
         <translation>Lire valeur</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="708"/>
+        <location filename="../eeprominterface.cpp" line="731"/>
         <source>Backlight</source>
         <translation>Rétroéclairage</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="698"/>
+        <location filename="../eeprominterface.cpp" line="721"/>
         <source>Play Track</source>
         <translation>Jouer fichier</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="431"/>
+        <location filename="../eeprominterface.cpp" line="454"/>
         <location filename="../helpers.cpp" line="79"/>
         <location filename="../helpers.cpp" line="767"/>
         <source>---</source>
@@ -4888,85 +4850,85 @@ p, li { white-space: pre-wrap; }
         <translation>Suédois</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="791"/>
+        <location filename="../eeprominterface.cpp" line="814"/>
         <location filename="../modeledit/customfunctions.cpp" line="23"/>
         <source>No repeat</source>
         <translation>Pas de rép.</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="795"/>
+        <location filename="../eeprominterface.cpp" line="818"/>
         <source>%1 sec</source>
         <translation>%1 sec</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="700"/>
+        <location filename="../eeprominterface.cpp" line="723"/>
         <source>Play Both</source>
         <translation>Jouer les 2</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="710"/>
+        <location filename="../eeprominterface.cpp" line="733"/>
         <source>Background Music</source>
         <translation>Musique de fond</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="712"/>
+        <location filename="../eeprominterface.cpp" line="735"/>
         <source>Background Music Pause</source>
         <translation>Pause musique de fond</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="576"/>
+        <location filename="../eeprominterface.cpp" line="599"/>
         <source> Delay %1 sec</source>
         <translation> Délai %1 sec</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="471"/>
+        <location filename="../eeprominterface.cpp" line="494"/>
         <source>Edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="578"/>
+        <location filename="../eeprominterface.cpp" line="601"/>
         <source> Duration %1 sec</source>
         <translation> Durée %1 sec</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="602"/>
-        <location filename="../eeprominterface.cpp" line="609"/>
-        <location filename="../eeprominterface.cpp" line="619"/>
-        <location filename="../eeprominterface.cpp" line="732"/>
-        <location filename="../eeprominterface.cpp" line="739"/>
-        <location filename="../eeprominterface.cpp" line="749"/>
+        <location filename="../eeprominterface.cpp" line="625"/>
+        <location filename="../eeprominterface.cpp" line="632"/>
+        <location filename="../eeprominterface.cpp" line="642"/>
+        <location filename="../eeprominterface.cpp" line="755"/>
+        <location filename="../eeprominterface.cpp" line="762"/>
+        <location filename="../eeprominterface.cpp" line="772"/>
         <source>&lt;font color=red&gt;&lt;b&gt;Inconsistent parameter&lt;/b&gt;&lt;/font&gt;</source>
         <translation>&lt;font color=red&gt;&lt;b&gt;Paramètre inconsistant&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="614"/>
-        <location filename="../eeprominterface.cpp" line="744"/>
-        <location filename="../modeledit/customfunctions.cpp" line="635"/>
+        <location filename="../eeprominterface.cpp" line="637"/>
+        <location filename="../eeprominterface.cpp" line="767"/>
+        <location filename="../modeledit/customfunctions.cpp" line="641"/>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="615"/>
-        <location filename="../eeprominterface.cpp" line="745"/>
-        <location filename="../modeledit/customfunctions.cpp" line="636"/>
+        <location filename="../eeprominterface.cpp" line="638"/>
+        <location filename="../eeprominterface.cpp" line="768"/>
+        <location filename="../modeledit/customfunctions.cpp" line="642"/>
         <source>Telemetry</source>
         <translation>Télémesure</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="635"/>
-        <location filename="../eeprominterface.cpp" line="765"/>
+        <location filename="../eeprominterface.cpp" line="658"/>
+        <location filename="../eeprominterface.cpp" line="788"/>
         <source>Value </source>
         <translation>Valeur </translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="645"/>
-        <location filename="../eeprominterface.cpp" line="775"/>
+        <location filename="../eeprominterface.cpp" line="668"/>
+        <location filename="../eeprominterface.cpp" line="798"/>
         <source>Decr:</source>
         <translation>Décr:</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="648"/>
-        <location filename="../eeprominterface.cpp" line="778"/>
+        <location filename="../eeprominterface.cpp" line="671"/>
+        <location filename="../eeprominterface.cpp" line="801"/>
         <source>Incr:</source>
         <translation>Incr:</translation>
     </message>
@@ -4981,22 +4943,22 @@ p, li { white-space: pre-wrap; }
         <translation>%1s</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="589"/>
+        <location filename="../modeledit/customfunctions.cpp" line="595"/>
         <source>Value</source>
         <translation>Valeur</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="590"/>
+        <location filename="../modeledit/customfunctions.cpp" line="596"/>
         <source>Source</source>
         <translation>Source</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="591"/>
+        <location filename="../modeledit/customfunctions.cpp" line="597"/>
         <source>GVAR</source>
         <translation>VG</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="592"/>
+        <location filename="../modeledit/customfunctions.cpp" line="598"/>
         <source>Increment</source>
         <translation>Incrément</translation>
     </message>
@@ -5037,25 +4999,25 @@ p, li { white-space: pre-wrap; }
         <translation>Touches + manches</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="83"/>
+        <location filename="../eeprominterface.cpp" line="87"/>
         <location filename="../helpers.cpp" line="504"/>
         <source>-GV%1</source>
         <translation>-VG%1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="714"/>
+        <location filename="../eeprominterface.cpp" line="737"/>
         <source>Adjust GV%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="639"/>
+        <location filename="../modeledit/customfunctions.cpp" line="645"/>
         <source>Rotary Encoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../helpers.cpp" line="89"/>
         <source>Finnish</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Finlandais</translation>
     </message>
     <message>
         <location filename="../helpers.cpp" line="753"/>
@@ -5179,16 +5141,16 @@ p, li { white-space: pre-wrap; }
         <translation>Ailerons</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="85"/>
-        <location filename="../eeprominterface.cpp" line="294"/>
+        <location filename="../eeprominterface.cpp" line="89"/>
+        <location filename="../eeprominterface.cpp" line="317"/>
         <location filename="../helpers.cpp" line="521"/>
         <source>GV%1</source>
         <translation>VG%1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="259"/>
-        <location filename="../eeprominterface.cpp" line="296"/>
-        <location filename="../eeprominterface.cpp" line="383"/>
+        <location filename="../eeprominterface.cpp" line="282"/>
+        <location filename="../eeprominterface.cpp" line="319"/>
+        <location filename="../eeprominterface.cpp" line="406"/>
         <location filename="../helpers.cpp" line="134"/>
         <source>----</source>
         <translation>----</translation>
@@ -5200,417 +5162,412 @@ p, li { white-space: pre-wrap; }
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="237"/>
+        <location filename="../eeprominterface.cpp" line="260"/>
         <source>Batt</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="238"/>
+        <location filename="../eeprominterface.cpp" line="261"/>
         <source>SWR</source>
         <translation>SWR</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="215"/>
+        <location filename="../eeprominterface.cpp" line="238"/>
         <location filename="../helpers.cpp" line="79"/>
         <location filename="../modeledit/setup.cpp" line="557"/>
         <source>P1</source>
         <translation>P1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="215"/>
+        <location filename="../eeprominterface.cpp" line="238"/>
         <location filename="../helpers.cpp" line="79"/>
         <location filename="../modeledit/setup.cpp" line="557"/>
         <source>P2</source>
         <translation>P2</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="215"/>
+        <location filename="../eeprominterface.cpp" line="238"/>
         <location filename="../helpers.cpp" line="79"/>
         <location filename="../modeledit/setup.cpp" line="557"/>
         <source>P3</source>
         <translation>P3</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="277"/>
+        <location filename="../eeprominterface.cpp" line="300"/>
         <source>MAX</source>
         <translation>MAX</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="339"/>
+        <location filename="../eeprominterface.cpp" line="362"/>
         <source>S11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="339"/>
+        <location filename="../eeprominterface.cpp" line="362"/>
         <source>S12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="339"/>
+        <location filename="../eeprominterface.cpp" line="362"/>
         <source>S13</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="339"/>
+        <location filename="../eeprominterface.cpp" line="362"/>
         <source>S14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="339"/>
+        <location filename="../eeprominterface.cpp" line="362"/>
         <source>S15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="339"/>
+        <location filename="../eeprominterface.cpp" line="362"/>
         <source>S16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="340"/>
+        <location filename="../eeprominterface.cpp" line="363"/>
         <source>S21</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="340"/>
+        <location filename="../eeprominterface.cpp" line="363"/>
         <source>S22</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="340"/>
+        <location filename="../eeprominterface.cpp" line="363"/>
         <source>S23</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="340"/>
+        <location filename="../eeprominterface.cpp" line="363"/>
         <source>S24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="340"/>
+        <location filename="../eeprominterface.cpp" line="363"/>
         <source>S25</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="340"/>
+        <location filename="../eeprominterface.cpp" line="363"/>
         <source>S26</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="345"/>
+        <location filename="../eeprominterface.cpp" line="368"/>
         <source>RudTrim Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="345"/>
+        <location filename="../eeprominterface.cpp" line="368"/>
         <source>RudTrim Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="346"/>
+        <location filename="../eeprominterface.cpp" line="369"/>
         <source>EleTrim Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="346"/>
+        <location filename="../eeprominterface.cpp" line="369"/>
         <source>EleTrim Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="347"/>
+        <location filename="../eeprominterface.cpp" line="370"/>
         <source>ThrTrim Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="347"/>
+        <location filename="../eeprominterface.cpp" line="370"/>
         <source>ThrTrim Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="348"/>
+        <location filename="../eeprominterface.cpp" line="371"/>
         <source>AilTrim Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="348"/>
+        <location filename="../eeprominterface.cpp" line="371"/>
         <source>AilTrim Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="356"/>
+        <location filename="../eeprominterface.cpp" line="379"/>
         <source>ABS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="357"/>
+        <location filename="../eeprominterface.cpp" line="380"/>
         <source>THs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="357"/>
+        <location filename="../eeprominterface.cpp" line="380"/>
         <source>TH%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="357"/>
+        <location filename="../eeprominterface.cpp" line="380"/>
         <source>THt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="387"/>
+        <location filename="../eeprominterface.cpp" line="410"/>
         <source>???</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="400"/>
+        <location filename="../eeprominterface.cpp" line="423"/>
         <source>Diff(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="402"/>
+        <location filename="../eeprominterface.cpp" line="425"/>
         <source>Expo(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="404"/>
+        <location filename="../eeprominterface.cpp" line="427"/>
         <source>Function(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="406"/>
+        <location filename="../eeprominterface.cpp" line="429"/>
         <source>Curve(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="406"/>
+        <location filename="../eeprominterface.cpp" line="429"/>
         <source>!Curve(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="214"/>
+        <location filename="../eeprominterface.cpp" line="237"/>
         <location filename="../helpers.cpp" line="79"/>
         <source>Rud</source>
         <translation>Dir</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="214"/>
+        <location filename="../eeprominterface.cpp" line="237"/>
         <location filename="../helpers.cpp" line="79"/>
         <source>Ele</source>
         <translation>Prf</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="214"/>
+        <location filename="../eeprominterface.cpp" line="237"/>
         <location filename="../helpers.cpp" line="79"/>
         <source>Thr</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="214"/>
+        <location filename="../eeprominterface.cpp" line="237"/>
         <location filename="../helpers.cpp" line="79"/>
         <source>Ail</source>
         <translation>Ail</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="233"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
         <source>TrmR</source>
         <translation>TrmD</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="233"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
         <source>TrmE</source>
         <translation>TrmP</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="233"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
         <source>TrmT</source>
         <translation>TrmG</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="233"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
         <source>TrmA</source>
         <translation>TrmA</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="216"/>
+        <location filename="../eeprominterface.cpp" line="239"/>
         <location filename="../modeledit/setup.cpp" line="558"/>
         <source>S1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="216"/>
+        <location filename="../eeprominterface.cpp" line="239"/>
         <location filename="../modeledit/setup.cpp" line="558"/>
         <source>S2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="216"/>
+        <location filename="../eeprominterface.cpp" line="239"/>
         <location filename="../modeledit/setup.cpp" line="558"/>
         <source>LS</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="216"/>
+        <location filename="../eeprominterface.cpp" line="239"/>
         <location filename="../modeledit/setup.cpp" line="558"/>
         <source>RS</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="226"/>
-        <location filename="../eeprominterface.cpp" line="352"/>
-        <location filename="../modeledit/customfunctions.cpp" line="642"/>
+        <location filename="../eeprominterface.cpp" line="249"/>
+        <location filename="../eeprominterface.cpp" line="375"/>
+        <location filename="../modeledit/customfunctions.cpp" line="648"/>
         <source>REa</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="226"/>
-        <location filename="../eeprominterface.cpp" line="352"/>
-        <location filename="../modeledit/customfunctions.cpp" line="643"/>
+        <location filename="../eeprominterface.cpp" line="249"/>
+        <location filename="../eeprominterface.cpp" line="375"/>
+        <location filename="../modeledit/customfunctions.cpp" line="649"/>
         <source>REb</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="240"/>
+        <location filename="../eeprominterface.cpp" line="263"/>
         <source>Alt</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="240"/>
+        <location filename="../eeprominterface.cpp" line="263"/>
         <source>Rpm</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="240"/>
+        <location filename="../eeprominterface.cpp" line="263"/>
         <source>Fuel</source>
         <translation>Carb</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="241"/>
+        <location filename="../eeprominterface.cpp" line="264"/>
         <source>Speed</source>
         <translation>Vitesse</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="241"/>
+        <location filename="../eeprominterface.cpp" line="264"/>
         <source>Dist</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="241"/>
+        <location filename="../eeprominterface.cpp" line="264"/>
         <source>GPS Alt</source>
         <translation>Alt GPS</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="242"/>
+        <location filename="../eeprominterface.cpp" line="265"/>
         <source>Cell</source>
         <translation>Elem</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="242"/>
+        <location filename="../eeprominterface.cpp" line="265"/>
         <source>Vfas</source>
         <translation>Vfas</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="242"/>
+        <location filename="../eeprominterface.cpp" line="265"/>
         <source>Curr</source>
         <translation>Cour</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="242"/>
+        <location filename="../eeprominterface.cpp" line="265"/>
         <source>Cnsp</source>
         <translation>Cnsm</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="242"/>
+        <location filename="../eeprominterface.cpp" line="265"/>
         <source>Powr</source>
         <translation>Puis</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="243"/>
+        <location filename="../eeprominterface.cpp" line="266"/>
         <source>AccX</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="243"/>
+        <location filename="../eeprominterface.cpp" line="266"/>
         <source>AccY</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="243"/>
+        <location filename="../eeprominterface.cpp" line="266"/>
         <source>AccZ</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="244"/>
-        <source>HDG </source>
-        <translation>Cap</translation>
-    </message>
-    <message>
-        <location filename="../eeprominterface.cpp" line="244"/>
+        <location filename="../eeprominterface.cpp" line="267"/>
         <source>VSpd</source>
         <translation>VitV</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="245"/>
+        <location filename="../eeprominterface.cpp" line="268"/>
         <source>A1-</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="245"/>
+        <location filename="../eeprominterface.cpp" line="268"/>
         <source>A2-</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="246"/>
+        <location filename="../eeprominterface.cpp" line="269"/>
         <source>Alt-</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="246"/>
+        <location filename="../eeprominterface.cpp" line="269"/>
         <source>Alt+</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="246"/>
+        <location filename="../eeprominterface.cpp" line="269"/>
         <source>Rpm+</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="246"/>
+        <location filename="../eeprominterface.cpp" line="269"/>
         <source>T1+</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="246"/>
+        <location filename="../eeprominterface.cpp" line="269"/>
         <source>T2+</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="248"/>
+        <location filename="../eeprominterface.cpp" line="271"/>
         <source>Time</source>
         <translation>Temps</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="283"/>
+        <location filename="../eeprominterface.cpp" line="306"/>
         <source>CYC%1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="288"/>
+        <location filename="../eeprominterface.cpp" line="311"/>
         <source>CH%1%2</source>
         <translation>VOIE%1%2</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="290"/>
+        <location filename="../eeprominterface.cpp" line="313"/>
         <source>X%1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="379"/>
+        <location filename="../eeprominterface.cpp" line="402"/>
         <location filename="../helpers.cpp" line="352"/>
         <source>ON</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="356"/>
-        <location filename="../eeprominterface.cpp" line="381"/>
+        <location filename="../eeprominterface.cpp" line="379"/>
+        <location filename="../eeprominterface.cpp" line="404"/>
         <location filename="../helpers.cpp" line="352"/>
         <source>OFF</source>
         <translation></translation>
@@ -6028,38 +5985,38 @@ p, li { white-space: pre-wrap; }
         <translation>Activer le menu hélico et les mixages CCPM</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="237"/>
-        <location filename="../eeprominterface.cpp" line="612"/>
-        <location filename="../eeprominterface.cpp" line="742"/>
-        <location filename="../modeledit/customfunctions.cpp" line="633"/>
+        <location filename="../eeprominterface.cpp" line="260"/>
+        <location filename="../eeprominterface.cpp" line="635"/>
+        <location filename="../eeprominterface.cpp" line="765"/>
+        <location filename="../modeledit/customfunctions.cpp" line="639"/>
         <source>Timer1</source>
         <translation>Chrono1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="237"/>
-        <location filename="../eeprominterface.cpp" line="613"/>
-        <location filename="../eeprominterface.cpp" line="743"/>
-        <location filename="../modeledit/customfunctions.cpp" line="634"/>
+        <location filename="../eeprominterface.cpp" line="260"/>
+        <location filename="../eeprominterface.cpp" line="636"/>
+        <location filename="../eeprominterface.cpp" line="766"/>
+        <location filename="../modeledit/customfunctions.cpp" line="640"/>
         <source>Timer2</source>
         <translation>Chrono 2</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="239"/>
+        <location filename="../eeprominterface.cpp" line="262"/>
         <source>A1</source>
         <translation>A1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="239"/>
+        <location filename="../eeprominterface.cpp" line="262"/>
         <source>A2</source>
         <translation>A2</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="240"/>
+        <location filename="../eeprominterface.cpp" line="263"/>
         <source>T1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="240"/>
+        <location filename="../eeprominterface.cpp" line="263"/>
         <source>T2</source>
         <translation></translation>
     </message>
@@ -6096,26 +6053,26 @@ p, li { white-space: pre-wrap; }
         <translation>th9x ne supporte pas d&apos;encodeurs rotatifs sur cette carte</translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1186"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1210"/>
         <source>OpenTX only accepts %1 points in all curves</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1690"/>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1886"/>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1893"/>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1897"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1714"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1910"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1917"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1921"/>
         <source>OpenTX on this board doesn&apos;t accept this function</source>
         <translation>openTx ne supporte pas cette fonction sur cette carte</translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="2301"/>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="2405"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="2325"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="2429"/>
         <source>OpenTX doesn&apos;t accept this protocol</source>
         <translation>openTx ne supporte pas ce protocole</translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="2308"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="2332"/>
         <source>OpenTX doesn&apos;t allow this number of channels</source>
         <translation>openTx ne supporte pas ce nombre de canaux</translation>
     </message>
@@ -6166,143 +6123,142 @@ The OpenTX/Companion Team.</source>
 </context>
 <context>
     <name>RudderPage</name>
-    <message>
-        <location filename="../wizarddialog.cpp" line="579"/>
-        <source>No</source>
-        <translation type="unfinished">Non</translation>
-    </message>
     <message>
         <location filename="../wizarddialog.cpp" line="580"/>
-        <source>Yes</source>
-        <translation type="unfinished">Oui</translation>
+        <source>No</source>
+        <translation>Non</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="589"/>
+        <location filename="../wizarddialog.cpp" line="581"/>
+        <source>Yes</source>
+        <translation>Oui</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="590"/>
         <source>&lt;br&gt;Rudder Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;Canal de dérive:</translation>
     </message>
 </context>
 <context>
     <name>Setup</name>
     <message>
-        <location filename="../modeledit/setup.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/setup.ui" line="156"/>
-        <source>Timer2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/setup.ui" line="172"/>
         <source>Timer1</source>
-        <translation type="unfinished">Chrono1</translation>
+        <translation type="obsolete">Chrono1</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="258"/>
         <source>Center beep</source>
-        <translation type="unfinished">Bip de centrage</translation>
+        <translation>Bip de centrage</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="452"/>
         <source>OFF</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="308"/>
         <source>Model Image</source>
-        <translation type="unfinished">Image du modèle</translation>
+        <translation>Image du modèle</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="110"/>
         <source>Exponential</source>
-        <translation type="unfinished">Exponentiel</translation>
+        <translation>Exponentiel</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="73"/>
         <source>Throttle Trim Idle Only</source>
-        <translation type="unfinished"></translation>
+        <translation>Trim ralenti uniquement</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="115"/>
         <source>Extra Fine</source>
-        <translation type="unfinished">Extra fin</translation>
+        <translation>Extra fin</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="120"/>
         <source>Fine</source>
-        <translation type="unfinished">Fin</translation>
+        <translation>Fin</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="125"/>
         <source>Medium</source>
-        <translation type="unfinished">Moyen</translation>
+        <translation>Moyen</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="130"/>
         <source>Coarse</source>
-        <translation type="unfinished">Grossier</translation>
+        <translation>Grossier</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="141"/>
         <source>Display Checklist</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher la checklist</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/setup.ui" line="156"/>
+        <source>Timer 2</source>
+        <translation>Chrono 2</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/setup.ui" line="172"/>
+        <source>Timer 1</source>
+        <translation>Chrono 1</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="190"/>
         <source>Timer Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Source chrono</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="206"/>
         <source>Trim Step</source>
-        <translation type="unfinished"></translation>
+        <translation>Pas des trims</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="388"/>
         <source>Warnings</source>
-        <translation type="unfinished"></translation>
+        <translation>Avertissements</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="402"/>
         <source>Switch Warnings</source>
-        <translation type="unfinished"></translation>
+        <translation>Positions des interrupteurs</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="442"/>
         <source>Pot Warnings</source>
-        <translation type="unfinished"></translation>
+        <translation>Positions des potentiomètres</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="457"/>
         <source>Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Manuel</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="462"/>
         <source>Auto</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="508"/>
         <source>Model</source>
-        <translation type="unfinished"></translation>
+        <translation>Modèle</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="43"/>
         <source>Extended Limits</source>
-        <translation type="unfinished">Débattements étendus</translation>
+        <translation>Débattements étendus</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="63"/>
         <source>Extended Trims</source>
-        <translation type="unfinished">Trims étendus</translation>
+        <translation>Trims étendus</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="83"/>
         <source>Throttle Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Alerte gaz</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="24"/>
@@ -6310,7 +6266,7 @@ The OpenTX/Companion Team.</source>
 If this is checked the throttle will be reversed.  Idle will be forward, trim will also be reversed and the throttle warning will be reversed as well.
 
 </source>
-        <translation type="unfinished">Inversion des gaz.
+        <translation>Inversion des gaz.
 Si cette option est cochée, la voie des gaz est inversée: le ralenti  est &apos;manche en haut&apos;. Le trim et l&apos;alerte des gaz sont inversés également.
 
 </translation>
@@ -6318,44 +6274,44 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti  est &apo
     <message>
         <location filename="../modeledit/setup.ui" line="33"/>
         <source>Reverse Throttle</source>
-        <translation type="unfinished"></translation>
+        <translation>Gaz inversés</translation>
     </message>
 </context>
 <context>
     <name>SimpleTailPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="667"/>
+        <location filename="../wizarddialog.cpp" line="668"/>
         <source>Elevator Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal de profondeur:</translation>
     </message>
 </context>
 <context>
     <name>SimulatorDialog</name>
     <message>
-        <location filename="../simulation/simulatordialog.cpp" line="227"/>
-        <location filename="../simulation/simulatordialog.cpp" line="249"/>
+        <location filename="../simulation/simulatordialog.cpp" line="303"/>
+        <location filename="../simulation/simulatordialog.cpp" line="325"/>
         <source>Warning</source>
-        <translation type="unfinished">Avertissement</translation>
+        <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog.cpp" line="227"/>
+        <location filename="../simulation/simulatordialog.cpp" line="303"/>
         <source>Joystick enabled but not configured correctly</source>
-        <translation type="unfinished">Joystick activé, mais non configuré</translation>
+        <translation>Joystick activé, mais non configuré</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog.cpp" line="249"/>
+        <location filename="../simulation/simulatordialog.cpp" line="325"/>
         <source>Cannot open joystick, joystick disabled</source>
-        <translation type="unfinished">Impossible d&apos;accéder au joystick. Joystick désactivé</translation>
+        <translation>Impossible d&apos;accéder au joystick. Joystick désactivé</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog.cpp" line="258"/>
+        <location filename="../simulation/simulatordialog.cpp" line="334"/>
         <source>Simulating Radio (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Simulation de la radio (%1)</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog.cpp" line="393"/>
+        <location filename="../simulation/simulatordialog.cpp" line="467"/>
         <source>Firmware %1 error: %2</source>
-        <translation type="unfinished">Firmware %1 erreur : %2</translation>
+        <translation>Firmware %1 erreur : %2</translation>
     </message>
 </context>
 <context>
@@ -6363,129 +6319,54 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti  est &apo
     <message>
         <location filename="../simulation/simulatordialog-9x.ui" line="26"/>
         <source>Companion Simulator</source>
-        <translation type="unfinished"></translation>
+        <translation>Simulateur companion</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="80"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="396"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="416"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="769"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="404"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="468"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="873"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="937"/>
         <source>Right Double Click to Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Double-clic droit pour réinitialiser</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="140"/>
-        <source>THR</source>
-        <translation type="unfinished">THR</translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="170"/>
-        <source>RUD</source>
-        <translation type="unfinished">RUD</translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="200"/>
-        <source>ELE</source>
-        <translation type="unfinished">ELE</translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="230"/>
-        <source>AIL</source>
-        <translation type="unfinished">AIL</translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="264"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="637"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="248"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="717"/>
         <source>Hold X</source>
-        <translation type="unfinished">Retenir X</translation>
+        <translation>Retenir X</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="294"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="667"/>
-        <source>Fix X</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="324"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="697"/>
-        <source>Fix Y</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="354"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="727"/>
-        <source>Hold Y</source>
-        <translation type="unfinished">Retenir Y</translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="374"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="384"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="278"/>
         <location filename="../simulation/simulatordialog-9x.ui" line="747"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="757"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <source>Fix X</source>
+        <translation>Blocage X</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="470"/>
-        <source>TRN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="497"/>
-        <source>GEA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="530"/>
-        <source>ID0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="567"/>
-        <source>ID1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="600"/>
-        <source>ID2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../simulation/simulatordialog-9x.ui" line="308"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="777"/>
+        <source>Fix Y</source>
+        <translation>Blocage Y</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="338"/>
         <location filename="../simulation/simulatordialog-9x.ui" line="807"/>
+        <source>Hold Y</source>
+        <translation>Retenir Y</translation>
+    </message>
+    <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="999"/>
         <source>BEEP</source>
-        <translation type="unfinished">BIP</translation>
+        <translation>BIP</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="845"/>
-        <source>P1</source>
-        <translation type="unfinished">P1</translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="867"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="927"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="984"/>
-        <source>0 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="902"/>
-        <source>P2</source>
-        <translation type="unfinished">P2</translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="962"/>
-        <source>P3</source>
-        <translation type="unfinished">P3</translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="1047"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="1239"/>
         <source>9x Simulator</source>
-        <translation type="unfinished">Simulateur 9x</translation>
+        <translation>Simulateur 9x</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="1240"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="1432"/>
         <source>Outputs</source>
-        <translation type="unfinished">Sorties</translation>
+        <translation>Sorties</translation>
     </message>
 </context>
 <context>
@@ -6493,130 +6374,49 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti  est &apo
     <message>
         <location filename="../simulation/simulatordialog-taranis.ui" line="26"/>
         <source>Companion Simulator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="150"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="716"/>
-        <source>Hold Y</source>
-        <translation type="unfinished">Retenir Y</translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="180"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="746"/>
-        <source>Fix Y</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="210"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="776"/>
-        <source>Fix X</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="240"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="806"/>
-        <source>Hold X</source>
-        <translation type="unfinished">Retenir X</translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="264"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="555"/>
-        <source>SD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="304"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="545"/>
-        <source>SC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="347"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="605"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="991"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1015"/>
-        <source>Right Double Click to Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="377"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="585"/>
-        <source>S2</source>
-        <translation type="unfinished"></translation>
+        <translation>Simulateur companion</translation>
     </message>
     <message>
         <location filename="../simulation/simulatordialog-taranis.ui" line="437"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="565"/>
-        <source>SG</source>
-        <translation type="unfinished"></translation>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1161"/>
+        <source>Hold Y</source>
+        <translation>Retenir Y</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="480"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="595"/>
-        <source>RS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="467"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1191"/>
+        <source>Fix Y</source>
+        <translation>Blocage Y</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="514"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="575"/>
-        <source>SH</source>
-        <translation type="unfinished"></translation>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="497"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1221"/>
+        <source>Fix X</source>
+        <translation>Blocage X</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="629"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="639"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="873"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="883"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="527"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1251"/>
+        <source>Hold X</source>
+        <translation>Retenir X</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="843"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1219"/>
-        <source>S1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="318"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="916"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1005"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1599"/>
+        <source>Right Double Click to Reset</source>
+        <translation>Double-clic droit pour réinitialiser</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="907"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1189"/>
-        <source>SB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="963"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1179"/>
-        <source>SA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1061"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1199"/>
-        <source>SE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1089"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1111"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1114"/>
-        <source>SF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1157"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1209"/>
-        <source>LS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1269"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="77"/>
         <source>Taranis Simulator</source>
-        <translation type="unfinished">Simulateur Taranis</translation>
+        <translation>Simulateur Taranis</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1424"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="232"/>
         <source>Outputs</source>
-        <translation type="unfinished">Sorties</translation>
+        <translation>Sorties</translation>
     </message>
 </context>
 <context>
@@ -6624,59 +6424,54 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti  est &apo
     <message>
         <location filename="../wizarddialog.cpp" line="164"/>
         <source>Channel %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal %1</translation>
     </message>
 </context>
 <context>
     <name>TailPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="643"/>
+        <location filename="../wizarddialog.cpp" line="644"/>
         <source>Rudder Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal de dérive:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="645"/>
+        <location filename="../wizarddialog.cpp" line="646"/>
         <source>Elevator Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal de profondeur:</translation>
     </message>
 </context>
 <context>
     <name>TailSelectionPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="308"/>
+        <location filename="../wizarddialog.cpp" line="309"/>
         <source>Elevator and Rudder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.cpp" line="310"/>
-        <source>Only Elevator</source>
-        <translation type="unfinished"></translation>
+        <translation>Profondeur et dérive</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="311"/>
-        <source>V-tail</source>
-        <translation type="unfinished"></translation>
+        <source>Only Elevator</source>
+        <translation>Profondeur uniquement</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="314"/>
+        <location filename="../wizarddialog.cpp" line="312"/>
+        <source>V-tail</source>
+        <translation>Empennage en V</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="315"/>
         <source>Tail Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Type d&apos;empennage:</translation>
     </message>
 </context>
 <context>
     <name>Telemetry</name>
-    <message>
-        <location filename="../modeledit/telemetry.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="64"/>
         <location filename="../modeledit/telemetry.ui" line="477"/>
         <location filename="../modeledit/telemetry.ui" line="522"/>
         <location filename="../modeledit/telemetry.ui" line="675"/>
         <source>A1</source>
-        <translation type="unfinished">A1</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="105"/>
@@ -6684,379 +6479,369 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti  est &apo
         <location filename="../modeledit/telemetry.ui" line="527"/>
         <location filename="../modeledit/telemetry.ui" line="680"/>
         <source>A2</source>
-        <translation type="unfinished">A2</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="335"/>
         <source>RSSI</source>
-        <translation type="unfinished">RSSI</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="187"/>
         <source>Alarm 1</source>
-        <translation type="unfinished">Alarme 1</translation>
+        <translation>Alarme 1</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="201"/>
         <location filename="../modeledit/telemetry.ui" line="278"/>
         <source>----</source>
-        <translation type="unfinished">----</translation>
+        <translation>----</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="206"/>
         <location filename="../modeledit/telemetry.ui" line="283"/>
         <source>Yellow</source>
-        <translation type="unfinished">Jaune</translation>
+        <translation>Jaune</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="211"/>
         <location filename="../modeledit/telemetry.ui" line="288"/>
         <source>Orange</source>
-        <translation type="unfinished">Orange</translation>
+        <translation>Orange</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="216"/>
         <location filename="../modeledit/telemetry.ui" line="293"/>
         <source>Red</source>
-        <translation type="unfinished">Rouge</translation>
+        <translation>Rouge</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="264"/>
         <source>Alarm 2</source>
-        <translation type="unfinished">Alarme 2</translation>
+        <translation>Alarme 2</translation>
+    </message>
+    <message>
+        <location filename="../modeledit/telemetry.ui" line="537"/>
+        <source>CELS</source>
+        <translation>ELEM</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="583"/>
         <source>Serial Protocol</source>
-        <translation type="unfinished">Protocole Série</translation>
+        <translation>Protocole Série</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="400"/>
         <source>Volt source</source>
-        <translation type="unfinished">Source de mesure de tension</translation>
+        <translation>Source de mesure de tension</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="414"/>
         <source>Metric</source>
-        <translation type="unfinished">Métrique</translation>
+        <translation>Métrique</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="419"/>
         <source>Imperial</source>
-        <translation type="unfinished">Impérial</translation>
+        <translation>Impérial</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="439"/>
         <source>Current source</source>
-        <translation type="unfinished">Source de mesure de courant</translation>
+        <translation>Source de mesure de courant</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="458"/>
         <source>Protocol</source>
-        <translation type="unfinished">Codage</translation>
+        <translation>Protocole</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="472"/>
         <source>NONE</source>
-        <translation type="unfinished">Aucune</translation>
+        <translation>Aucune</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="487"/>
         <location filename="../modeledit/telemetry.ui" line="532"/>
         <source>FAS</source>
-        <translation type="unfinished">FAS</translation>
+        <translation>FAS</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="502"/>
         <source>None</source>
-        <translation type="unfinished">Aucun</translation>
+        <translation>Aucun</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="507"/>
         <source>FrSky Sensor Hub</source>
-        <translation type="unfinished">Sensor Hub FrSky</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/telemetry.ui" line="537"/>
-        <source>CEL</source>
-        <translation type="unfinished">ELEM</translation>
+        <translation>Sensor Hub FrSky</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="557"/>
         <source>Units</source>
-        <translation type="unfinished">Unités</translation>
+        <translation>Unités</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="570"/>
         <source>Blades</source>
-        <translation type="unfinished">Pales</translation>
+        <translation>Pales</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="660"/>
         <source>Alti</source>
-        <translation type="unfinished">Alti</translation>
+        <translation>Alti</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="665"/>
         <source>Alti+</source>
-        <translation type="unfinished">Alti+</translation>
+        <translation>Alti+</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="670"/>
         <source>Vario</source>
-        <translation type="unfinished">Vario</translation>
+        <translation>Vario</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="696"/>
         <source>Sink Max</source>
-        <translation type="unfinished">Chute max</translation>
+        <translation>Chute max</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="806"/>
         <source>Off</source>
-        <translation type="unfinished">Aucun</translation>
+        <translation>Désactivé</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="819"/>
         <source>Climb Max</source>
-        <translation type="unfinished">Montée max</translation>
+        <translation>Montée max</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="835"/>
         <source>Sink Min</source>
-        <translation type="unfinished">Chute min</translation>
+        <translation>Chute min</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="851"/>
         <source>Climb Min</source>
-        <translation type="unfinished">Montée min</translation>
+        <translation>Montée min</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="863"/>
         <source>Vario source</source>
-        <translation type="unfinished">Source vario</translation>
+        <translation>Source vario</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="870"/>
         <source>Vario limits</source>
-        <translation type="unfinished">Limites vario</translation>
+        <translation>Limites vario</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="885"/>
         <source>Use GPS as altitude source</source>
-        <translation type="unfinished">Utiliser le GPS comme source d&apos;altitude</translation>
+        <translation>Utiliser le GPS comme source d&apos;altitude</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="898"/>
         <source>Display altitude in toolbar</source>
-        <translation type="unfinished">Affichage de l&apos;altitude dans la barre de notifs</translation>
+        <translation>Affichage de l&apos;altitude dans la barre de notifs</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="913"/>
         <source>Altimetry</source>
-        <translation type="unfinished"></translation>
+        <translation>Altitude</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="979"/>
         <source> mAh</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="995"/>
         <source> A</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="1059"/>
         <source>Various</source>
-        <translation type="unfinished"></translation>
+        <translation>Divers</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="966"/>
         <source>mAh count</source>
-        <translation type="unfinished"></translation>
+        <translation>Valeur enregistrée</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="1020"/>
         <source>FAS Offset</source>
-        <translation type="unfinished"></translation>
+        <translation>Décalage FAS</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="1027"/>
         <source>Persistent mAh</source>
-        <translation type="unfinished"></translation>
+        <translation>Mémorisation des mAh</translation>
     </message>
 </context>
 <context>
     <name>TelemetryAnalog</name>
-    <message>
-        <location filename="../modeledit/telemetry_analog.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="34"/>
         <source>Unit</source>
-        <translation type="unfinished">Unité</translation>
+        <translation>Unité</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="47"/>
         <source>Max Value</source>
-        <translation type="unfinished">Valeur Max</translation>
+        <translation>Valeur Max</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="60"/>
         <source>Alarm 1    </source>
-        <translation type="unfinished">Alarme 1</translation>
+        <translation>Alarme 1</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="74"/>
         <location filename="../modeledit/telemetry_analog.ui" line="137"/>
         <source>----</source>
-        <translation type="unfinished">----</translation>
+        <translation>----</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="79"/>
         <location filename="../modeledit/telemetry_analog.ui" line="142"/>
         <source>Yellow</source>
-        <translation type="unfinished">Jaune</translation>
+        <translation>Jaune</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="84"/>
         <location filename="../modeledit/telemetry_analog.ui" line="147"/>
         <source>Orange</source>
-        <translation type="unfinished">Orange</translation>
+        <translation>Orange</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="89"/>
         <location filename="../modeledit/telemetry_analog.ui" line="152"/>
         <source>Red</source>
-        <translation type="unfinished">Rouge</translation>
+        <translation>Rouge</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="104"/>
         <location filename="../modeledit/telemetry_analog.ui" line="167"/>
         <source>&lt;</source>
-        <translation type="unfinished">&lt;</translation>
+        <translation>&lt;</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="109"/>
         <location filename="../modeledit/telemetry_analog.ui" line="172"/>
         <source>&gt;</source>
-        <translation type="unfinished">&gt;</translation>
+        <translation>&gt;</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="123"/>
         <source>Alarm 2</source>
-        <translation type="unfinished">Alarme 2</translation>
+        <translation>Alarme 2</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="265"/>
         <source>Offset</source>
-        <translation type="unfinished">Décalage</translation>
+        <translation>Décalage</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="279"/>
         <source>Volts (V)</source>
-        <translation type="unfinished">Tension (V)</translation>
+        <translation>Tension (V)</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="284"/>
         <source>Amps (A)</source>
-        <translation type="unfinished">Courant (A)</translation>
+        <translation>Courant (A)</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="289"/>
         <source>Speed (m/s or ft/s)</source>
-        <translation type="unfinished">Vitesse (m/s ou ft/s)</translation>
+        <translation>Vitesse (m/s ou ft/s)</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="294"/>
         <source>Raw (-)</source>
-        <translation type="unfinished">Chiffres bruts (-)</translation>
+        <translation>Chiffres bruts (-)</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="299"/>
         <source>Speed (km/h or miles/h)</source>
-        <translation type="unfinished">Vitesse (km/h ou miles/h)</translation>
+        <translation>Vitesse (km/h ou miles/h)</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="304"/>
         <source>Meters (m or ft)</source>
-        <translation type="unfinished">Distance (m ou ft)</translation>
+        <translation>Distance (m ou ft)</translation>
     </message>
     <message utf8="true">
         <location filename="../modeledit/telemetry_analog.ui" line="309"/>
         <source>Temp (°)</source>
-        <translation type="unfinished">Temp (°)</translation>
+        <translation>Température (°)</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="314"/>
         <source>Fuel (%)</source>
-        <translation type="unfinished">Carburant (%)</translation>
+        <translation>Carburant (%)</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="319"/>
         <source>mAmps (mA)</source>
-        <translation type="unfinished">Courant (mA)</translation>
+        <translation>Courant (mA)</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.cpp" line="42"/>
         <source>Low Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarme basse</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.cpp" line="43"/>
         <source>Critical Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarme critique</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.cpp" line="51"/>
         <source>Range</source>
-        <translation type="unfinished">Plage</translation>
+        <translation>Plage</translation>
     </message>
 </context>
 <context>
     <name>TelemetryCustomScreen</name>
-    <message>
-        <location filename="../modeledit/telemetry_customscreen.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../modeledit/telemetry_customscreen.ui" line="34"/>
         <source>Custom Screen Type</source>
-        <translation type="unfinished">Type d&apos;écran personnalisé</translation>
+        <translation>Type d&apos;écran personnalisé</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_customscreen.ui" line="54"/>
         <source>Nums</source>
-        <translation type="unfinished">Valeurs</translation>
+        <translation>Valeurs</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_customscreen.ui" line="59"/>
         <source>Bars</source>
-        <translation type="unfinished">Barres</translation>
+        <translation>Barres</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_customscreen.ui" line="92"/>
         <source>Min</source>
-        <translation type="unfinished">Min</translation>
+        <translation>Min</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_customscreen.ui" line="102"/>
         <source>Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Source</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_customscreen.ui" line="112"/>
         <source>Gauge</source>
-        <translation type="unfinished">Jauge</translation>
+        <translation>Jauge</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_customscreen.ui" line="122"/>
         <source>Max</source>
-        <translation type="unfinished">Max</translation>
+        <translation>Max</translation>
     </message>
 </context>
 <context>
@@ -7064,78 +6849,63 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti  est &apo
     <message>
         <location filename="../modeledit/telemetry.cpp" line="488"/>
         <source>Telemetry screen %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecran de télémesure %1</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.cpp" line="523"/>
         <source>Low Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarme basse</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.cpp" line="524"/>
         <source>Critical Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarme critique</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.cpp" line="608"/>
         <source>Winged Shadow How High</source>
-        <translation type="unfinished">Winged Shadow How High</translation>
+        <translation>Winged Shadow How High</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.cpp" line="611"/>
         <source>Winged Shadow How High (not supported)</source>
-        <translation type="unfinished">Winged Shadow How High (non supporté)</translation>
+        <translation>Winged Shadow How High (non supporté)</translation>
     </message>
 </context>
 <context>
     <name>ThrottlePage</name>
-    <message>
-        <location filename="../wizarddialog.cpp" line="354"/>
-        <source>Yes</source>
-        <translation type="unfinished">Oui</translation>
-    </message>
     <message>
         <location filename="../wizarddialog.cpp" line="355"/>
-        <source>No</source>
-        <translation type="unfinished">Non</translation>
+        <source>Yes</source>
+        <translation>Oui</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="362"/>
+        <location filename="../wizarddialog.cpp" line="356"/>
+        <source>No</source>
+        <translation>Non</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="363"/>
         <source>&lt;br&gt;Throttle Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;Canal des gaz:</translation>
     </message>
 </context>
 <context>
     <name>Timer</name>
-    <message>
-        <location filename="../modeledit/setup_timer.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/setup_timer.ui" line="29"/>
-        <source>mm:ss</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../modeledit/setup_timer.ui" line="39"/>
         <source>Countdown</source>
-        <translation type="unfinished"></translation>
+        <translation>Compte à rebours</translation>
     </message>
     <message>
         <location filename="../modeledit/setup_timer.ui" line="49"/>
         <source>Minute Call</source>
-        <translation type="unfinished"></translation>
+        <translation>Annonces minutes</translation>
     </message>
     <message>
         <location filename="../modeledit/setup_timer.ui" line="56"/>
         <source>Persistent</source>
-        <translation type="unfinished">Persistant</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/setup_timer.ui" line="63"/>
-        <source> (00:00:00)</source>
-        <translation type="unfinished"></translation>
+        <translation>Persistant</translation>
     </message>
 </context>
 <context>
@@ -7143,43 +6913,43 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti  est &apo
     <message>
         <location filename="../modeledit/setup.cpp" line="25"/>
         <source>Silent</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.cpp" line="26"/>
         <source>Beeps</source>
-        <translation type="unfinished"></translation>
+        <translation>Bips</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.cpp" line="28"/>
         <source>Voice</source>
-        <translation type="unfinished">Voix</translation>
+        <translation>Voix</translation>
     </message>
 </context>
 <context>
     <name>VTailPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="618"/>
+        <location filename="../wizarddialog.cpp" line="619"/>
         <source>First Tail Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Premier canal d&apos;empennage:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="620"/>
+        <location filename="../wizarddialog.cpp" line="621"/>
         <source>Second Tail Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Deuxième canal d&apos;empennage:</translation>
     </message>
 </context>
 <context>
     <name>WingtypeSelectionPage</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="288"/>
+        <location filename="../wizarddialog.cpp" line="289"/>
         <source>Standard Wing</source>
-        <translation type="unfinished"></translation>
+        <translation>Aile standard</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="290"/>
+        <location filename="../wizarddialog.cpp" line="291"/>
         <source>Flying Wing / Deltawing</source>
-        <translation type="unfinished"></translation>
+        <translation>Aile delta</translation>
     </message>
 </context>
 <context>
@@ -7187,186 +6957,186 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti  est &apo
     <message>
         <location filename="../wizarddialog.cpp" line="26"/>
         <source>Model Wizard</source>
-        <translation type="unfinished"></translation>
+        <translation>Assistant de configuration de modèle</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="28"/>
         <source>Model Type</source>
-        <translation type="unfinished">Type de modèle</translation>
+        <translation>Type de modèle</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="28"/>
         <source>Enter model name and model type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrer le nom et le type de modèle.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="29"/>
         <source>Throttle</source>
-        <translation type="unfinished">Gaz</translation>
+        <translation>Gaz</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="29"/>
         <source>Has your model got a motor or an engine?</source>
-        <translation type="unfinished"></translation>
+        <translation>Le modèle a-t-il un moteur?</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="30"/>
         <source>Wing Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Type d&apos;aile</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="30"/>
         <source>Is your model a flying wing/deltawing or has it a standard wing configuration?</source>
-        <translation type="unfinished"></translation>
+        <translation>Le modèle a-t-il une aile standard ou une aile delta?</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="31"/>
         <source>Ailerons</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="31"/>
         <source>Has your model got ailerons?</source>
-        <translation type="unfinished"></translation>
+        <translation>Le modèle a-t-il des ailerons?</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="32"/>
         <source>Flaps</source>
-        <translation type="unfinished"></translation>
+        <translation>Volets</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="32"/>
         <source>Has your model got flaps?</source>
-        <translation type="unfinished"></translation>
+        <translation>Le modèle a-t-il des volets?</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="33"/>
         <source>Airbrakes</source>
-        <translation type="unfinished"></translation>
+        <translation>Aérofreins</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="33"/>
         <source>Has your model got airbrakes?</source>
-        <translation type="unfinished"></translation>
+        <translation>Le modèle a-t-il des aérofreins?</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="34"/>
         <source>Flying-wing / Delta-wing</source>
-        <translation type="unfinished"></translation>
+        <translation>Aile delta</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="34"/>
         <source>Are the elevons controlled by servos connected to separate channels or by a single servo channel?</source>
-        <translation type="unfinished"></translation>
+        <translation>Les élevons sont-ils commandés par des servos connectés à des canaux différents, ou par un seul canal?</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="35"/>
         <source>Rudder</source>
-        <translation type="unfinished">Direction</translation>
+        <translation>Dérive</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="35"/>
         <source>Does your model have a rudder?</source>
-        <translation type="unfinished"></translation>
+        <translation>Le modèle a-t-il une dérive?</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="36"/>
         <source>Tail Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Type d&apos;empennage</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="36"/>
         <source>Select which type of tail your model is equiped with.</source>
-        <translation type="unfinished"></translation>
+        <translation>Choisissez le type d&apos;empennage de votre modèle.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizarddialog.cpp" line="39"/>
         <source>Tail</source>
-        <translation type="unfinished">Empennage</translation>
+        <translation>Empennage</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizarddialog.cpp" line="38"/>
         <source>Select channels for tail control.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner les canaux à utiliser pour l&apos;empennage.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="38"/>
         <source>V-Tail</source>
-        <translation type="unfinished"></translation>
+        <translation>Empennage en V</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="39"/>
         <source>Select elevator channel.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner le canal de profondeur.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="40"/>
         <source>Cyclic</source>
-        <translation type="unfinished"></translation>
+        <translation>Cyclique</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="40"/>
         <source>Which type of swash control is installed in your helicopter?</source>
-        <translation type="unfinished"></translation>
+        <translation>Quel est le type de plateau cyclique installé dans l&apos;hélico?</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="41"/>
         <source>Tail Gyro</source>
-        <translation type="unfinished"></translation>
+        <translation>Gyro</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="41"/>
         <source>Has your helicopter got an adjustable gyro for the tail?</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;hélico a-t-il un gyro à gain ajsutable par la radio?</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="42"/>
         <source>Rotor Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Type de rotor</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="42"/>
         <source>Has your helicopter got a flybar?</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;hélicoptère a-t-il une barre de Bell?</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="43"/>
         <location filename="../wizarddialog.cpp" line="44"/>
         <source>Helicopter</source>
-        <translation type="unfinished">Hélicoptère</translation>
+        <translation>Hélicoptère</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="43"/>
         <location filename="../wizarddialog.cpp" line="44"/>
         <source>Select the controls for your helicopter</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner les commandes de votre hélicoptère</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="45"/>
         <source>Multirotor</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="45"/>
         <source>Select the control channels for your multirotor</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner les commandes de votre multirotor</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="46"/>
         <source>Save Changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauvegarder les changements</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="46"/>
         <source>Manually check the direction of each control surface and reverse any channels that make controls move in the wrong direction. Remove the propeller/propellers before you try to control your model for the first time.&lt;br&gt;Please note that continuing removes all old model settings!</source>
-        <translation type="unfinished"></translation>
+        <translation>Vérifiez manuellement la direction de mouvement de chaque surface de commande, et inversez les canaux de celles qui répondent dans le faux sens.Attention à bien enlever les hélices du modèle avant de l&apos;alimenter la première fois!&lt;br&gt;Veuillez noter que continuer effacera tous les réglages existants du modèle actuel.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="65"/>
         <source>Enter a name for your model and select model type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrer un nom pour le modèle et sélectionnez son type.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="67"/>
@@ -7447,51 +7217,51 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti  est &apo
 </context>
 <context>
     <name>WizardPrinter</name>
-    <message>
-        <location filename="../wizarddialog.cpp" line="898"/>
-        <source>Model Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../wizarddialog.cpp" line="899"/>
-        <source>Model Type: </source>
-        <translation type="unfinished"></translation>
+        <source>Model Name: </source>
+        <translation>Nom du modèle:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="903"/>
+        <location filename="../wizarddialog.cpp" line="900"/>
+        <source>Model Type: </source>
+        <translation>Type de modèle:</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="904"/>
         <source>Channel %1: </source>
-        <translation type="unfinished"></translation>
+        <translation>Canal %1: </translation>
     </message>
 </context>
 <context>
     <name>appPreferencesDialog</name>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="957"/>
+        <location filename="../apppreferencesdialog.ui" line="955"/>
         <source>Simulator capture folder</source>
-        <translation type="unfinished">Dossier de sauvegarde des captures d&apos;écran</translation>
+        <translation>Dossier de sauvegarde des captures d&apos;écran</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="1000"/>
+        <location filename="../apppreferencesdialog.ui" line="998"/>
         <source>Remember simulator switch values</source>
-        <translation type="unfinished"></translation>
+        <translation>Mémoriser les positions des inters du simulateur</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="389"/>
-        <location filename="../apppreferencesdialog.ui" line="663"/>
-        <location filename="../apppreferencesdialog.ui" line="710"/>
-        <location filename="../apppreferencesdialog.ui" line="882"/>
+        <location filename="../apppreferencesdialog.ui" line="387"/>
+        <location filename="../apppreferencesdialog.ui" line="661"/>
+        <location filename="../apppreferencesdialog.ui" line="708"/>
+        <location filename="../apppreferencesdialog.ui" line="880"/>
         <source>Open Folder</source>
-        <translation type="unfinished">Ouvrir le répertoire</translation>
+        <translation>Ouvrir le répertoire</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.ui" line="26"/>
         <source>Edit Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifier les réglages</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.ui" line="52"/>
         <source>Radio Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil de radio</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.ui" line="71"/>
@@ -7514,7 +7284,7 @@ Mode 4:
   Right stick:  Elevator, Rudder
 
 </source>
-        <translation type="unfinished">Choix du mode:
+        <translation>Choix du mode:
 
 Mode 1:
 Manche Gauche:  Profondeur, Direction
@@ -7537,445 +7307,442 @@ Manche Droit:  Profondeur, Direction
     <message>
         <location filename="../apppreferencesdialog.ui" line="96"/>
         <source>Mode 1 (RUD ELE THR AIL)</source>
-        <translation type="unfinished">Mode 1 (DIR PROF GAZ AIL)</translation>
+        <translation>Mode 1 (DIR PROF GAZ AIL)</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.ui" line="101"/>
         <source>Mode 2 (RUD THR ELE AIL)</source>
-        <translation type="unfinished">Mode 2 (DIR GAZ PROF AIL)</translation>
+        <translation>Mode 2 (DIR GAZ PROF AIL)</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.ui" line="106"/>
         <source>Mode 3 (AIL ELE THR RUD)</source>
-        <translation type="unfinished">Mode 3 (AIL PROF GAZ DIR)</translation>
+        <translation>Mode 3 (AIL PROF GAZ DIR)</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.ui" line="111"/>
         <source>Mode 4 (AIL THR ELE RUD)</source>
-        <translation type="unfinished">Mode 4 (AIL GAZ PROF DIR)</translation>
+        <translation>Mode 4 (AIL GAZ PROF DIR)</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="144"/>
+        <source>R E T A</source>
+        <translation>D P G A</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="149"/>
+        <source>R E A T</source>
+        <translation>D P A G</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="154"/>
+        <source>R T E A</source>
+        <translation>D G P A</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="159"/>
+        <source>R T A E</source>
+        <translation>D G A P</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="164"/>
+        <source>R A E T</source>
+        <translation>D A P G</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="169"/>
+        <source>R A T E</source>
+        <translation>D A G P</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="174"/>
+        <source>E R T A</source>
+        <translation>P D G A</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="179"/>
+        <source>E R A T</source>
+        <translation>P D A G</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="184"/>
+        <source>E T R A</source>
+        <translation>P G D A</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="189"/>
+        <source>E T A R</source>
+        <translation>P G A D</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="194"/>
+        <source>E A R T</source>
+        <translation>P A D G</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="199"/>
+        <source>E A T R</source>
+        <translation>P A G D</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="204"/>
+        <source>T R E A</source>
+        <translation>G D P A</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="209"/>
+        <source>T R A E</source>
+        <translation>G D A P</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="214"/>
+        <source>T E R A</source>
+        <translation>G P D A</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="219"/>
+        <source>T E A R</source>
+        <translation>G P A D</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="224"/>
+        <source>T A R E</source>
+        <translation>G A D P</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="229"/>
+        <source>T A E R</source>
+        <translation>G A P D</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="234"/>
+        <source>A R E T</source>
+        <translation>A D P G</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="239"/>
+        <source>A R T E</source>
+        <translation>A D G P</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="244"/>
+        <source>A E R T</source>
+        <translation>A P D G</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="249"/>
+        <source>A E T R</source>
+        <translation>A P G D</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="254"/>
+        <source>A T R E</source>
+        <translation>A G D P</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="259"/>
+        <source>A T E R</source>
+        <translation>A G P D</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="273"/>
+        <source>Default Stick Mode</source>
+        <translation>Mode</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="280"/>
+        <source>Profile Name</source>
+        <translation>Nom du profil</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="306"/>
+        <source>Splash Screen</source>
+        <translation>Ecran d&apos;accueil</translation>
+    </message>
+    <message>
+        <source>Channel Order</source>
+        <translation type="obsolete">Ordre des voies par défaut</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="335"/>
+        <source>SD Structure path</source>
+        <translation>Chemin de la structure de la carte SD</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="380"/>
+        <source>Remove Profile</source>
+        <translation>Supprimer le profil</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="416"/>
+        <source>Select Image</source>
+        <translation>Sélectionner une image</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="423"/>
+        <source>Radio Type</source>
+        <translation>Type de radio</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="430"/>
+        <source>Clear Image</source>
+        <translation>Effacer l&apos;image</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="498"/>
+        <source>9X</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="503"/>
+        <source>9X with m128</source>
+        <translation>9X avec m128</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="508"/>
+        <source>9XR</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="513"/>
+        <source>9XR with m128</source>
+        <translation>9XR avec m128</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="518"/>
+        <source>Gruvin9x Board</source>
+        <translation>Carte Gruvin9x</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="523"/>
+        <source>Sky9x Board</source>
+        <translation>Carte Sky9x</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="528"/>
+        <source>Taranis</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="536"/>
+        <source>General Settings</source>
+        <translation>Paramètres généraux</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="543"/>
+        <source>Append version number to FW file name</source>
+        <translation>Ajouter le numéro de version au nom du fichier téléchargé</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="550"/>
+        <source>Offer to write FW to Tx after download</source>
+        <translation>Proposer de transférer le firmware à la radio après téléchargement</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="568"/>
+        <source>Application Settings</source>
+        <translation>Réglages de l&apos;application</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="742"/>
+        <source>Only show user splash images</source>
+        <translation>Ne montrer que les images de l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="747"/>
+        <source>Show user and companion splash images</source>
+        <translation>Montrer les images de companion et de l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="761"/>
+        <source>User Splash Screens</source>
+        <translation>Ecrans d&apos;accueil personnalisés</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="830"/>
+        <source>Use model wizard when creating a new model</source>
+        <translation>Utiliser l&apos;assistant à la création d&apos;un nouveau modèle</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="838"/>
+        <source>Simulator Settings</source>
+        <translation>Paramètres du simulateur</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="897"/>
+        <source>Blue</source>
+        <translation>Bleu</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="902"/>
+        <source>Green</source>
+        <translation>Vert</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="907"/>
+        <source>Red</source>
+        <translation>Rouge</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="912"/>
+        <source>Orange</source>
+        <translation>Orange</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="917"/>
+        <source>Yellow</source>
+        <translation>Jaune</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="674"/>
+        <source>Splash Screen Library</source>
+        <translation>Bibliothèques d&apos;écrans d&apos;accueil</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="687"/>
+        <source>Files to keep</source>
+        <translation>Fichiers à conserver</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="850"/>
+        <source>Simulator BackLight</source>
+        <translation>Rétroéclairage du simulateur</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="790"/>
+        <source>Automatic Backup Folder</source>
+        <translation>Dossier de sauvegardes automatiques</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="991"/>
+        <source>Only capture to clipboard</source>
+        <translation>Capturer dans le presse-papiers uniquement</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="931"/>
+        <source>Joystick</source>
+        <translation>Joystick</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.ui" line="137"/>
-        <source>Channel order
-
-This is used by the templated to determine which channel goes to what number output.</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Channel order&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Defines the order of the default mixes created on a new model.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ordre des voies&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Détermine l&apos;ordre des mixages par défaut sur un nouveau modèle.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="146"/>
-        <source>R E T A</source>
-        <translation type="unfinished"></translation>
+        <location filename="../apppreferencesdialog.ui" line="319"/>
+        <source>Default Channel Order</source>
+        <translation>Ordre des voies par défaut</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="151"/>
-        <source>R E A T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="156"/>
-        <source>R T E A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="161"/>
-        <source>R T A E</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="166"/>
-        <source>R A E T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="171"/>
-        <source>R A T E</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="176"/>
-        <source>E R T A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="181"/>
-        <source>E R A T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="186"/>
-        <source>E T R A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="191"/>
-        <source>E T A R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="196"/>
-        <source>E A R T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="201"/>
-        <source>E A T R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="206"/>
-        <source>T R E A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="211"/>
-        <source>T R A E</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="216"/>
-        <source>T E R A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="221"/>
-        <source>T E A R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="226"/>
-        <source>T A R E</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="231"/>
-        <source>T A E R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="236"/>
-        <source>A R E T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="241"/>
-        <source>A R T E</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="246"/>
-        <source>A E R T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="251"/>
-        <source>A E T R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="256"/>
-        <source>A T R E</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="261"/>
-        <source>A T E R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="275"/>
-        <source>Default Stick Mode</source>
-        <translation type="unfinished">Mode par défaut</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="282"/>
-        <source>Profile Name</source>
-        <translation type="unfinished">Nom du profil</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="308"/>
-        <source>Splash Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="321"/>
-        <source>Channel Order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="337"/>
-        <source>SD Structure path</source>
-        <translation type="unfinished">Chemin de la structure de la carte SD</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="382"/>
-        <source>Remove Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="418"/>
-        <source>Select Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="425"/>
-        <source>Radio Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="432"/>
-        <source>Clear Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="500"/>
-        <source>9X</source>
-        <translation type="unfinished">9X</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="505"/>
-        <source>9X with m128</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="510"/>
-        <source>9XR</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="515"/>
-        <source>9XR with m128</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="520"/>
-        <source>Gruvin9x Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="525"/>
-        <source>Sky9x Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="530"/>
-        <source>Taranis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="538"/>
-        <source>General Settings</source>
-        <translation type="unfinished">Paramètres généraux</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="545"/>
-        <source>Append version number to FW file name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="552"/>
-        <source>Offer to write FW to Tx after download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="562"/>
-        <source>General Settings Label</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="570"/>
-        <source>Application Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="744"/>
-        <source>Only show user splash images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="749"/>
-        <source>Show user and companion splash images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="763"/>
-        <source>User Splash Screens</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="832"/>
-        <source>Use model wizard when creating a new model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="840"/>
-        <source>Simulator Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="899"/>
-        <source>Blue</source>
-        <translation type="unfinished">Bleu</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="904"/>
-        <source>Green</source>
-        <translation type="unfinished">Vert</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="909"/>
-        <source>Red</source>
-        <translation type="unfinished">Rouge</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="914"/>
-        <source>Orange</source>
-        <translation type="unfinished">Orange</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="919"/>
-        <source>Yellow</source>
-        <translation type="unfinished">Jaune</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="676"/>
-        <source>Splash Screen Library</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="689"/>
-        <source>Files to keep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="852"/>
-        <source>Simulator BackLight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="792"/>
-        <source>Automatic Backup Folder</source>
-        <translation type="unfinished">Dossier de sauvegardes automatiques</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="993"/>
-        <source>Only capture to clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="933"/>
-        <source>Joystick</source>
-        <translation type="unfinished">Joystick</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="696"/>
+        <location filename="../apppreferencesdialog.ui" line="694"/>
         <source>Find Executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Parcourir...</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="730"/>
+        <location filename="../apppreferencesdialog.ui" line="728"/>
         <source>Google Earth Executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Exécutable Google Earth</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="950"/>
+        <location filename="../apppreferencesdialog.ui" line="948"/>
         <source>Calibrate</source>
-        <translation type="unfinished">Calibrer</translation>
+        <translation>Calibrer</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="862"/>
+        <location filename="../apppreferencesdialog.ui" line="860"/>
         <source>Enable</source>
-        <translation type="unfinished">Actif</translation>
+        <translation>Actif</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="576"/>
+        <location filename="../apppreferencesdialog.ui" line="574"/>
         <source>Show splash screen when Companion starts</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher l&apos;écran d&apos;accueil au lancement de companion</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="617"/>
+        <location filename="../apppreferencesdialog.ui" line="615"/>
         <source>Automatic check for OpenTX firmware updates</source>
-        <translation type="unfinished"></translation>
+        <translation>Vérifier la présence de mises à jour de firmware automatiquement</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="586"/>
+        <location filename="../apppreferencesdialog.ui" line="584"/>
         <source>Automatic check for Companion updates</source>
-        <translation type="unfinished"></translation>
+        <translation>Vérifier la présence de mises à jour de companion automatiquement</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="596"/>
+        <location filename="../apppreferencesdialog.ui" line="594"/>
         <source>Enable automatic backup before writing firmware</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauvegarder les réglages et modèles automatiquement lors des transferts</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="68"/>
         <source>My Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Ma radio</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="84"/>
         <source>Select your snapshot folder</source>
-        <translation type="unfinished">Sélectionner le dossier où stocker les captures d&apos;écran</translation>
+        <translation>Sélectionner le dossier où stocker les captures d&apos;écran</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="132"/>
         <location filename="../apppreferencesdialog.cpp" line="226"/>
         <source>No joysticks found</source>
-        <translation type="unfinished">Aucun joystick</translation>
+        <translation>Aucun joystick trouvé</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="168"/>
         <source>EMPTY: No radio settings stored in profile</source>
-        <translation type="unfinished"></translation>
+        <translation>VIDE: Aucune donnée stockée dans le profil</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="173"/>
         <source>AVAILABLE: Radio settings of unknown age</source>
-        <translation type="unfinished"></translation>
+        <translation>DISPONIBLES: Réglages enregistrés, date d&apos;enregistrement non disponible</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="175"/>
         <source>AVAILABLE: Radio settings stored %1</source>
-        <translation type="unfinished"></translation>
+        <translation>DISPONIBLES: Réglages enregistrés le %1</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="183"/>
         <source>Select your library folder</source>
-        <translation type="unfinished">Sélectionner le dossier de bibliothèque</translation>
+        <translation>Sélectionner le dossier de bibliothèque</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="206"/>
         <source>Select your Models and Settings backup folder</source>
-        <translation type="unfinished">Sélectionner le dossier dans lequel une sauvegarde des réglages et modèles sera placée automatiquement lors de chaque opération</translation>
+        <translation>Sélectionner le dossier dans lequel une sauvegarde des réglages et modèles sera placée automatiquement lors de chaque opération</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="216"/>
         <source>Select Google Earth executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner l&apos;emplacement de l&apos;exécutable Google Earth</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="259"/>
         <source>Select the folder replicating your SD structure</source>
-        <translation type="unfinished">Sélectionner un dossier contenant une copie des dossiers de la carte SD</translation>
+        <translation>Sélectionner un dossier contenant une copie des dossiers de la carte SD</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="268"/>
         <source>Not possible to remove profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de supprimer le profil</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="268"/>
         <source>The default profile can not be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le profil par défaut ne peut être supprimé.</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="305"/>
         <source>Open Image to load</source>
-        <translation type="unfinished">Ouvrir l&apos;image à charger</translation>
+        <translation>Ouvrir l&apos;image à charger</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="305"/>
         <source>Images (%1)</source>
-        <translation type="unfinished">Images (%1)</translation>
+        <translation>Images (%1)</translation>
     </message>
 </context>
 <context>
@@ -8195,7 +7962,7 @@ Consulter la documentation du programmateur utilisé et celle d&apos;AVRDUDE pou
     <message>
         <location filename="../burnconfigdialog.ui" line="619"/>
         <source>MCU</source>
-        <translation>MCU</translation>
+        <translation>Processeur</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.ui" line="735"/>
@@ -8245,7 +8012,7 @@ Consulter la documentation du programmateur utilisé et celle d&apos;AVRDUDE pou
         <location filename="../burnconfigdialog.cpp" line="341"/>
         <location filename="../burnconfigdialog.cpp" line="418"/>
         <source>Companion</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.cpp" line="342"/>
@@ -8339,7 +8106,7 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../burnconfigdialog.ui" line="702"/>
         <source>ARM MCU</source>
-        <translation>Microprocesseur ARM</translation>
+        <translation>Processeur ARM</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.ui" line="722"/>
@@ -8382,22 +8149,22 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../burndialog.ui" line="306"/>
         <source>Use firmware start screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser l&apos;écran d&apos;accueil du firmware</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="313"/>
         <source>Use another start screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser un autre écran d&apos;accueil</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="326"/>
         <source>Use profile start screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser l&apos;écran d&apos;accueil du profil</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="333"/>
         <source>Use library start screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser un écran d&apos;accueil de la bibliothèque</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="194"/>
@@ -8408,7 +8175,7 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../burndialog.ui" line="209"/>
         <source>Allows Companion to write to older version of the firmware</source>
-        <translation type="unfinished"></translation>
+        <translation>Permet à companion de transférer des réglages à une ancienne version de firmware</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="222"/>
@@ -8428,7 +8195,7 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../burndialog.ui" line="147"/>
         <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="212"/>
@@ -8455,6 +8222,11 @@ m2560 for v4.1 boards</source>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
+    <message>
+        <location filename="../burndialog.cpp" line="356"/>
+        <source>Profile image %1 is invalid.</source>
+        <translation>L&apos;image du profil %1 est invalide.</translation>
+    </message>
     <message>
         <location filename="../burndialog.cpp" line="372"/>
         <source>Images (%1)</source>
@@ -8480,17 +8252,17 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../burndialog.cpp" line="41"/>
         <source>Write firmware to Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Transférer le firmware à la radio</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="62"/>
         <source>Write Backup to Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Transférer une sauvegarde à la radio</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="65"/>
         <source>Write Backup from %1 to Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Transférer la sauvegarde %1 à la radio</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="67"/>
@@ -8528,47 +8300,42 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../burndialog.cpp" line="143"/>
         <source>Open Firmware File</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner le firmware</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="149"/>
         <source>Choose Radio Backup file</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner le fichier de sauvegarde</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="205"/>
         <source>%1 may not be a valid firmware file</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ne semble pas être un firmware valide</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="336"/>
         <source>The firmware file is not valid.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le firmware est invalide.</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="340"/>
         <source>There is no start screen image in the firmware file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../burndialog.cpp" line="356"/>
-        <source>The profile image %1 does not contain an image.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun écran d&apos;accueil trouvé dans le firmware.</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="372"/>
         <source>Open image file to use as radio start screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir l&apos;image à utiliser comme écran d&apos;accueil</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="377"/>
         <source>Image could not be loaded from %1</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;image %1 n&apos;a pu être chargée</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="395"/>
         <source>The library image could not be loaded</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;image n&apos;a pu être chargée depuis la bibliothèque</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="427"/>
@@ -8616,7 +8383,7 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../comparedialog.ui" line="29"/>
         <source>Compare Models</source>
-        <translation type="unfinished"></translation>
+        <translation>Comparer les modèles</translation>
     </message>
     <message>
         <location filename="../comparedialog.ui" line="49"/>
@@ -8677,13 +8444,13 @@ m2560 for v4.1 boards</source>
         <location filename="../comparedialog.cpp" line="257"/>
         <location filename="../comparedialog.cpp" line="280"/>
         <source>Protocol</source>
-        <translation>Codage</translation>
+        <translation>Protocole</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="259"/>
         <location filename="../comparedialog.cpp" line="282"/>
         <source>Pulse Polarity</source>
-        <translation>Modulation</translation>
+        <translation>Polarité</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="261"/>
@@ -8717,13 +8484,13 @@ m2560 for v4.1 boards</source>
         <location filename="../comparedialog.cpp" line="266"/>
         <location filename="../comparedialog.cpp" line="289"/>
         <source>Trim Increment</source>
-        <translation>Incrément trims</translation>
+        <translation>Pas des trims</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="268"/>
         <location filename="../comparedialog.cpp" line="291"/>
         <source>Center Beep</source>
-        <translation>Bip de Centrage</translation>
+        <translation>Bip de centrage</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="301"/>
@@ -8878,6 +8645,11 @@ m2560 for v4.1 boards</source>
         <source>Weight</source>
         <translation>Ratio</translation>
     </message>
+    <message>
+        <location filename="../comparedialog.cpp" line="974"/>
+        <source>5 Point Curves</source>
+        <translation>Courbes à 5 points</translation>
+    </message>
     <message>
         <location filename="../comparedialog.cpp" line="995"/>
         <location filename="../comparedialog.cpp" line="1024"/>
@@ -8899,13 +8671,13 @@ m2560 for v4.1 boards</source>
         <location filename="../comparedialog.cpp" line="827"/>
         <location filename="../comparedialog.cpp" line="906"/>
         <source> Delay(u%1:d%2)</source>
-        <translation> Délai(u%1:d%2)</translation>
+        <translation> Délai(h%1:b%2)</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="828"/>
         <location filename="../comparedialog.cpp" line="907"/>
         <source> Slow(u%1:d%2)</source>
-        <translation> Ralentissement(u%1:d%2)</translation>
+        <translation> Ralenti(h%1:b%2)</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="829"/>
@@ -8933,9 +8705,8 @@ m2560 for v4.1 boards</source>
         <translation>Courbes</translation>
     </message>
     <message>
-        <location filename="../comparedialog.cpp" line="974"/>
         <source>5 Points Curves</source>
-        <translation>Courbes à 5 points</translation>
+        <translation type="obsolete">Courbes à 5 points</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="976"/>
@@ -8946,14 +8717,13 @@ m2560 for v4.1 boards</source>
         <translation>point %1</translation>
     </message>
     <message>
-        <location filename="../comparedialog.cpp" line="1004"/>
         <source>9 Points Curves</source>
-        <translation>Courbes à 9 points</translation>
+        <translation type="obsolete">Courbes à 9 points</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1072"/>
         <source>Special Functions</source>
-        <translation type="unfinished"></translation>
+        <translation>Fonctions spéciales</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1075"/>
@@ -9064,6 +8834,11 @@ m2560 for v4.1 boards</source>
         <source>Flight mode</source>
         <translation>Phase de vol</translation>
     </message>
+    <message>
+        <location filename="../comparedialog.cpp" line="1004"/>
+        <source>9 Point Curves</source>
+        <translation>Courbes à 9 points</translation>
+    </message>
     <message>
         <location filename="../comparedialog.cpp" line="1077"/>
         <location filename="../comparedialog.cpp" line="1083"/>
@@ -9073,7 +8848,7 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../comparedialog.cpp" line="1115"/>
         <source>SF</source>
-        <translation type="unfinished"></translation>
+        <translation>FS</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1202"/>
@@ -9108,13 +8883,13 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../comparedialog.cpp" line="1041"/>
         <source>Logical Switches</source>
-        <translation type="unfinished"></translation>
+        <translation>Inters logiques</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1051"/>
         <location filename="../comparedialog.cpp" line="1053"/>
         <source>LS</source>
-        <translation type="unfinished"></translation>
+        <translation>IL</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1399"/>
@@ -9130,9 +8905,8 @@ m2560 for v4.1 boards</source>
 <context>
     <name>contributorsDialog</name>
     <message>
-        <location filename="../contributorsdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation>Dialogue</translation>
+        <translation type="obsolete">Dialogue</translation>
     </message>
     <message>
         <location filename="../contributorsdialog.cpp" line="23"/>
@@ -9147,12 +8921,12 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../contributorsdialog.cpp" line="72"/>
         <source>Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)</source>
-        <translation type="unfinished"></translation>
+        <translation>Les honneurs vont à Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)</translation>
     </message>
     <message>
         <location filename="../contributorsdialog.cpp" line="90"/>
         <source>Companion Release Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Notes de version de companion</translation>
     </message>
     <message>
         <location filename="../contributorsdialog.cpp" line="73"/>
@@ -9175,37 +8949,37 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../customizesplashdialog.ui" line="23"/>
         <source>Transmitter Splash Screen Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Editeur d&apos;écran d&apos;accueil</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.ui" line="209"/>
         <location filename="../customizesplashdialog.ui" line="517"/>
         <source>Invert</source>
-        <translation type="unfinished">Inversion</translation>
+        <translation>Inverser</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.ui" line="272"/>
         <location filename="../customizesplashdialog.ui" line="583"/>
         <source>Load FW</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir le firmware</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.ui" line="282"/>
         <location filename="../customizesplashdialog.ui" line="593"/>
         <source>Load Pict</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir l&apos;image</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.ui" line="262"/>
         <location filename="../customizesplashdialog.ui" line="570"/>
         <source>Load Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Charger le profil</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.ui" line="308"/>
         <location filename="../customizesplashdialog.ui" line="619"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauvegarder</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.ui" line="232"/>
@@ -9232,12 +9006,12 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../customizesplashdialog.cpp" line="190"/>
         <source>Open Firmware File</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner le firmware</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="193"/>
         <source>Can not load embedded image from firmware file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;enregistrer l&apos;image %1 dans le firmware.</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="209"/>
@@ -9252,47 +9026,47 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../customizesplashdialog.cpp" line="213"/>
         <source>Cannot load the image file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;ouvrir l&apos;image %1.</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="228"/>
-        <source>Cannot load the profile image %1.</source>
-        <translation type="unfinished"></translation>
+        <source>Cannot load profile image %1.</source>
+        <translation>Impossible d&apos;ouvrir l&apos;image du profil %1.</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="242"/>
         <source>Cannot load the library image %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;ouvrir l&apos;image de bibliothèque %1.</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="251"/>
         <source>File Saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Fichier sauvegardé</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="251"/>
         <source>The image was saved to the file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;image a été enregistrée dans le fichier %1</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="253"/>
         <source>Image Refresh Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur de rafraîchissement de l&apos;image</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="253"/>
         <source>Failed to refresh image from file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de rafraîchir l&apos;image %1</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="257"/>
         <source>File Save Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur à la sauvegarde du fichier</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="257"/>
         <source>Failed to write image to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur à l&apos;écriture du fichier %1</translation>
     </message>
 </context>
 <context>
@@ -9310,7 +9084,7 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../downloaddialog.cpp" line="56"/>
         <source>Companion</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../downloaddialog.cpp" line="57"/>
@@ -9340,7 +9114,19 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Proper states for AtMega 2560 :&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;EEPROM erase fuse not set: D7, 11, FC&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;EEPROM erase fuse set: D7, 19, FC&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Lit l&apos;était des vusibles du processeur de la radio.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Valeurs normales pour l&apos; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;ATMega 64 &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Maintien de l&apos;EEPROM: 0E, 81, FF&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Effacement de l&apos;EEPROM: 0E, 89, FF&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Valeurs normales pour l&apos;ATMega2560:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Maintien de l&apos;EEPROM: D7, 11, FC&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Effacement de l&apos;EEPROM: D7, 19, FC&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../fusesdialog.ui" line="42"/>
@@ -9393,7 +9179,7 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;When in doubt consult either the project&apos;s page or the 9xforum (http://9xforums.com/forum/)&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;If you do get locked out - google lookup for &amp;quot;dealing with Fuse Bricks&amp;quot;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../fusesdialog.ui" line="84"/>
@@ -9439,120 +9225,79 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../fwpreferencesdialog.ui" line="26"/>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../fwpreferencesdialog.ui" line="54"/>
-        <location filename="../fwpreferencesdialog.ui" line="67"/>
-        <location filename="../fwpreferencesdialog.ui" line="80"/>
-        <location filename="../fwpreferencesdialog.ui" line="103"/>
-        <location filename="../fwpreferencesdialog.ui" line="116"/>
-        <location filename="../fwpreferencesdialog.ui" line="129"/>
-        <location filename="../fwpreferencesdialog.ui" line="142"/>
-        <location filename="../fwpreferencesdialog.ui" line="155"/>
-        <location filename="../fwpreferencesdialog.ui" line="217"/>
-        <location filename="../fwpreferencesdialog.ui" line="230"/>
-        <location filename="../fwpreferencesdialog.ui" line="243"/>
-        <location filename="../fwpreferencesdialog.ui" line="256"/>
-        <location filename="../fwpreferencesdialog.ui" line="269"/>
-        <location filename="../fwpreferencesdialog.ui" line="282"/>
-        <location filename="../fwpreferencesdialog.ui" line="295"/>
-        <location filename="../fwpreferencesdialog.ui" line="308"/>
-        <location filename="../fwpreferencesdialog.ui" line="321"/>
-        <location filename="../fwpreferencesdialog.ui" line="334"/>
-        <location filename="../fwpreferencesdialog.ui" line="347"/>
-        <location filename="../fwpreferencesdialog.ui" line="360"/>
-        <location filename="../fwpreferencesdialog.ui" line="373"/>
-        <location filename="../fwpreferencesdialog.ui" line="386"/>
-        <location filename="../fwpreferencesdialog.ui" line="399"/>
-        <location filename="../fwpreferencesdialog.ui" line="412"/>
-        <location filename="../fwpreferencesdialog.ui" line="425"/>
-        <location filename="../fwpreferencesdialog.ui" line="438"/>
-        <location filename="../fwpreferencesdialog.ui" line="451"/>
-        <location filename="../fwpreferencesdialog.ui" line="464"/>
-        <location filename="../fwpreferencesdialog.ui" line="477"/>
-        <location filename="../fwpreferencesdialog.ui" line="490"/>
-        <location filename="../fwpreferencesdialog.ui" line="503"/>
-        <location filename="../fwpreferencesdialog.ui" line="516"/>
-        <location filename="../fwpreferencesdialog.ui" line="577"/>
-        <location filename="../fwpreferencesdialog.ui" line="590"/>
-        <location filename="../fwpreferencesdialog.ui" line="617"/>
-        <location filename="../fwpreferencesdialog.ui" line="630"/>
-        <location filename="../fwpreferencesdialog.ui" line="643"/>
-        <location filename="../fwpreferencesdialog.ui" line="656"/>
-        <location filename="../fwpreferencesdialog.ui" line="669"/>
-        <location filename="../fwpreferencesdialog.ui" line="682"/>
-        <location filename="../fwpreferencesdialog.ui" line="702"/>
-        <location filename="../fwpreferencesdialog.ui" line="728"/>
-        <source>CheckBox</source>
-        <translation type="unfinished"></translation>
+        <translation>Téléchargements</translation>
     </message>
     <message>
         <location filename="../fwpreferencesdialog.ui" line="556"/>
         <source>Set language of voice.
 May be different from firmware language</source>
-        <translation type="unfinished">Langue des voix.
+        <translation>Langue des voix.
 Peut être différente de la langue du firmware</translation>
     </message>
-    <message>
-        <location filename="../fwpreferencesdialog.ui" line="689"/>
-        <source>Processor ID</source>
-        <translation type="unfinished">ID du processeur</translation>
-    </message>
-    <message>
-        <location filename="../fwpreferencesdialog.ui" line="604"/>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../fwpreferencesdialog.ui" line="87"/>
-        <source>Menu Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../fwpreferencesdialog.ui" line="543"/>
-        <source>Voice Language</source>
-        <translation type="unfinished">Langue audio</translation>
-    </message>
-    <message>
-        <location filename="../fwpreferencesdialog.ui" line="201"/>
-        <source>Firmware Type</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../fwpreferencesdialog.ui" line="564"/>
         <source>Download Voice</source>
-        <translation type="unfinished"></translation>
+        <translation>Télécharger les fichiers son</translation>
     </message>
     <message>
-        <location filename="../fwpreferencesdialog.ui" line="715"/>
-        <source>FwInfo</source>
-        <translation type="unfinished"></translation>
+        <location filename="../fwpreferencesdialog.ui" line="689"/>
+        <source>Processor ID</source>
+        <translation>ID du processeur</translation>
+    </message>
+    <message>
+        <location filename="../fwpreferencesdialog.ui" line="604"/>
+        <source>Options</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../fwpreferencesdialog.ui" line="87"/>
+        <source>Menu Language</source>
+        <translation>Langue des menus</translation>
+    </message>
+    <message>
+        <location filename="../fwpreferencesdialog.ui" line="543"/>
+        <source>Voice Language</source>
+        <translation>Langue audio</translation>
+    </message>
+    <message>
+        <source>Download Voice Files</source>
+        <translation type="obsolete">Télécharger les fichiers son</translation>
+    </message>
+    <message>
+        <location filename="../fwpreferencesdialog.ui" line="201"/>
+        <source>Firmware Type</source>
+        <translation>Type de firmware</translation>
+    </message>
+    <message>
+        <source>Set voice language.
+May be different from firmware language</source>
+        <translation type="obsolete">Choisir la langue des voix.
+Peut être différent de la langue des menus</translation>
     </message>
     <message>
         <location filename="../fwpreferencesdialog.ui" line="597"/>
         <source>Download FW</source>
-        <translation type="unfinished"></translation>
+        <translation>Télécharger le firmware</translation>
     </message>
     <message>
         <location filename="../fwpreferencesdialog.ui" line="529"/>
         <source>Check for updates</source>
-        <translation type="unfinished">Vérifier les mises à jour</translation>
+        <translation>Vérifier les mises à jour</translation>
     </message>
     <message>
         <location filename="../fwpreferencesdialog.cpp" line="193"/>
         <source>Last downloaded release: %1</source>
-        <translation type="unfinished">Dernière version téléchargée : %1</translation>
+        <translation>Dernière version téléchargée : %1</translation>
     </message>
     <message>
         <location filename="../fwpreferencesdialog.cpp" line="202"/>
         <source>The selected firmware has never been downloaded by Companion.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le firmware sélectionné n&apos;a jamais été téléchargé par companion.</translation>
     </message>
     <message>
         <location filename="../fwpreferencesdialog.cpp" line="206"/>
         <source>The selected firmware cannot be downloaded by Companion.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le firmware sélectionné ne peut pas être téléchargé par companion.</translation>
     </message>
 </context>
 <context>
@@ -9786,7 +9531,7 @@ Press cancel to abort joystick calibration</source>
     <message>
         <location filename="../logsdialog.ui" line="14"/>
         <source>Companion Log Viewer</source>
-        <translation type="unfinished"></translation>
+        <translation>Visualiseur de logs de companion</translation>
     </message>
     <message>
         <location filename="../logsdialog.ui" line="25"/>
@@ -9799,22 +9544,27 @@ Press cancel to abort joystick calibration</source>
         <translation>Ouvrir fichier de log</translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="99"/>
+        <location filename="../logsdialog.ui" line="90"/>
         <source>Zoom</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="106"/>
+        <location filename="../logsdialog.ui" line="97"/>
         <source>X</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="113"/>
+        <location filename="../logsdialog.ui" line="104"/>
         <source>Y</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="137"/>
+        <location filename="../logsdialog.ui" line="111"/>
+        <source>Reset</source>
+        <translation>Remise à zéro</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.ui" line="135"/>
         <source>Fly sessions</source>
         <translation>Sessions de vol</translation>
     </message>
@@ -9829,29 +9579,29 @@ Press cancel to abort joystick calibration</source>
         <translation>Heure</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="253"/>
+        <location filename="../logsdialog.cpp" line="254"/>
         <source>Error</source>
-        <translation type="unfinished">Erreur</translation>
+        <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="254"/>
+        <location filename="../logsdialog.cpp" line="255"/>
         <source>Cannot write file %1:
 %2.</source>
-        <translation type="unfinished">Ecriture fichier %1 impossible:
+        <translation>Ecriture fichier %1 impossible:
 %2.</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="589"/>
+        <location filename="../logsdialog.cpp" line="590"/>
         <source>Select your log file</source>
         <translation>Sélectionnez votre fichier log</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="600"/>
+        <location filename="../logsdialog.cpp" line="601"/>
         <source>Available fields</source>
         <translation>Champs disponibles</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="697"/>
+        <location filename="../logsdialog.cpp" line="698"/>
         <source>The selected logfile contains %1 invalid lines out of  %2 total lines</source>
         <translation>Le fichier de log sélectionné contient %1 lignes invalides sur %2</translation>
     </message>
@@ -9944,7 +9694,7 @@ Manche Droit:  Profondeur, Direction
     <message>
         <location filename="../imgpreferences.ui" line="94"/>
         <source>Remember simulator switches</source>
-        <translation type="unfinished"></translation>
+        <translation>Mémoriser les positions des inters du simulateur</translation>
     </message>
     <message>
         <location filename="../imgpreferences.ui" line="136"/>
@@ -9993,122 +9743,122 @@ Peut être différente de la langue du firmware</translation>
     <message>
         <location filename="../preferencesdialog.ui" line="391"/>
         <source>R E T A</source>
-        <translation type="unfinished"></translation>
+        <translation>D P G A</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="396"/>
         <source>R E A T</source>
-        <translation type="unfinished"></translation>
+        <translation>D P A G</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="401"/>
         <source>R T E A</source>
-        <translation type="unfinished"></translation>
+        <translation>D G P A</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="406"/>
         <source>R T A E</source>
-        <translation type="unfinished"></translation>
+        <translation>D G A P</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="411"/>
         <source>R A E T</source>
-        <translation type="unfinished"></translation>
+        <translation>D A P G</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="416"/>
         <source>R A T E</source>
-        <translation type="unfinished"></translation>
+        <translation>D A G P</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="421"/>
         <source>E R T A</source>
-        <translation type="unfinished"></translation>
+        <translation>P D G A</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="426"/>
         <source>E R A T</source>
-        <translation type="unfinished"></translation>
+        <translation>P D A G</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="431"/>
         <source>E T R A</source>
-        <translation type="unfinished"></translation>
+        <translation>P G D A</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="436"/>
         <source>E T A R</source>
-        <translation type="unfinished"></translation>
+        <translation>P G A D</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="441"/>
         <source>E A R T</source>
-        <translation type="unfinished"></translation>
+        <translation>P A D G</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="446"/>
         <source>E A T R</source>
-        <translation type="unfinished"></translation>
+        <translation>P A G D</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="451"/>
         <source>T R E A</source>
-        <translation type="unfinished"></translation>
+        <translation>G D P A</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="456"/>
         <source>T R A E</source>
-        <translation type="unfinished"></translation>
+        <translation>G D A P</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="461"/>
         <source>T E R A</source>
-        <translation type="unfinished"></translation>
+        <translation>G P D A</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="466"/>
         <source>T E A R</source>
-        <translation type="unfinished"></translation>
+        <translation>G P A D</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="471"/>
         <source>T A R E</source>
-        <translation type="unfinished"></translation>
+        <translation>G A D P</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="476"/>
         <source>T A E R</source>
-        <translation type="unfinished"></translation>
+        <translation>G A P D</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="481"/>
         <source>A R E T</source>
-        <translation type="unfinished"></translation>
+        <translation>A D P G</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="486"/>
         <source>A R T E</source>
-        <translation type="unfinished"></translation>
+        <translation>A D G P</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="491"/>
         <source>A E R T</source>
-        <translation type="unfinished"></translation>
+        <translation>A P D G</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="496"/>
         <source>A E T R</source>
-        <translation type="unfinished"></translation>
+        <translation>A P G D</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="501"/>
         <source>A T R E</source>
-        <translation type="unfinished"></translation>
+        <translation>A G D P</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="506"/>
         <source>A T E R</source>
-        <translation type="unfinished"></translation>
+        <translation>A G P D</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="797"/>
@@ -10137,52 +9887,6 @@ Peut être différente de la langue du firmware</translation>
         <source>Use clipboard only</source>
         <translation>Utiliser le presse-papiers</translation>
     </message>
-    <message>
-        <location filename="../preferencesdialog.ui" line="971"/>
-        <location filename="../preferencesdialog.ui" line="984"/>
-        <location filename="../preferencesdialog.ui" line="997"/>
-        <location filename="../preferencesdialog.ui" line="1010"/>
-        <location filename="../preferencesdialog.ui" line="1023"/>
-        <location filename="../preferencesdialog.ui" line="1036"/>
-        <location filename="../preferencesdialog.ui" line="1049"/>
-        <location filename="../preferencesdialog.ui" line="1062"/>
-        <location filename="../preferencesdialog.ui" line="1075"/>
-        <location filename="../preferencesdialog.ui" line="1088"/>
-        <location filename="../preferencesdialog.ui" line="1101"/>
-        <location filename="../preferencesdialog.ui" line="1114"/>
-        <location filename="../preferencesdialog.ui" line="1127"/>
-        <location filename="../preferencesdialog.ui" line="1140"/>
-        <location filename="../preferencesdialog.ui" line="1153"/>
-        <location filename="../preferencesdialog.ui" line="1166"/>
-        <location filename="../preferencesdialog.ui" line="1179"/>
-        <location filename="../preferencesdialog.ui" line="1192"/>
-        <location filename="../preferencesdialog.ui" line="1205"/>
-        <location filename="../preferencesdialog.ui" line="1218"/>
-        <location filename="../preferencesdialog.ui" line="1231"/>
-        <location filename="../preferencesdialog.ui" line="1244"/>
-        <location filename="../preferencesdialog.ui" line="1257"/>
-        <location filename="../preferencesdialog.ui" line="1270"/>
-        <location filename="../preferencesdialog.ui" line="1283"/>
-        <location filename="../preferencesdialog.ui" line="1296"/>
-        <location filename="../preferencesdialog.ui" line="1309"/>
-        <location filename="../preferencesdialog.ui" line="1322"/>
-        <location filename="../preferencesdialog.ui" line="1335"/>
-        <location filename="../preferencesdialog.ui" line="1348"/>
-        <location filename="../preferencesdialog.ui" line="1361"/>
-        <location filename="../preferencesdialog.ui" line="1374"/>
-        <location filename="../preferencesdialog.ui" line="1387"/>
-        <location filename="../preferencesdialog.ui" line="1400"/>
-        <location filename="../preferencesdialog.ui" line="1413"/>
-        <location filename="../preferencesdialog.ui" line="1426"/>
-        <location filename="../preferencesdialog.ui" line="1439"/>
-        <location filename="../preferencesdialog.ui" line="1452"/>
-        <location filename="../preferencesdialog.ui" line="1465"/>
-        <location filename="../preferencesdialog.ui" line="1478"/>
-        <location filename="../preferencesdialog.ui" line="1491"/>
-        <location filename="../preferencesdialog.ui" line="1504"/>
-        <source>CheckBox</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="../preferencesdialog.ui" line="566"/>
         <source>Check for updates</source>
@@ -10235,7 +9939,7 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
     <message>
         <location filename="../preferencesdialog.ui" line="156"/>
         <source>Show Splash At Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher l&apos;écran d&apos;accueil au démarrage</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="312"/>
@@ -10287,12 +9991,12 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
     <message>
         <location filename="../preferencesdialog.ui" line="1622"/>
         <source>Find Executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Parcourir...</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="1606"/>
         <source>Google Earth Executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Exécutable Google Earth</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="134"/>
@@ -10422,12 +10126,12 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
     <message>
         <location filename="../printdialog.cpp" line="142"/>
         <source>Trim Increment</source>
-        <translation>Incrémentation Trim</translation>
+        <translation>Pas des trims</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="177"/>
         <source>Flight mode name</source>
-        <translation>Nom del la phase de vol</translation>
+        <translation>Nom de lla phase de vol</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="279"/>
@@ -10444,17 +10148,16 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
     <message>
         <location filename="../printdialog.cpp" line="361"/>
         <source> Slow(u%1:d%2)</source>
-        <translation> Ralentissement(u%1:d%2)</translation>
+        <translation> Ralenti(h%1:b%2)</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="360"/>
         <source> Delay(u%1:d%2)</source>
-        <translation> Délai(u%1:d%2)</translation>
+        <translation> Délai(h%1:b%2)</translation>
     </message>
     <message>
-        <location filename="../printdialog.ui" line="26"/>
         <source>Dialog</source>
-        <translation>Dialogue</translation>
+        <translation type="obsolete">Dialogue</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="357"/>
@@ -10498,17 +10201,17 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
     <message>
         <location filename="../printdialog.cpp" line="137"/>
         <source>Protocol</source>
-        <translation>Codage</translation>
+        <translation>Protocole</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="138"/>
         <source>Pulse Polarity</source>
-        <translation>Modulation</translation>
+        <translation>Polarité</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="143"/>
         <source>Center Beep</source>
-        <translation>Bip de Centrage</translation>
+        <translation>Bip de centrage</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="139"/>
@@ -10520,13 +10223,13 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
     <message>
         <location filename="../printdialog.cpp" line="629"/>
         <source>Logical Switches</source>
-        <translation type="unfinished"></translation>
+        <translation>Inters logiques</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="636"/>
         <location filename="../printdialog.cpp" line="638"/>
         <source>LS</source>
-        <translation type="unfinished"></translation>
+        <translation>IL</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="689"/>
@@ -10536,7 +10239,7 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
     <message>
         <location filename="../printdialog.cpp" line="812"/>
         <source>Print Document</source>
-        <translation>Imprimer le Document</translation>
+        <translation>Imprimer le document</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="177"/>
@@ -10725,7 +10428,7 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
     <message>
         <location filename="../printdialog.cpp" line="756"/>
         <source>Blades</source>
-        <translation type="unfinished">Pales</translation>
+        <translation>Pales</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="820"/>
@@ -10740,7 +10443,7 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
     <message>
         <location filename="../printdialog.cpp" line="686"/>
         <source>Special Functions</source>
-        <translation type="unfinished"></translation>
+        <translation>Fonctions spéciales</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="691"/>
@@ -10871,17 +10574,17 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
     <message>
         <location filename="../taranisnotfound.ui" line="32"/>
         <source>No Taranis Radio Found</source>
-        <translation type="unfinished"></translation>
+        <translation>Radio Taranis non détectée</translation>
     </message>
     <message>
         <location filename="../taranisnotfound.ui" line="40"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;No Taranis Radio was found!&lt;/p&gt;&lt;p&gt;Make sure that you hold the lower trim buttons towards the center while you turn it on.&lt;/p&gt;&lt;p&gt;Then connect the USB wire.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Radio Taranis non détectée!&lt;/p&gt;&lt;p&gt;Assurez-vous de maintenir les 2 trims horizontaux pendant la mise sous tension,&lt;/p&gt;&lt;p&gt;puis connectez le câble USB.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../taranisnotfound.ui" line="92"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 </TS>
diff --git a/companion/src/wizarddialog.cpp b/companion/src/wizarddialog.cpp
index 773863d11..c211265d3 100644
--- a/companion/src/wizarddialog.cpp
+++ b/companion/src/wizarddialog.cpp
@@ -736,7 +736,7 @@ FblPage::FblPage(WizardDialog *dlg, QString image, QString title, QString text,
   rollCB = new QComboBox();
 
   QLayout *l = layout();
-  l->addWidget(new QLabel(tr("Trottle Channel:")));
+  l->addWidget(new QLabel(tr("Throttle Channel:")));
   l->addWidget(throttleCB);
   l->addWidget(new QLabel(tr("Yaw Channel:")));
   l->addWidget(yawCB);
@@ -771,7 +771,7 @@ HeliPage::HeliPage(WizardDialog *dlg, QString image, QString title, QString text
   rollCB = new QComboBox();
 
   QLayout *l = layout();
-  l->addWidget(new QLabel(tr("Trottle Channel:")));
+  l->addWidget(new QLabel(tr("Throttle Channel:")));
   l->addWidget(throttleCB);
   l->addWidget(new QLabel(tr("Yaw Channel:")));
   l->addWidget(yawCB);
@@ -806,7 +806,7 @@ MultirotorPage::MultirotorPage(WizardDialog *dlg, QString image, QString title,
   rollCB = new QComboBox();
 
   QLayout *l = layout();
-  l->addWidget(new QLabel(tr("Trottle Channel:")));
+  l->addWidget(new QLabel(tr("Throttle Channel:")));
   l->addWidget(throttleCB);
   l->addWidget(new QLabel(tr("Yaw Channel:")));
   l->addWidget(yawCB);
diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp
index df270f16a..b0d7b6b1b 100644
--- a/radio/src/gui/menu_model.cpp
+++ b/radio/src/gui/menu_model.cpp
@@ -770,8 +770,10 @@ void editName(uint8_t x, uint8_t y, char *name, uint8_t size, uint8_t event, uin
 
   uint8_t mode = 0;
   if (active) {
-    if (s_editMode <= 0) mode = INVERS+FIXEDWIDTH;
-    else mode = FIXEDWIDTH;
+    if (s_editMode <= 0)
+      mode = INVERS + FIXEDWIDTH;
+    else
+      mode = FIXEDWIDTH;
   }
   lcd_putsnAtt(x, y, name, size, ZCHAR | mode);
 
@@ -783,7 +785,7 @@ void editName(uint8_t x, uint8_t y, char *name, uint8_t size, uint8_t event, uin
 
       if (p1valdiff || IS_ROTARY_RIGHT(event) || IS_ROTARY_LEFT(event) || event==EVT_KEY_FIRST(KEY_DOWN) || event==EVT_KEY_FIRST(KEY_UP)
           || event==EVT_KEY_REPT(KEY_DOWN) || event==EVT_KEY_REPT(KEY_UP)) {
-         v = checkIncDec(event, abs(v), 0, LEN_STD_CHARS, 0);
+         v = checkIncDec(event, abs(v), 0, ZCHAR_MAX, 0);
          if (c <= 0) v = -v;
       }
 
diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp
index 4334da644..95926954a 100644
--- a/radio/src/lcd.cpp
+++ b/radio/src/lcd.cpp
@@ -1249,6 +1249,10 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
       putsTelemetryValue(x, y, div10_and_round(val), UNIT_RAW, att|PREC1);
       break;
 
+    case TELEM_ASPD-1:
+      putsTelemetryValue(x, y, val, UNIT_KTS, att);
+      break;
+
 #if defined(CPUARM)
     case TELEM_SWR-1:
 #endif
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index b6469c351..095d2a60c 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -198,7 +198,9 @@ char idx2char(int8_t idx)
   if (idx < 27) return 'A' + idx - 1;
   if (idx < 37) return '0' + idx - 27;
   if (idx <= 40) return pgm_read_byte(s_charTab+idx-37);
-  // Needed if we want the special chars ... if (idx <= ZCHAR_MAX) return 'z' + 5 + idx - 40;
+#if LEN_SPECIAL_CHARS > 0
+  if (idx <= ZCHAR_MAX) return 'z' + 5 + idx - 40;
+#endif
   return ' ';
 }
 
@@ -206,6 +208,9 @@ char idx2char(int8_t idx)
 int8_t char2idx(char c)
 {
   if (c == '_') return 37;
+#if LEN_SPECIAL_CHARS > 0
+  if (c < 0 && c+128 <= LEN_SPECIAL_CHARS) return 41 + (c+128);
+#endif
   if (c >= 'a') return 'a' - c - 1;
   if (c >= 'A') return c - 'A' + 1;
   if (c >= '0') return c - '0' + 27;
@@ -3309,10 +3314,13 @@ PLAY_FUNCTION(playValue, uint8_t idx)
       break;
 
     case MIXSRC_FIRST_TELEM+TELEM_VSPD-1:
-    case MIXSRC_FIRST_TELEM+TELEM_ASPD-1:
       PLAY_NUMBER(div10_and_round(val), 1+UNIT_METERS_PER_SECOND, PREC1);
       break;
 
+    case MIXSRC_FIRST_TELEM+TELEM_ASPD-1:
+      PLAY_NUMBER(val, 1+UNIT_KTS, 0);
+      break;
+
     case MIXSRC_FIRST_TELEM+TELEM_CONSUMPTION-1:
       PLAY_NUMBER(val, 1+UNIT_MAH, 0);
       break;
diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp
index c601a0a61..0d61587a6 100644
--- a/radio/src/telemetry/frsky_sport.cpp
+++ b/radio/src/telemetry/frsky_sport.cpp
@@ -791,6 +791,8 @@ void resetTelemetry()
   frskyData.hub.gpsSpeed_bp = 100;
   frskyData.hub.gpsSpeed_ap = 50;
 
+  frskyData.hub.airSpeed = 100;
+
   frskyData.hub.cellsCount = 6;
 
   frskyData.hub.baroAltitudeOffset = 500 * 100;
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index b19b9aa77..65eea4c2d 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -78,7 +78,7 @@
 #define TR_DATETIME            "DATE:""ZEIT:"
 
 #define LEN_VLCD               "\006"
-#define TR_VLCD                "NormalOptrex"
+#define TR_VLCD                "Normal""Optrex"
 
 #define LEN_COUNTRYCODES       TR("\002", "\007")
 #define TR_COUNTRYCODES        TR("US""JP""EU", "Amerika""Japan\0 ""Europa\0")
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index 9779382e1..6fc1521dc 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -1,4 +1,4 @@
-/*
+/*
  * Authors (alphabetical order)
  * - Andre Bernet <bernet.andre@gmail.com>
  * - Bertrand Songis <bsongis@gmail.com>
@@ -96,7 +96,7 @@
 #define TR_VTRIMINC            TR("Expo\0 ""ExFin\0""Fin\0  ""Moyen\0""Gros\0 ","Exponentiel""Extra Fin\0 ""Fin\0       ""Moyen\0     ""Grossier\0  ")
 
 #define LEN_VBEEPCOUNTDOWN     "\007"
-#define TR_VBEEPCOUNTDOWN      "Silence""Bips\0  ""Voix\0  "
+#define TR_VBEEPCOUNTDOWN      "Aucun\0 ""Bips\0  ""Voix\0  "
 
 #define LEN_CURVE_TYPES        "\010"
 #define TR_CURVE_TYPES         "Standard""Libre\0"