summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--desktop-widgets/divelogimportdialog.cpp6
-rw-r--r--qt-models/divetripmodel.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp
index 2c87c1188..5e65c8944 100644
--- a/desktop-widgets/divelogimportdialog.cpp
+++ b/desktop-widgets/divelogimportdialog.cpp
@@ -480,9 +480,9 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
QString units = "Metric";
dl7 = true;
while ((firstLine = f.readLine().trimmed()).length() > 0 && !f.atEnd()) {
- /* DL7 actually defines individual units (e.g. depth, temp, pressure, etc.)
- * and there are quite a few other options as well, but let's use metric
- * unless depth unit is clearly Imperial. */
+ /* DL7 actually defines individual units (e.g. depth, temperature,
+ * pressure, etc.) and there are quite a few other options as well,
+ * but let's use metric unless depth unit is clearly Imperial. */
if (firstLine.contains("ThFt")) {
units = "Imperial";
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp
index 677a2cf97..e36fced55 100644
--- a/qt-models/divetripmodel.cpp
+++ b/qt-models/divetripmodel.cpp
@@ -223,7 +223,7 @@ QVariant DiveItem::data(int column, int role) const
retVal = tr("Duration");
break;
case TEMPERATURE:
- retVal = tr("Temp(%1%2)").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F");
+ retVal = tr("Temp.(%1%2)").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F");
break;
case TOTALWEIGHT:
retVal = tr("Weight(%1)").arg((get_units()->weight == units::KG) ? tr("kg") : tr("lbs"));
@@ -445,7 +445,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
ret = tr("Duration");
break;
case TEMPERATURE:
- ret = tr("Temp");
+ ret = tr("Temp.");
break;
case TOTALWEIGHT:
ret = tr("Weight");
@@ -494,7 +494,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
ret = tr("Duration");
break;
case TEMPERATURE:
- ret = tr("Temp(%1%2)").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F");
+ ret = tr("Temp.(%1%2)").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F");
break;
case TOTALWEIGHT:
ret = tr("Weight(%1)").arg((get_units()->weight == units::KG) ? tr("kg") : tr("lbs"));