summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/user-manual.txt4
-rw-r--r--Documentation/user-manual_fr.txt2
-rw-r--r--core/deco.c2
-rw-r--r--core/dive.c4
-rw-r--r--core/units.h2
-rw-r--r--desktop-widgets/configuredivecomputerdialog.ui2
-rw-r--r--desktop-widgets/maintab.cpp2
-rw-r--r--desktop-widgets/preferences/preferences_graph.ui2
-rw-r--r--printing_templates/Flowlayout.html2
-rw-r--r--printing_templates/One Dive.html2
-rw-r--r--printing_templates/Six Dives.html2
-rw-r--r--printing_templates/Two Dives.html2
-rw-r--r--printing_templates/statistics/Default.html18
-rw-r--r--profile-widget/profilewidget2.cpp2
-rw-r--r--qt-models/cylindermodel.cpp8
-rw-r--r--qt-models/diveplannermodel.cpp2
-rw-r--r--qt-models/divetripmodel.cpp2
-rw-r--r--theme/dive_export.html2
18 files changed, 31 insertions, 31 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index e30a4aea4..aedea9d20 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -3319,7 +3319,7 @@ image::images/Pref4_f23.jpg["FIGURE: Preferences Graph page",align="center"]
respect to inert gas loading and the deeper the ceilings are. Gradient
factors of 20/60 are considered conservative and values of 70/90 are considered
harsh.
- In addition decide whether to check the _GFLow at max depth_ box. If checked, GF_Low is used for the
+ In addition decide whether to check the _GFLow at max. depth_ box. If checked, GF_Low is used for the
deepest dive depth and linearly increased up to the GF_High value at the surface. If unchecked,
GF_Low is used between the deepest dive depth and the first deco stop, after which the
gradient factor linearly increases up to the GF_High value at the surface. For more information see:
@@ -4556,7 +4556,7 @@ according to which spreadsheet program is used.
Organize the diving data in the spreadsheet, so the first row
contains the names (or titles) of each column and the information for each dive is stored in a single row.
_Subsurface_ supports many data items (Dive number, Date,
-Time, Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight and Tags).
+Time, Duration, Location, GPS, Max. Depth, Mean Depth, Buddy, Notes, Weight and Tags).
Organize dive data following a few simple rules:
1. Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy
diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt
index 12d5bba5c..c4805b6ae 100644
--- a/Documentation/user-manual_fr.txt
+++ b/Documentation/user-manual_fr.txt
@@ -3498,7 +3498,7 @@ image::images/Pref4_f23.jpg["FIGURE: Preferences Graph page", align="center"]
respect to inert gas loading and the deeper the ceilings are. Gradient
factors of 20/60 are considered conservative and values of 70/90 are considered
harsh.
- In addition decide whether to check the _GFLow at max depth_ box. If checked, GF_Low is used for the
+ In addition decide whether to check the _GFLow at max. depth_ box. If checked, GF_Low is used for the
deepest dive depth and linearly increased up to the GF_High value at the surface. If unchecked,
GF_Low is used between the deepest dive depth and the first deco stop, after which the
gradient factor linearly increases up to the GF_High value at the surface. For more information see:
diff --git a/core/deco.c b/core/deco.c
index 8247800da..d2678a922 100644
--- a/core/deco.c
+++ b/core/deco.c
@@ -43,7 +43,7 @@ struct buehlmann_config {
double gf_high; //! gradient factor high (at surface).
double gf_low; //! gradient factor low (at bottom/start of deco calculation).
double gf_low_position_min; //! gf_low_position below surface_min_shallow.
- bool gf_low_at_maxdepth; //! if true, gf_low applies at max depth instead of at deepest ceiling.
+ bool gf_low_at_maxdepth; //! if true, gf_low applies at max. depth instead of at deepest ceiling.
};
struct buehlmann_config buehlmann_config = {
diff --git a/core/dive.c b/core/dive.c
index d7b423ad8..79e89d559 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -663,7 +663,7 @@ void finish_sample(struct divecomputer *dc)
* new ones.
*
* Why? Because a dive computer may well actually track the
- * max depth and mean depth at finer granularity than the
+ * max. depth and mean depth at finer granularity than the
* samples it stores. So it's possible that the max and mean
* have been reported more correctly originally.
*
@@ -2440,7 +2440,7 @@ static int find_sample_offset(struct divecomputer *a, struct divecomputer *b)
* difference?
*
* So for example, we'd expect different dive computers to give different
- * max depth readings. You might have them on different arms, and they
+ * max. depth readings. You might have them on different arms, and they
* have different pressure sensors and possibly different ideas about
* water salinity etc.
*
diff --git a/core/units.h b/core/units.h
index 029bb64fa..c751328f1 100644
--- a/core/units.h
+++ b/core/units.h
@@ -53,7 +53,7 @@ extern "C" {
* Also strive to use units that can not possibly be mistaken for a
* valid value in a "normal" system without conversion. If the max
* depth of a dive is '20000', you probably didn't convert from mm on
- * output, or if the max depth gets reported as "0.2ft" it was either
+ * output, or if the max. depth gets reported as "0.2ft" it was either
* a really boring dive, or there was some missing input conversion,
* and a 60-ft dive got recorded as 60mm.
*
diff --git a/desktop-widgets/configuredivecomputerdialog.ui b/desktop-widgets/configuredivecomputerdialog.ui
index 4a4c3521f..3b78387df 100644
--- a/desktop-widgets/configuredivecomputerdialog.ui
+++ b/desktop-widgets/configuredivecomputerdialog.ui
@@ -1693,7 +1693,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_18">
<property name="text">
- <string>Max depth</string>
+ <string>Max. depth</string>
</property>
</widget>
</item>
diff --git a/desktop-widgets/maintab.cpp b/desktop-widgets/maintab.cpp
index b5a156d68..4c5122762 100644
--- a/desktop-widgets/maintab.cpp
+++ b/desktop-widgets/maintab.cpp
@@ -1086,7 +1086,7 @@ void MainTab::acceptChanges()
}
if (editMode == ADD || editMode == MANUALLY_ADDED_DIVE) {
// we just added or edited the dive, let fixup_dive() make
- // sure we get the max depth right
+ // sure we get the max. depth right
current_dive->maxdepth.mm = current_dc->maxdepth.mm = 0;
fixup_dive(current_dive);
set_dive_nr_for_current_dive();
diff --git a/desktop-widgets/preferences/preferences_graph.ui b/desktop-widgets/preferences/preferences_graph.ui
index 3e175b985..5deacc1fd 100644
--- a/desktop-widgets/preferences/preferences_graph.ui
+++ b/desktop-widgets/preferences/preferences_graph.ui
@@ -253,7 +253,7 @@
<item row="4" column="2" colspan="2">
<widget class="QCheckBox" name="gf_low_at_maxdepth">
<property name="text">
- <string>GFLow at max depth</string>
+ <string>GFLow at max. depth</string>
</property>
</widget>
</item>
diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index a4a155a37..3409b04a9 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -129,7 +129,7 @@
</tr>
<tr>
<td class="fieldTitle">
- <h1> Max depth </h1>
+ <h1> Max. depth </h1>
</td>
<td class="fieldData">
<p> {{ dive.depth }} </p>
diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index 8cfc12799..7f7945396 100644
--- a/printing_templates/One Dive.html
+++ b/printing_templates/One Dive.html
@@ -142,7 +142,7 @@
</tr>
<tr>
<td class="fieldTitle">
- <h1> Max depth </h1>
+ <h1> Max. depth </h1>
</td>
<td class="fieldData">
<p> {{ dive.depth }} </p>
diff --git a/printing_templates/Six Dives.html b/printing_templates/Six Dives.html
index 1d4bb5b56..0fe48a628 100644
--- a/printing_templates/Six Dives.html
+++ b/printing_templates/Six Dives.html
@@ -136,7 +136,7 @@
<tr>
<td>
<h1> Dive # {{ dive.number }} - {{ dive.date }} {{ dive.time }}</h1>
- <p style="float:right;"> Max depth: {{ dive.depth }} </p>
+ <p style="float:right;"> Max. depth: {{ dive.depth }} </p>
</td>
</tr>
<tr>
diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html
index e82781758..02fb436c1 100644
--- a/printing_templates/Two Dives.html
+++ b/printing_templates/Two Dives.html
@@ -151,7 +151,7 @@
</tr>
<tr>
<td class="fieldTitle">
- <h1> Max depth </h1>
+ <h1> Max. depth </h1>
</td>
<td class="fieldData">
<p> {{ dive.depth }} </p>
diff --git a/printing_templates/statistics/Default.html b/printing_templates/statistics/Default.html
index 4ec02766a..28991c09a 100644
--- a/printing_templates/statistics/Default.html
+++ b/printing_templates/statistics/Default.html
@@ -59,17 +59,17 @@
<td>Year</td>
<td>Dives</td>
<td>Total Time</td>
- <td>Avg Time</td>
+ <td>Avg. Time</td>
<td>Shortest Time</td>
<td>Longest Time</td>
- <td>Avg Depth</td>
- <td>Min Depth</td>
- <td>Max Depth</td>
- <td>Avg SAC</td>
- <td>Min SAC</td>
- <td>Max SAC</td>
- <td>Min Temp</td>
- <td>Max Temp</td>
+ <td>Avg. Depth</td>
+ <td>Min. Depth</td>
+ <td>Max. Depth</td>
+ <td>Avg. SAC</td>
+ <td>Min. SAC</td>
+ <td>Max. SAC</td>
+ <td>Min. Temp</td>
+ <td>Max. Temp</td>
</tr>
{% block main_rows %}
{% for year in years %}
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index caa3523fa..7da9e8d59 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -639,7 +639,7 @@ void ProfileWidget2::plotDive(struct dive *d, bool force)
if (shouldCalculateMaxTime || newMaxtime > maxtime)
maxtime = newMaxtime;
- /* Only update the max depth if it's bigger than the current ones
+ /* Only update the max. depth if it's bigger than the current ones
* when we are dragging the handler to plan / add dive.
* otherwhise, update normally.
*/
diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp
index 843792ae7..4ae98da5b 100644
--- a/qt-models/cylindermodel.cpp
+++ b/qt-models/cylindermodel.cpp
@@ -256,10 +256,10 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const
ret = tr("Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.");
break;
case MOD:
- ret = tr("Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.");
+ ret = tr("Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.");
break;
case MND:
- ret = tr("Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.");
+ ret = tr("Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.");
break;
}
break;
@@ -383,7 +383,7 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
if (CHANGED()) {
if (QString::compare(vString.toUtf8().data(), "*") == 0) {
cyl->bestmix_o2 = true;
- // Calculate fO2 for max depth
+ // Calculate fO2 for max. depth
cyl->gasmix.o2 = best_o2(displayed_dive.maxdepth, &displayed_dive);
} else {
cyl->bestmix_o2 = false;
@@ -400,7 +400,7 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
if (CHANGED()) {
if (QString::compare(vString.toUtf8().data(), "*") == 0) {
cyl->bestmix_he = true;
- // Calculate fO2 for max depth
+ // Calculate fO2 for max. depth
cyl->gasmix.he = best_he(displayed_dive.maxdepth, &displayed_dive);
} else {
cyl->bestmix_he = false;
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index c858fd6f1..96b58c267 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -152,7 +152,7 @@ void DivePlannerPointsModel::setupCylinders()
CylindersModel::instance()->copyFromDive(&displayed_dive);
}
-// Update the dive's maximum depth. Returns true if max depth changed
+// Update the dive's maximum depth. Returns true if max. depth changed
bool DivePlannerPointsModel::updateMaxDepth()
{
int prevMaxDepth = displayed_dive.maxdepth.mm;
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp
index e36fced55..435d72a0b 100644
--- a/qt-models/divetripmodel.cpp
+++ b/qt-models/divetripmodel.cpp
@@ -246,7 +246,7 @@ QVariant DiveItem::data(int column, int role) const
retVal = tr("OTU");
break;
case MAXCNS:
- retVal = tr("Max CNS");
+ retVal = tr("Max. CNS");
break;
case PHOTOS:
retVal = tr("Photos before/during/after dive");
diff --git a/theme/dive_export.html b/theme/dive_export.html
index 2620ce12a..64617b5a0 100644
--- a/theme/dive_export.html
+++ b/theme/dive_export.html
@@ -214,7 +214,7 @@ function changeAdvSearch(e){
<div id="time_header" onClick="change_sort_col('3')" class="item">Time</div>
<div id="location_header" onClick="change_sort_col('6')" class="item_large">Location</div>
<div id="duration_header" onClick="change_sort_col('4')" class="item">Duration</div>
- <div id="maxdepth_header" onClick="change_sort_col('5')" class="item">Max Depth</div>
+ <div id="maxdepth_header" onClick="change_sort_col('5')" class="item">Max. Depth</div>
</div>
<div id="diveslist">
</div>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-26 19:47:23 +0000