Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Arie Klerk 2016-04-15 09:05:49 +01:00
commit f43bba10df

View File

@ -2905,7 +2905,7 @@ void PRS1Loader::initChannels()
"PRS1HeatedTubing", "PRS1HeatedTubing",
QObject::tr("Heated Tubing"), QObject::tr("Heated Tubing"),
QObject::tr("Heated Tubing Connected"), QObject::tr("Heated Tubing Connected"),
QObject::tr("Headed Tubing"), QObject::tr("Heated Tubing"),
"", LOOKUP, Qt::green)); "", LOOKUP, Qt::green));
chan->addOption(0, QObject::tr("Yes")); chan->addOption(0, QObject::tr("Yes"));
chan->addOption(1, QObject::tr("No")); chan->addOption(1, QObject::tr("No"));