Consistent representation of O₂

Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tim Wootton 2014-11-25 15:47:23 +00:00 committed by Dirk Hohndel
parent 81fce5ad19
commit f72ec5e29b
4 changed files with 12 additions and 12 deletions

View file

@ -121,7 +121,7 @@ static void handle_event(struct divecomputer *dc, struct sample *sample, dc_samp
QT_TRANSLATE_NOOP("gettextFromC", "transmitter"), QT_TRANSLATE_NOOP("gettextFromC", "violation"), QT_TRANSLATE_NOOP("gettextFromC", "bookmark"), QT_TRANSLATE_NOOP("gettextFromC", "surface"), QT_TRANSLATE_NOOP("gettextFromC", "safety stop"),
QT_TRANSLATE_NOOP("gettextFromC", "gaschange"), QT_TRANSLATE_NOOP("gettextFromC", "safety stop (voluntary)"), QT_TRANSLATE_NOOP("gettextFromC", "safety stop (mandatory)"),
QT_TRANSLATE_NOOP("gettextFromC", "deepstop"), QT_TRANSLATE_NOOP("gettextFromC", "ceiling (safety stop)"), QT_TRANSLATE_NOOP3("gettextFromC", "below floor", "event showing dive is below deco floor and adding deco time"), QT_TRANSLATE_NOOP("gettextFromC", "divetime"),
QT_TRANSLATE_NOOP("gettextFromC", "maxdepth"), QT_TRANSLATE_NOOP("gettextFromC", "OLF"), QT_TRANSLATE_NOOP("gettextFromC", "PO2"), QT_TRANSLATE_NOOP("gettextFromC", "airtime"), QT_TRANSLATE_NOOP("gettextFromC", "rgbm"), QT_TRANSLATE_NOOP("gettextFromC", "heading"),
QT_TRANSLATE_NOOP("gettextFromC", "maxdepth"), QT_TRANSLATE_NOOP("gettextFromC", "OLF"), QT_TRANSLATE_NOOP("gettextFromC", "pO₂"), QT_TRANSLATE_NOOP("gettextFromC", "airtime"), QT_TRANSLATE_NOOP("gettextFromC", "rgbm"), QT_TRANSLATE_NOOP("gettextFromC", "heading"),
QT_TRANSLATE_NOOP("gettextFromC", "tissue level warning"), QT_TRANSLATE_NOOP("gettextFromC", "gaschange"), QT_TRANSLATE_NOOP("gettextFromC", "non stop time")
};
const int nr_events = sizeof(events) / sizeof(const char *);

View file

@ -913,7 +913,7 @@
</column>
<column>
<property name="text">
<string>%O2</string>
<string>%O</string>
</property>
</column>
<column>
@ -998,7 +998,7 @@
</column>
<column>
<property name="text">
<string>%O2</string>
<string>%O</string>
</property>
</column>
<column>
@ -1121,7 +1121,7 @@
<item row="2" column="2">
<widget class="QLabel" name="label_35">
<property name="text">
<string>O2 in calibration gas</string>
<string>O in calibration gas</string>
</property>
</widget>
</item>
@ -1213,14 +1213,14 @@
<item row="4" column="2">
<widget class="QLabel" name="label_29">
<property name="text">
<string>ppO₂ max</string>
<string>pO₂ max</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QLabel" name="label_30">
<property name="text">
<string>ppO₂ min</string>
<string>pO₂ min</string>
</property>
</widget>
</item>
@ -2119,7 +2119,7 @@
</column>
<column>
<property name="text">
<string>%O2</string>
<string>%O</string>
</property>
</column>
<column>
@ -2204,7 +2204,7 @@
</column>
<column>
<property name="text">
<string>%O2</string>
<string>%O</string>
</property>
</column>
<column>
@ -2352,14 +2352,14 @@
<item row="3" column="2">
<widget class="QLabel" name="label_60">
<property name="text">
<string>ppO₂ max</string>
<string>pO₂ max</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLabel" name="label_61">
<property name="text">
<string>ppO₂ min</string>
<string>pO₂ min</string>
</property>
</widget>
</item>

View file

@ -118,7 +118,7 @@
<item row="3" column="0">
<widget class="QCheckBox" name="po2CheckBox">
<property name="text">
<string>PO2</string>
<string>pO₂</string>
</property>
</widget>
</item>

View file

@ -75,7 +75,7 @@ CylindersModel::CylindersModel(QObject *parent) : changed(false),
rows(0)
{
// enum {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH};
setHeaderDataStrings(QStringList() << "" << tr("Type") << tr("Size") << tr("Work press.") << tr("Start press.") << tr("End press.") << trUtf8("O" UTF8_SUBSCRIPT_2 "%") << tr("He%")
setHeaderDataStrings(QStringList() << "" << tr("Type") << tr("Size") << tr("Work press.") << tr("Start press.") << tr("End press.") << tr("O₂%") << tr("He%")
<< tr("Switch at") << tr("Use"));
initTrashIcon();