From 71bb81a999bbc8aafa46fec59771cc2c279b0235 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Sun, 19 Jul 2015 21:19:54 +0200 Subject: [PATCH 1/5] LP-48 Update strings --- .../src/plugins/config/cc_hw_settings.ui | 2 +- .../src/plugins/config/configrevohwwidget.ui | 2 +- .../src/plugins/config/defaultattitude.ui | 2 +- ground/openpilotgcs/src/plugins/config/input.ui | 2 +- ground/openpilotgcs/src/plugins/config/output.ui | 2 +- .../openpilotgcs/src/plugins/config/stabilization.ui | 2 +- .../src/plugins/coreplugin/aboutdialog.cpp | 6 +++--- .../src/plugins/coreplugin/generalsettings.cpp | 2 +- .../src/plugins/coreplugin/generalsettings.ui | 4 ++-- .../src/plugins/coreplugin/mainwindow.cpp | 2 +- .../setupwizard/pages/airframeinitialtuningpage.ui | 2 +- .../src/plugins/setupwizard/pages/airspeedpage.cpp | 6 +++--- .../setupwizard/pages/biascalibrationpage.cpp | 4 ++-- .../plugins/setupwizard/pages/biascalibrationpage.ui | 2 +- .../src/plugins/setupwizard/pages/controllerpage.ui | 4 ++-- .../plugins/setupwizard/pages/esccalibrationpage.ui | 2 +- .../src/plugins/setupwizard/pages/fixedwingpage.cpp | 4 ++-- .../src/plugins/setupwizard/pages/gpspage.cpp | 2 +- .../src/plugins/setupwizard/pages/helipage.ui | 2 +- .../src/plugins/setupwizard/pages/inputpage.ui | 6 +++--- .../src/plugins/setupwizard/pages/multipage.cpp | 4 ++-- .../setupwizard/pages/notyetimplementedpage.ui | 2 +- .../src/plugins/setupwizard/pages/opendpage.ui | 2 +- .../src/plugins/setupwizard/pages/opstartpage.ui | 4 ++-- .../setupwizard/pages/outputcalibrationpage.ui | 2 +- .../src/plugins/setupwizard/pages/savepage.cpp | 4 ++-- .../src/plugins/setupwizard/pages/savepage.ui | 6 +++--- .../src/plugins/setupwizard/pages/servopage.ui | 2 +- .../src/plugins/setupwizard/pages/summarypage.ui | 8 ++++---- .../src/plugins/setupwizard/pages/surfacepage.cpp | 4 ++-- .../src/plugins/setupwizard/pages/surfacepage.ui | 2 +- .../src/plugins/setupwizard/pages/vehiclepage.ui | 4 ++-- .../src/plugins/setupwizard/setupwizard.cpp | 2 +- .../src/plugins/uploader/devicewidget.cpp | 4 ++-- .../src/plugins/uploader/uploadergadgetwidget.cpp | 8 ++++---- .../src/plugins/usagetracker/usagetrackerplugin.cpp | 12 ++++++------ 36 files changed, 65 insertions(+), 65 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui index e7c7ddf10..ed7a8e079 100644 --- a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui +++ b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui @@ -595,7 +595,7 @@ - Send to OpenPilot but don't write in SD. + Send to board but don't write in SD. Beware of not locking yourself out! diff --git a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.ui b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.ui index 6534e3cbb..d09ef0373 100644 --- a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.ui +++ b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.ui @@ -868,7 +868,7 @@ - Send to OpenPilot but don't write in SD. + Send to board but don't write in SD. Beware of not locking yourself out! diff --git a/ground/openpilotgcs/src/plugins/config/defaultattitude.ui b/ground/openpilotgcs/src/plugins/config/defaultattitude.ui index ebb726ae1..1a3dac383 100644 --- a/ground/openpilotgcs/src/plugins/config/defaultattitude.ui +++ b/ground/openpilotgcs/src/plugins/config/defaultattitude.ui @@ -32,7 +32,7 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt; font-weight:600;">Attitude Calibration</span></p> <p style="-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:'Ubuntu'; font-size:11pt; font-weight:600;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">This panel will be updated to provide the relevant controls to let you calibrate your OpenPilot unit, depending on the board which is detected once telemetry is connected and running.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">This panel will be updated to provide the relevant controls to let you calibrate your unit, depending on the board which is detected once telemetry is connected and running.</span></p> <p style="-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:'Ubuntu'; font-size:11pt;"><br /></p></body></html> diff --git a/ground/openpilotgcs/src/plugins/config/input.ui b/ground/openpilotgcs/src/plugins/config/input.ui index 2bf8f1aac..fd770ccfe 100644 --- a/ground/openpilotgcs/src/plugins/config/input.ui +++ b/ground/openpilotgcs/src/plugins/config/input.ui @@ -2438,7 +2438,7 @@ Set to 0 to disable (recommended for soaring fixed wings). - Send to OpenPilot but don't write in SD. + Send to board but don't write in SD. Be sure to set the Neutral position on all sliders before sending! diff --git a/ground/openpilotgcs/src/plugins/config/output.ui b/ground/openpilotgcs/src/plugins/config/output.ui index 50cc0edea..1f5c9577f 100644 --- a/ground/openpilotgcs/src/plugins/config/output.ui +++ b/ground/openpilotgcs/src/plugins/config/output.ui @@ -955,7 +955,7 @@ - Send to OpenPilot but don't write in SD. + Send to board but don't write in SD. Be sure to set the Neutral position on all sliders before sending! diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index aa5b3b553..42dc19125 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -20743,7 +20743,7 @@ font:bold; Qt::StrongFocus - <html><head/><body><p>In AxisLock mode, this setting controls how many degrees per second you can request with the stick before OpenPilot stops trying to gently hold its position and goes into normal rate mode. This setting works almost like a dead band. Default value should work fine.</p></body></html> + <html><head/><body><p>In AxisLock mode, this setting controls how many degrees per second you can request with the stick before flight controller stops trying to gently hold its position and goes into normal rate mode. This setting works almost like a dead band. Default value should work fine.</p></body></html> diff --git a/ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.cpp b/ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.cpp index 53869391d..e50cbae47 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.cpp @@ -45,7 +45,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) { setWindowIcon(QIcon(":/core/images/librepilot_logo_32.png")); - setWindowTitle(tr("About LibrePilot")); + setWindowTitle(tr("About %1").arg(ORG_BIG_NAME)); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setMinimumSize(600, 400); setMaximumSize(800, 600); @@ -58,7 +58,7 @@ AboutDialog::AboutDialog(QWidget *parent) : "Built on %4 at %5
" "Based on Qt %6 (%7 bit)
" "
" - "© %8, %9. All rights reserved.
" + "© The %8 Project, %9. All rights reserved.
" "© The OpenPilot Project 2010-2015. All rights reserved.
" ).arg( VersionInfo::revision().left(60), // %1 @@ -68,7 +68,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QLatin1String(__TIME__), // %5 QLatin1String(QT_VERSION_STR), // %6 QString::number(QSysInfo::WordSize), // %7 - QLatin1String(GCS_AUTHOR), // %8 + QLatin1String(ORG_BIG_NAME), // %8 VersionInfo::year() // %9 ); diff --git a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp index b2168834f..23a126968 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp @@ -233,7 +233,7 @@ void GeneralSettings::setLanguage(const QString &locale) if (m_language != locale) { if (!locale.isEmpty()) { QMessageBox::information((QWidget *)Core::ICore::instance()->mainWindow(), tr("Restart required"), - tr("The language change will take effect after a restart of the OpenPilot GCS.")); + tr("The language change will take effect after a restart of the %1 GCS.").arg(ORG_BIG_NAME)); } m_language = locale; } diff --git a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.ui b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.ui index 87518212b..4bd13909d 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.ui +++ b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.ui @@ -66,7 +66,7 @@ - Automatically connect an OpenPilot USB device: + Automatically connect an USB device: true @@ -236,7 +236,7 @@ - Automatically select an OpenPilot USB device: + Automatically select an USB device: true diff --git a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp index 61063a75f..f37d29b03 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp @@ -134,7 +134,7 @@ MainWindow::MainWindow() : #endif m_toggleFullScreenAction(0) { - setWindowTitle(tr("LibrePilot GCS ") + VersionInfo::label()); + setWindowTitle(tr("%1 GCS ").arg(ORG_BIG_NAME) + VersionInfo::label()); #ifndef Q_WS_MAC qApp->setWindowIcon(QIcon(":/core/images/librepilot_logo_128.png")); #endif diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.ui index 061cefe2b..cd2ef811a 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.ui @@ -22,7 +22,7 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> <p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Initial Tuning</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2,sans-serif'; font-size:10pt;">This section of the OpenPilot Wizard allows you to select a set of initial tuning parameters for your airframe. Presented below is a list of common airframe types, select the one that matches your airframe the closest, if unsure select the generic variant.</span></p></body></html> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2,sans-serif'; font-size:10pt;">This section of the Wizard allows you to select a set of initial tuning parameters for your airframe. Presented below is a list of common airframe types, select the one that matches your airframe the closest, if unsure select the generic variant.</span></p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp index f4843db01..b2bf377d2 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp @@ -60,14 +60,14 @@ bool AirSpeedPage::validatePage(SelectionItem *selectedItem) void AirSpeedPage::setupSelection(Selection *selection) { - selection->setTitle(tr("OpenPilot Airspeed Sensor Selection")); + selection->setTitle(tr("Airspeed Sensor Selection")); selection->setText(tr("This part of the wizard will help you select and configure a way to obtain " - "airspeed data. OpenPilot support three methods to achieve this, one is a " + "airspeed data. Current firmware support three methods to achieve this, one is a " "software estimation technique and the other two utilize hardware sensors.\n\n" "Note: if previously selected input combinations use the Flexi-port for input, " "only estimated airspeed will be available.\n\n")); selection->addItem(tr("Estimated"), - tr("This option uses an intelligent estimation algorithm which utilizes the OpenPilot INS/GPS " + tr("This option uses an intelligent estimation algorithm which utilizes the INS/GPS " "to estimate wind speed and subtract it from ground speed obtained from the GPS.\n\n" "This solution is highly accurate in normal level flight with the drawback of being less " "accurate in rapid altitude changes.\n\n"), diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/biascalibrationpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/biascalibrationpage.cpp index e5b2ca62f..1a4a8cebb 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/biascalibrationpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/biascalibrationpage.cpp @@ -71,8 +71,8 @@ void BiasCalibrationPage::performCalibration() { if (!getWizard()->getConnectionManager()->isConnected()) { QMessageBox msgBox; - msgBox.setText(tr("An OpenPilot controller must be connected to your computer to perform bias " - "calculations.\nPlease connect your OpenPilot controller to your computer and try again.")); + msgBox.setText(tr("A compatible flight controller must be connected to your computer to perform bias " + "calculations.\nPlease connect your flight controller to your computer and try again.")); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok); msgBox.exec(); diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/biascalibrationpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/biascalibrationpage.ui index d7d6f8f9f..96dd9903a 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/biascalibrationpage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/biascalibrationpage.ui @@ -21,7 +21,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">OpenPilot Sensor Calibration Procedure</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Sensor Calibration Procedure</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The wizard needs to get information from the controller to determine in which position the vehicle is normally considered to be level. To be able to successfully perform these measurements, you need to place the vehicle on a surface that is as flat and level as possible. Examples of such surfaces could be a table top or the floor. Be careful to ensure that the vehicle really is level, since this step will affect the accelerometer and gyro bias in the controller software.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">To perform the calibration, please push the Calculate button and wait for the process to finish.</span></p></body></html> diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui index a6d0c5b3a..8567880ee 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui @@ -33,8 +33,8 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">OpenPilot Board Identification</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">To continue, the wizard needs to determine the configuration required for the type of OpenPilot controller you have. When connected, the wizard will attempt to automatically detect the type of board.</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Board Identification</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">To continue, the wizard needs to determine the configuration required for the type of flight controller you have. When connected, the wizard will attempt to automatically detect the type of board.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">If the board is already connected and successfully detected, the board type will already be displayed. You can </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">Disconnect</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;"> and select another device if you need to detect another board.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">If your board is not connected, please connect the board to a USB port on your computer and select the device from the list below. Then press </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">Connect</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">.</span></p></body></html> diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/esccalibrationpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/esccalibrationpage.ui index 75d8f871d..edcf4a614 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/esccalibrationpage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/esccalibrationpage.ui @@ -33,7 +33,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">OpenPilot ESC Calibration Procedure</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">ESC Calibration Procedure</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">As you have selected to use a MultiRotor and Fast / Flashed ESCs, we need to calibrate the endpoints of these ESCs so they can see the full throttle range sent from the flight controller.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">This part of the wizard will tell you to connect the battery to your aircraft, before doing so you absolutely </span><span style=" font-size:10pt; font-weight:600; color:#f30f1d;">must remove the propellers from all motors</span><span style=" font-size:10pt;">. </span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The steps to perform this calibration are as follows:</span></p> diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp index 0209fba25..ba564cfdc 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp @@ -48,8 +48,8 @@ bool FixedWingPage::validatePage(SelectionItem *selectedItem) void FixedWingPage::setupSelection(Selection *selection) { - selection->setTitle(tr("OpenPilot Fixed-wing Configuration")); - selection->setText(tr("This part of the wizard will set up the OpenPilot controller for use with a fixed-wing " + selection->setTitle(tr("Fixed-wing Configuration")); + selection->setText(tr("This part of the wizard will set up the flight controller for use with a fixed-wing " "flying aircraft utilizing servos. The wizard supports the most common types of fixed-wing " "aircraft, other variants of fixed-wing aircraft can be configured by using custom " "configuration options in the Configuration plugin in the GCS.\n\n" diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/gpspage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/gpspage.cpp index 914a63b31..448d4bb91 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/gpspage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/gpspage.cpp @@ -51,7 +51,7 @@ bool GpsPage::validatePage(SelectionItem *selectedItem) void GpsPage::setupSelection(Selection *selection) { - selection->setTitle(tr("OpenPilot GPS Selection")); + selection->setTitle(tr("GPS Selection")); selection->setText(tr("Please select the type of GPS you wish to use. As well as OpenPilot hardware, " "3rd party GPSs are supported also, although please note that performance could " "be less than optimal as not all GPSs are created equal.\n\n" diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/helipage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/helipage.ui index 6e9b1440e..e17af5e38 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/helipage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/helipage.ui @@ -23,7 +23,7 @@ - <html><head/><body><p align="center"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">The Helicopter section of the OpenPilot Setup Wizard is not yet implemented</span><br/></p></body></html> + <html><head/><body><p align="center"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">The Helicopter section of the Setup Wizard is not yet implemented</span><br/></p></body></html> Qt::AlignHCenter|Qt::AlignTop diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.ui index 20e165462..64cc961ee 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.ui @@ -24,9 +24,9 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">OpenPilot Input Signal Configuration</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The OpenPilot controller supports many different types of input signals. Please select the type of input that matches your receiver configuration. If you are unsure, just leave the default option selected and continue the wizard.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Some input options require the OpenPilot controller to be rebooted before the changes can take place. If an option that requires a reboot is selected, you will be instructed to do so on the next page of this wizard.</span></p></body></html> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Input Signal Configuration</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The flight controller supports many different types of input signals. Please select the type of input that matches your receiver configuration. If you are unsure, just leave the default option selected and continue the wizard.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Some input options require the flight controller to be rebooted before the changes can take place. If an option that requires a reboot is selected, you will be instructed to do so on the next page of this wizard.</span></p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp index 8a53a417f..d7fb00bd0 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp @@ -49,8 +49,8 @@ bool MultiPage::validatePage(SelectionItem *selectedItem) void MultiPage::setupSelection(Selection *selection) { - selection->setTitle(tr("OpenPilot Multirotor Configuration")); - selection->setText(tr("This part of the wizard will set up the OpenPilot controller for use with a flying platform utilizing multiple rotors. " + selection->setTitle(tr("Multirotor Configuration")); + selection->setText(tr("This part of the wizard will set up the flight controller for use with a flying platform utilizing multiple rotors. " "The wizard supports the most common types of multirotors. Other variants of multirotors can be configured by using custom " "configuration options in the Configuration plugin in the GCS.\n\n" "Please select the type of multirotor you want to create a configuration for below:")); diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/notyetimplementedpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/notyetimplementedpage.ui index f6e73819b..843bb7119 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/notyetimplementedpage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/notyetimplementedpage.ui @@ -23,7 +23,7 @@ - <html><head/><body><p align="center"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">This section of the OpenPilot Setup Wizard is not yet implemented</span></p></body></html> + <html><head/><body><p align="center"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">This section of the Setup Wizard is not yet implemented</span></p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/opendpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/opendpage.ui index 80061c291..6c383eade 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/opendpage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/opendpage.ui @@ -29,7 +29,7 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> <p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Congratulations!</span></p> <p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Setup wizard is completed.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">This part of the setup procedure is now complete and you are one step away from completing the setup of your OpenPilot controller.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">This part of the setup procedure is now complete and you are one step away from completing the setup of your flight controller.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">To complete the setup please click the button below to close this wizard and go directly to the Transmitter Setup Wizard.</span></p></body></html> diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/opstartpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/opstartpage.ui index 0c5e39ece..798269d56 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/opstartpage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/opstartpage.ui @@ -39,8 +39,8 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Welcome to the OpenPilot Setup Wizard</span><img src=":/setupwizard/resources/wizard.png" style="float: right;" /></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">This wizard will guide you through the basic steps required to setup your OpenPilot controller for the first time. You will be asked questions about your platform (multirotor/heli/fixed-wing) which this wizard will use to configure your controller for its first flight.</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Welcome to the Setup Wizard</span><img src=":/setupwizard/resources/wizard.png" style="float: right;" /></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">This wizard will guide you through the basic steps required to setup your flight controller for the first time. You will be asked questions about your platform (multirotor/heli/fixed-wing) which this wizard will use to configure your controller for its first flight.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">This wizard does not configure all of the advanced settings available in the GCS Configuration. All basic and advanced configuration parameters can be modified later by using the GCS Configuration plugin.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.ui index f8bb50966..7cb7c96a9 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.ui @@ -67,7 +67,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:10pt;">It is now time to calibrate the output levels for the signals controlling your vehicle. </span></p> <p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:10pt; font-weight:600; color:#ff0000;">VERY IMPORTANT!</span><span style=" font-family:'Lucida Grande'; font-size:10pt;"><br /></span><span style=" font-family:'Lucida Grande'; font-size:10pt; font-weight:600; color:#ff0000;">REMOVE ALL PROPELLERS FROM THE VEHICLE BEFORE PROCEEDING!</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:10pt;">Connect all components according to the illustration on the summary page, and provide power using an external power supply such as a battery before continuing.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:10pt;">Depending on what vehicle you have selected, both the motors controlled by ESCs and/or servos controlled directly by the OpenPilot controller may have to be calibrated. The following steps will guide you safely through this process. </span></p></body></html> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:10pt;">Depending on what vehicle you have selected, both the motors controlled by ESCs and/or servos controlled directly by the flight controller may have to be calibrated. The following steps will guide you safely through this process. </span></p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.cpp index 85900d02a..8ab43e761 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.cpp @@ -58,8 +58,8 @@ void SavePage::writeToController() { if (!getWizard()->getConnectionManager()->isConnected()) { QMessageBox msgBox; - msgBox.setText(tr("An OpenPilot controller must be connected to your computer to save the " - "configuration.\nPlease connect your OpenPilot controller to your computer and try again.")); + msgBox.setText(tr("A compatible flight controller must be connected to your computer to save the " + "configuration.\nPlease connect your flight controller to your computer and try again.")); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok); msgBox.exec(); diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.ui index dbb57eb5c..b7c6e75d0 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.ui @@ -21,9 +21,9 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">OpenPilot configuration ready to save</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The wizard is now ready to save the configuration directly to your OpenPilot controller. </span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">If any of the selections made in this wizard require a reboot of the controller, then power cycling the OpenPilot controller board will have to be performed after you save in this step.</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Configuration ready to save</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The wizard is now ready to save the configuration directly to your flight controller. </span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">If any of the selections made in this wizard require a reboot of the controller, then power cycling the flight controller board will have to be performed after you save in this step.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Press the Save button to save the configuration.</span></p></body></html> diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/servopage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/servopage.ui index 68a1847ac..ed2efcbfb 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/servopage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/servopage.ui @@ -21,7 +21,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">OpenPilot Output Signal Configuration</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Output Signal Configuration</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">To set an optimal configuration of the output signals powering your servos, the wizard needs to know what type of servos you will use and what their capabilities are.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Please select one of the options below. If you are unsure about the capabilities of your servos, just leave the default option selected and continue the wizard.</span></p></body></html> diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/summarypage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/summarypage.ui index 3f4a08f8f..c53a64c21 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/summarypage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/summarypage.ui @@ -21,10 +21,10 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">OpenPilot Configuration Summary</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The first part of this wizard is now complete. All information required to create a basic OpenPilot controller configuration for a specific vehicle has been collected.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Below is a summary of the configuration and a button that links to a diagram illustrating how to connect required hardware and the OpenPilot Controller with the current configuration.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The following steps require that your OpenPilot controller is connected according to the diagram, remains connected to the computer by USB, and that you have a battery ready but </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">do not</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;"> connect it right now, you will be told when to in later steps of this wizard.</span></p></body></html> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Configuration Summary</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The first part of this wizard is now complete. All information required to create a basic flight controller configuration for a specific vehicle has been collected.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Below is a summary of the configuration and a button that links to a diagram illustrating how to connect required hardware and the flight controller with the current configuration.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The following steps require that your flight controller is connected according to the diagram, remains connected to the computer by USB, and that you have a battery ready but </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">do not</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;"> connect it right now, you will be told when to in later steps of this wizard.</span></p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/surfacepage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/surfacepage.cpp index 789335f36..405f1a4c9 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/surfacepage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/surfacepage.cpp @@ -48,8 +48,8 @@ bool SurfacePage::validatePage(SelectionItem *selectedItem) void SurfacePage::setupSelection(Selection *selection) { - selection->setTitle(tr("OpenPilot Ground Vehicle Configuration")); - selection->setText(tr("This part of the wizard will set up the OpenPilot controller for use with a ground " + selection->setTitle(tr("Ground Vehicle Configuration")); + selection->setText(tr("This part of the wizard will set up the flight controller for use with a ground " "vehicle utilizing servos. The wizard supports the most common types of ground vehicle, " "other variants can be configured by using custom configuration options in the " "Configuration plugin in the GCS.\n\n" diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/surfacepage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/surfacepage.ui index 3889fec6d..068205184 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/surfacepage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/surfacepage.ui @@ -23,7 +23,7 @@ - <html><head/><body><p align="center"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">The Surface Vehicle section of the OpenPilot Setup Wizard is not yet implemented</span><br/></p></body></html> + <html><head/><body><p align="center"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">The Surface Vehicle section of the Setup Wizard is not yet implemented</span><br/></p></body></html> Qt::AlignHCenter|Qt::AlignTop diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui index 09aa66250..aa840107f 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui @@ -22,9 +22,9 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> <p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Vehicle Type Selection</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">To continue, the wizard needs to know what type of vehicle the OpenPilot controller board is going to be used with. This step is crucial since much of the following configuration is unique per vehicle type.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">To continue, the wizard needs to know what type of vehicle the flight controller board is going to be used with. This step is crucial since much of the following configuration is unique per vehicle type.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Go ahead and select the type of vehicle for which you want to create a configuration.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The current version only provides functionality for Multirotors and Fixed-wing aircraft.</span></p></body></html> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The current version only provides functionality for Multirotors, Fixed-wing aircraft and Ground vehicle.</span></p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp index 28b33f15f..2f512fa82 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp @@ -61,7 +61,7 @@ SetupWizard::SetupWizard(QWidget *parent) : QWizard(parent), VehicleConfiguratio m_vehicleTemplate(NULL), m_calibrationPerformed(false), m_restartNeeded(false), m_connectionManager(NULL) { - setWindowTitle(tr("OpenPilot Setup Wizard")); + setWindowTitle(tr("Setup Wizard")); setOption(QWizard::IndependentPages, false); for (quint16 i = 0; i < ActuatorSettings::CHANNELMAX_NUMELEM; i++) { m_actuatorSettings << actuatorChannelSettings(); diff --git a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp index c99bd286d..3d2b38e5b 100644 --- a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp @@ -320,11 +320,11 @@ void DeviceWidget::loadFirmware(QString fwfilename) myDevice->statusLabel->setText(tr("The loaded firmware is untagged or custom build. Update only if it was received from a trusted source (official website or your own build).")); px.load(QString(":/uploader/images/warning.svg")); } else { - myDevice->statusLabel->setText(tr("This is the tagged officially released OpenPilot firmware.")); + myDevice->statusLabel->setText(tr("This is the tagged officially released firmware.")); px.load(QString(":/uploader/images/gtk-info.svg")); } } else { - myDevice->statusLabel->setText(tr("WARNING: the loaded firmware was not packaged with the OpenPilot format. Do not update unless you know what you are doing.")); + myDevice->statusLabel->setText(tr("WARNING: the loaded firmware was not packaged with the right format. Do not update unless you know what you are doing.")); px.load(QString(":/uploader/images/error.svg")); myDevice->confirmCheckBox->setChecked(false); myDevice->confirmCheckBox->setVisible(true); diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp index 2897b7e2c..81e5a879e 100644 --- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp @@ -893,7 +893,7 @@ void UploaderGadgetWidget::systemRescue() // Check if boards are connected and, if yes, prompt user to disconnect them all if (USBMonitor::instance()->availableDevices(0x20a0, -1, -1, -1).length() > 0) { - QString labelText = QString("

%1

").arg(tr("Please disconnect your OpenPilot board.")); + QString labelText = QString("

%1

").arg(tr("Please disconnect your board.")); int result = ConnectionWaiter::openDialog(tr("System Rescue"), labelText, 0, BOARD_EVENT_TIMEOUT, this); switch (result) { case ConnectionWaiter::Canceled: @@ -908,7 +908,7 @@ void UploaderGadgetWidget::systemRescue() } // Now prompt user to connect board - QString labelText = QString("

%1
%2

").arg(tr("Please connect your OpenPilot board.")).arg(tr("Board must be connected to the USB port!")); + QString labelText = QString("

%1
%2

").arg(tr("Please connect your board.")).arg(tr("Board must be connected to the USB port!")); int result = ConnectionWaiter::openDialog(tr("System Rescue"), labelText, 1, BOARD_EVENT_TIMEOUT, this); switch (result) { case ConnectionWaiter::Canceled: @@ -1063,14 +1063,14 @@ void UploaderGadgetWidget::autoUpdateStatus(uploader::ProgressStep status, QVari switch (status) { case uploader::WAITING_DISCONNECT: - m_config->autoUpdateLabel->setText(tr("Waiting for all OpenPilot boards to be disconnected from USB.")); + m_config->autoUpdateLabel->setText(tr("Waiting for all boards to be disconnected from USB.")); m_config->autoUpdateProgressBar->setMaximum(BOARD_EVENT_TIMEOUT / 1000); m_config->autoUpdateProgressBar->setValue(value.toInt()); remaining = m_config->autoUpdateProgressBar->maximum() - m_config->autoUpdateProgressBar->value(); m_config->autoUpdateProgressBar->setFormat(tr("Timing out in %1 seconds").arg(remaining)); break; case uploader::WAITING_CONNECT: - m_config->autoUpdateLabel->setText(tr("Please connect the OpenPilot board to the USB port.")); + m_config->autoUpdateLabel->setText(tr("Please connect the board to the USB port.")); m_config->autoUpdateProgressBar->setMaximum(BOARD_EVENT_TIMEOUT / 1000); m_config->autoUpdateProgressBar->setValue(value.toInt()); remaining = m_config->autoUpdateProgressBar->maximum() - m_config->autoUpdateProgressBar->value(); diff --git a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp index c561ab41f..b21b7132e 100644 --- a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp +++ b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp @@ -81,11 +81,11 @@ void UsageTrackerPlugin::onAutopilotConnect() message.setIcon(QMessageBox::Information); message.addButton(tr("Yes, count me in"), QMessageBox::AcceptRole); message.addButton(tr("No, I will not help"), QMessageBox::RejectRole); - message.setText(tr("Openpilot GCS has a function to collect limited anonymous information about " - "the usage of the application itself and the OpenPilot hardware connected to it.

" + message.setText(tr("LibrePilot GCS has a function to collect limited anonymous information about " + "the usage of the application itself and the hardware connected to it.

" "The intention is to not include anything that can be considered sensitive " "or a threat to the users integrity. The collected information will be sent " - "using a secure protocol to an OpenPilot web service and stored in a database " + "using a secure protocol to an LibrePilot web service and stored in a database " "for later analysis and statistical purposes.
" "No information will be sold or given to any third party. The sole purpose is " "to collect statistics about the usage of our software and hardware to enable us " @@ -93,7 +93,7 @@ void UsageTrackerPlugin::onAutopilotConnect() "The following things are collected: