From 82d91d9830f761917064a865e6981d0efd0560f2 Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Tue, 3 Jan 2012 12:46:38 -0600
Subject: [PATCH] Talked PT into a simpler firmware mismatch warning in
 exchange for more photoshop.

---
 .../src/plugins/uploader/uploadergadgetwidget.cpp         | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
index c0a1aea90..73bc0c535 100755
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
@@ -627,10 +627,8 @@ void UploaderGadgetWidget::versionMatchCheck()
         qDebug()<<QDate::fromString(boardDescription.buildDate.mid(0,8),"yyyyMMdd");
         qDebug()<<QDate::fromString(gcsDescription.mid(gcsDescription.indexOf(" ")+1,8),"yyyyMMdd");
         qDebug()<<QDate::fromString(boardDescription.buildDate.mid(0,8),"yyyyMMdd").daysTo(QDate::fromString(gcsDescription.mid(gcsDescription.indexOf(" ")+1,8),"yyyyMMdd"));
-        if(QDate::fromString(boardDescription.buildDate.mid(0,8),"yyyyMMdd").daysTo(QDate::fromString(gcsDescription.mid(gcsDescription.indexOf(" ")+1,8),"yyyyMMdd"))>0)
-            msg->showMessage(QString("Incompatible GCS and FW detected, you should upgrade your board's Firmware to %1 version.").arg(gcsDescription));
-        else
-            msg->showMessage(QString("Incompatible GCS and FW detected, you should upgrade your GCS to %1 version.").arg(boardDescription.gitTag+":"+boardDescription.buildDate));
-
+        msg->showMessage(QString(tr("GCS and FW versions do not match which can cause configuration problems.")) + "  \n" +
+                                 QString(tr("GCS Versions: ")) + gcsDescription + "  \n" +
+                                 QString(tr("FW Versions: ")) + boardDescription.gitTag+":"+boardDescription.buildDate);
     }
   }