rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

OP-1337_French_translations_updates Changes/Updates in uavconfiginfo.cpp (not sure is currently used)

Browse Source
This commit is contained in:
Laurent Lalanne 2014-05-28 20:43:38 +02:00
parent 94150fc2d3
commit 534a3d2282
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts
View File

@ -4443,7 +4443,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>Core::UAVConfigInfo</name> <name>Core::UAVConfigInfo</name>
<message> <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> <source>Do you want to continue the import?</source>
<translation>Voulez-vous continuer l&apos;importation ?</translation> <translation>Voulez-vous continuer l&apos;importation ?</translation>
</message> </message>
@ -4452,8 +4452,28 @@ p, li { white-space: pre-wrap; }
<source>INFO: </source> <source>INFO: </source>
<translation>INFO : </translation> <translation>INFO : </translation>
</message> </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> <message>
<location line="+6"/> <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> <source>WARNING: </source>
<translation>ATTENTION : </translation> <translation>ATTENTION : </translation>
</message> </message>
@ -4464,8 +4484,12 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+13"/> <location line="+13"/>
<source> Unknown compatibility level: </source>
<translation type="unfinished"> Niveau de compatibilité inconnu : </translation>
</message>
<message>
<source>Unknown compatibility level: </source> <source>Unknown compatibility level: </source>
<translation>Niveau de compatibilité inconnu : </translation> <translation type="vanished">Niveau de compatibilité inconnu : </translation>
</message> </message>
</context> </context>
<context> <context>

29
ground/openpilotgcs/src/plugins/coreplugin/uavconfiginfo.cpp
View File

@ -109,25 +109,6 @@
#define VERSION_DEFAULT "0.0.0" #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; using namespace Core;
UAVConfigInfo::UAVConfigInfo(QObject *parent) : UAVConfigInfo::UAVConfigInfo(QObject *parent) :
@ -188,32 +169,32 @@ bool UAVConfigInfo::askToAbort(int compat, QString message)
return false; return false;
case MinorLossOfConfiguration: 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); msgBox.setDefaultButton(QMessageBox::Ok);
result = msgBox.exec(); result = msgBox.exec();
break; break;
case MissingConfiguration: 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); msgBox.setDefaultButton(QMessageBox::Ok);
result = msgBox.exec(); result = msgBox.exec();
break; break;
case MajorLossOfConfiguration: 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); msgBox.setDefaultButton(QMessageBox::Cancel);
result = msgBox.exec(); result = msgBox.exec();
break; break;
case NotCompatible: 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.setInformativeText(tr(""));
msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.exec(); msgBox.exec();
return true; return true;
default: 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) { if (result == QMessageBox::Ok) {
return false; return false;