From 534a3d22829e383a6da0d5ee07943dea0e719dc1 Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh>
Date: Wed, 28 May 2014 20:43:38 +0200
Subject: [PATCH] OP-1337_French_translations_updates Changes/Updates in
 uavconfiginfo.cpp (not sure is currently used)

---
 .../translations/openpilotgcs_fr.ts           | 28 ++++++++++++++++--
 .../src/plugins/coreplugin/uavconfiginfo.cpp  | 29 ++++---------------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts
index 675d948fc..1fe357ad0 100644
--- a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts
+++ b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts
@@ -4443,7 +4443,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Core::UAVConfigInfo</name>
     <message>
-        <location filename="../../../src/plugins/coreplugin/uavconfiginfo.cpp" line="+181"/>
+        <location filename="../../../src/plugins/coreplugin/uavconfiginfo.cpp" line="+162"/>
         <source>Do you want to continue the import?</source>
         <translation>Voulez-vous continuer l&apos;importation ?</translation>
     </message>
@@ -4452,8 +4452,28 @@ p, li { white-space: pre-wrap; }
         <source>INFO: </source>
         <translation>INFO : </translation>
     </message>
+    <message>
+        <location line="+0"/>
+        <source> Some of the configured features might not be supported by your version of the plugin. You might want to upgrade the plugin.</source>
+        <translation type="unfinished"> Certaines des fonctionnalités configurées pourraient ne pas être prises en charge par votre version du plugin. Vous pourriez peut-être mettre à jour le plugin.</translation>
+    </message>
     <message>
         <location line="+6"/>
+        <source> Some configuration is missing in the imported config and will be replaced by default settings.</source>
+        <translation type="unfinished"> Certains paramètres sont manquants dans la configuration importée et seront remplacés par les paramètres par défaut.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source> Major features can&apos;t be imported by your version of the plugin. You should upgrade the plugin to import these settings.</source>
+        <translation type="unfinished"> Des paramètres primordiaux ne peuvent être importés par votre version du plugin. Vous devriez mettre à jour le plugin pour importer ces paramètres.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source> The imported settings are not compatible with this plugin and won&apos;t be imported!</source>
+        <translation type="unfinished"> Les paramètres importés ne sont pas compatibles avec ce plugin et ne seront pas importés !</translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>WARNING: </source>
         <translation>ATTENTION : </translation>
     </message>
@@ -4464,8 +4484,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
+        <source> Unknown compatibility level: </source>
+        <translation type="unfinished"> Niveau de compatibilité inconnu : </translation>
+    </message>
+    <message>
         <source>Unknown compatibility level: </source>
-        <translation>Niveau de compatibilité inconnu : </translation>
+        <translation type="vanished">Niveau de compatibilité inconnu : </translation>
     </message>
 </context>
 <context>
diff --git a/ground/openpilotgcs/src/plugins/coreplugin/uavconfiginfo.cpp b/ground/openpilotgcs/src/plugins/coreplugin/uavconfiginfo.cpp
index fdc7716cb..3716fe4b5 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/uavconfiginfo.cpp
+++ b/ground/openpilotgcs/src/plugins/coreplugin/uavconfiginfo.cpp
@@ -109,25 +109,6 @@
 
 #define VERSION_DEFAULT "0.0.0"
 
-#define TEXT_MINOR_LOSS_OF_CONFIGURATION \
-    tr( \
-        " Some of the configured features might not be supported \
-by your version of the plugin. You might want to upgrade the plugin.")
-
-#define TEXT_MISSING_CONFIGURATION \
-    tr( \
-        " Some configuration is missing in the imported config and will be replaced \
-by default settings.")
-
-#define TEXT_MAJOR_LOSS_OF_CONFIGURATION \
-    tr( \
-        " Major features can't be imported \
-by your version of the plugin. You should upgrade the plugin to import these settings.")
-
-#define TEXT_NOT_COMPATIBLE \
-    tr( \
-        " The imported settings are not compatible with this plugin and won't be imported!")
-
 using namespace Core;
 
 UAVConfigInfo::UAVConfigInfo(QObject *parent) :
@@ -188,32 +169,32 @@ bool UAVConfigInfo::askToAbort(int compat, QString message)
         return false;
 
     case MinorLossOfConfiguration:
-        msgBox.setText(tr("INFO: ") + message + TEXT_MINOR_LOSS_OF_CONFIGURATION);
+        msgBox.setText(tr("INFO: ") + message + tr(" Some of the configured features might not be supported by your version of the plugin. You might want to upgrade the plugin."));
         msgBox.setDefaultButton(QMessageBox::Ok);
         result = msgBox.exec();
         break;
 
     case MissingConfiguration:
-        msgBox.setText(tr("WARNING: ") + message + TEXT_MISSING_CONFIGURATION);
+        msgBox.setText(tr("WARNING: ") + message + tr(" Some configuration is missing in the imported config and will be replaced by default settings."));
         msgBox.setDefaultButton(QMessageBox::Ok);
         result = msgBox.exec();
         break;
 
     case MajorLossOfConfiguration:
-        msgBox.setText(tr("ERROR: ") + message + TEXT_MAJOR_LOSS_OF_CONFIGURATION);
+        msgBox.setText(tr("ERROR: ") + message + tr(" Major features can't be imported by your version of the plugin. You should upgrade the plugin to import these settings."));
         msgBox.setDefaultButton(QMessageBox::Cancel);
         result = msgBox.exec();
         break;
 
     case NotCompatible:
-        msgBox.setText("ERROR: " + message + TEXT_NOT_COMPATIBLE);
+        msgBox.setText("ERROR: " + message + tr(" The imported settings are not compatible with this plugin and won't be imported!"));
         msgBox.setInformativeText(tr(""));
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.exec();
         return true;
 
     default:
-        msgBox.setText("INTERNAL ERROR: " + message + tr("Unknown compatibility level: " + compat));
+        msgBox.setText("INTERNAL ERROR: " + message + tr(" Unknown compatibility level: " + compat));
     }
     if (result == QMessageBox::Ok) {
         return false;