From ad339d32a6ae6f06fbe3764e19038c41a56b4a8f Mon Sep 17 00:00:00 2001
From: Oleg Semyonov <os-openpilot-org@os-propo.info>
Date: Thu, 28 Jul 2011 23:26:07 +0300
Subject: [PATCH] gcs: some cosmetic ui text changes

---
 ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui  | 2 +-
 .../src/plugins/config/config_cc_hw_widget.cpp            | 8 ++++----
 .../openpilotgcs/src/plugins/config/configinputwidget.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
index 03d49c965..29052623c 100644
--- a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
+++ b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
@@ -167,7 +167,7 @@
            </font>
           </property>
           <property name="text">
-           <string>Changes on this page require an Hw reboot to be applied</string>
+           <string>Changes on this page only take effect after board reset or power cycle</string>
           </property>
           <property name="wordWrap">
            <bool>true</bool>
diff --git a/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp b/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
index 03296210b..62e2d59e2 100644
--- a/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
@@ -67,19 +67,19 @@ void ConfigCCHWWidget::widgetsContentsChanged()
     }
     else if((m_telemetry->cbTele->currentText()=="Spektrum" ||m_telemetry->cbFlexi->currentText()=="Spektrum") && m_telemetry->receiverType->currentText()!="Spektrum")
     {
-        m_telemetry->problems->setText("Warning: you have at least one port configured as 'Spektrum' however that is not your selected input type");
+        m_telemetry->problems->setText("Warning: you have a port configured as 'Spektrum' however that is not your selected receiver type");
     }
     else if(m_telemetry->cbTele->currentText()=="S.Bus"  && m_telemetry->receiverType->currentText()!="S.Bus")
     {
-        m_telemetry->problems->setText("Warning: you have at least one port configured as 'S.Bus' however that is not your selected input type");
+        m_telemetry->problems->setText("Warning: you have a port configured as 'S.Bus' however that is not your selected receiver type");
     }
     else if(m_telemetry->cbTele->currentText()!="S.Bus"  && m_telemetry->receiverType->currentText()=="S.Bus")
     {
-        m_telemetry->problems->setText("Warning: you have selected 'S.Bus' as your input type however you have no port configured for that protocol");
+        m_telemetry->problems->setText("Warning: you have selected 'S.Bus' as your receiver type however you have no port configured for that protocol");
     }
     else if((m_telemetry->cbTele->currentText()!="Spektrum" && m_telemetry->cbFlexi->currentText()!="Spektrum") && m_telemetry->receiverType->currentText()=="Spektrum")
     {
-        m_telemetry->problems->setText("Warning: you have at selected 'Spektrum' as your input type however you have no port configured for that protocol");
+        m_telemetry->problems->setText("Warning: you have selected 'Spektrum' as your receiver type however you have no port configured for that protocol");
     }
     else
     {
diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
index 2ca678eae..83e1a02ac 100644
--- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
@@ -698,7 +698,7 @@ void ConfigInputWidget::receiverHelp()
         unassigned.append("FlightMode");
     }
     if(unassigned.length()>0)
-        m_config->lblMissingInputs->setText(QString("Channels left to assign:")+unassigned);
+        m_config->lblMissingInputs->setText(QString("Channels left to assign: ")+unassigned);
     else
         m_config->lblMissingInputs->setText("");
 }