From 02e45c5eea490737f0c97ac5e18b3240476c48d4 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Wed, 16 Apr 2014 11:07:07 +0200 Subject: [PATCH] Translation/typo cleanup finished --- .../firmwares/opentx/open9xStockeeprom.cpp | 2 +- .../src/firmwares/opentx/opentxinterface.cpp | 40 +++++++++---------- companion/src/wizarddialog.cpp | 4 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/companion/src/firmwares/opentx/open9xStockeeprom.cpp b/companion/src/firmwares/opentx/open9xStockeeprom.cpp index 44c16e78b..8c8d1abc3 100644 --- a/companion/src/firmwares/opentx/open9xStockeeprom.cpp +++ b/companion/src/firmwares/opentx/open9xStockeeprom.cpp @@ -89,7 +89,7 @@ t_Open9xExpoData_v201::operator ExpoData () c9x.mode = mode; c9x.chn = chn; if (expo!=0 && curve!=0) { - EEPROMWarnings += ::QObject::tr("Simultaneous usage of expo and curves is no longer supported in open9x") + "\n"; + EEPROMWarnings += ::QObject::tr("Simultaneous usage of expo and curves is no longer supported in OpenTX") + "\n"; } else { if (curve == 0) { diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 595faacd6..f033a0ed8 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -1035,13 +1035,13 @@ void RegisterOpen9xFirmwares() // NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol")); open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules")); open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); - open9x->addOption("ppmus", QObject::tr("PPM values displayed in us")); + open9x->addOption("ppmus", QObject::tr("Channel values displayed in us")); open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); open9x->addOption("symlimits", QObject::tr("Symetrical Limits")); open9x->addOptions(nav_options); open9x->addOption("sp22", QObject::tr("SmartieParts 2.2 Backlight support")); - open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving some of them")); - open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving some of them")); + open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); + open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time")); open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); open9x->addOption("battgraph", QObject::tr("Battery graph")); @@ -1072,13 +1072,13 @@ void RegisterOpen9xFirmwares() // NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol")); open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules")); open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); - open9x->addOption("ppmus", QObject::tr("PPM values displayed in us")); + open9x->addOption("ppmus", QObject::tr("Channel values displayed in us")); open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); open9x->addOption("symlimits", QObject::tr("Symetrical Limits")); open9x->addOptions(nav_options); open9x->addOption("sp22", QObject::tr("SmartieParts 2.2 Backlight support")); - open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving some of them")); - open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving some of them")); + open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); + open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time")); open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); open9x->addOption("battgraph", QObject::tr("Battery graph")); @@ -1104,12 +1104,12 @@ void RegisterOpen9xFirmwares() // NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol")); open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules")); open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); - open9x->addOption("ppmus", QObject::tr("PPM values displayed in us")); + open9x->addOption("ppmus", QObject::tr("Channel values displayed in us")); open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); open9x->addOption("symlimits", QObject::tr("Symetrical Limits")); open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation")); - open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving some of them")); - open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving some of them")); + open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); + open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); open9x->addOption("battgraph", QObject::tr("Battery graph")); open9x->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items")); @@ -1138,12 +1138,12 @@ void RegisterOpen9xFirmwares() // NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol")); open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules")); open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); - open9x->addOption("ppmus", QObject::tr("PPM values displayed in us")); + open9x->addOption("ppmus", QObject::tr("Channel values displayed in us")); open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); open9x->addOption("symlimits", QObject::tr("Symetrical Limits")); open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation")); - open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving some of them")); - open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving some of them")); + open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); + open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); open9x->addOption("battgraph", QObject::tr("Battery graph")); open9x->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items")); @@ -1167,12 +1167,12 @@ void RegisterOpen9xFirmwares() Option dsm2_options[] = { { "DSM2", QObject::tr("Support for DSM2 modules"), 0 }, { "DSM2PPM", QObject::tr("Support for DSM2 modules using ppm instead of true serial"), 0 }, { NULL } }; open9x->addOptions(dsm2_options); open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); - open9x->addOption("ppmus", QObject::tr("PPM values displayed in us")); + open9x->addOption("ppmus", QObject::tr("Channel values displayed in us")); open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); open9x->addOption("symlimits", QObject::tr("Symetrical Limits")); open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation")); - open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving some of them")); - open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving some of them")); + open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); + open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time")); open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); open9x->addOption("battgraph", QObject::tr("Battery graph")); @@ -1192,12 +1192,12 @@ void RegisterOpen9xFirmwares() open9x->addOption("nofp", QObject::tr("No flight modes")); open9x->addOption("nocurves", QObject::tr("Disable curves menus")); open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); - open9x->addOption("ppmus", QObject::tr("PPM values displayed in us")); + open9x->addOption("ppmus", QObject::tr("Channel values displayed in us")); open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); open9x->addOption("symlimits", QObject::tr("Symetrical Limits")); open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation")); - open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving some of them")); - open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving some of them")); + open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); + open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time")); open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); open9x->addOption("battgraph", QObject::tr("Battery graph")); @@ -1214,7 +1214,7 @@ void RegisterOpen9xFirmwares() open9x->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support")); open9x->addOption("notemplates", QObject::tr("Disable TEMPLATES menu")); open9x->addOption("nogvars", QObject::tr("Disable Global variables")); - open9x->addOption("ppmus", QObject::tr("PPM values displayed in us")); + open9x->addOption("ppmus", QObject::tr("Channel values displayed in us")); open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font")); open9x->addOptions(fai_options); firmwares.push_back(open9x); @@ -1224,7 +1224,7 @@ void RegisterOpen9xFirmwares() open9x->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support")); open9x->addOption("notemplates", QObject::tr("Disable TEMPLATES menu")); open9x->addOption("nogvars", QObject::tr("Disable Global variables")); - open9x->addOption("ppmus", QObject::tr("PPM values displayed in us")); + open9x->addOption("ppmus", QObject::tr("Channel values displayed in us")); open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font")); open9x->addOptions(fai_options); firmwares.push_back(open9x); diff --git a/companion/src/wizarddialog.cpp b/companion/src/wizarddialog.cpp index 0553212a4..25232bf10 100644 --- a/companion/src/wizarddialog.cpp +++ b/companion/src/wizarddialog.cpp @@ -72,7 +72,7 @@ void WizardDialog::showHelp() "The control surface of a delta wing controls both roll and pitch. This surface is called an elevon. "); break; case Page_Ailerons: message = tr("Models use one or two channels to control the ailerons.
" - "A so called Y-cable can be used to connect single receiver channel to two separeate aileron servos. " + "A so called Y-cable can be used to connect a single receiver channel to two separate aileron servos. " "If your servos are connected by a Y-cable you should select the single-servo option.

" "Aileron - Spektrum: CH2, Futaba: CH1"); break; case Page_Flaps: @@ -83,7 +83,7 @@ void WizardDialog::showHelp() "They are very uncommon on other types of planes."); break; case Page_Bank: message = tr("Models use one or two channels to control the elevons.
" - "A so called Y-cable can be used to connect single receiver channel to two separeate elevon servos. " + "A so called Y-cable can be used to connect single a receiver channel to two separate elevon servos. " "If your servos are connected by a Y-cable you should select the single-servo option."); break; case Page_Rudder: message = tr("Select the receiver channel that is connected to your rudder.

"