Use abbreviations with dots.

This commit is contained in:
Martin Měřinský 2017-03-06 13:27:39 +01:00 committed by Dirk Hohndel
parent bdb83fd9b5
commit dcf2542215
18 changed files with 31 additions and 31 deletions

View file

@ -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 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 factors of 20/60 are considered conservative and values of 70/90 are considered
harsh. 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, 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 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: 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 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. 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, _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: 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 1. Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy

View file

@ -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 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 factors of 20/60 are considered conservative and values of 70/90 are considered
harsh. 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, 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 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: gradient factor linearly increases up to the GF_High value at the surface. For more information see:

View file

@ -43,7 +43,7 @@ struct buehlmann_config {
double gf_high; //! gradient factor high (at surface). double gf_high; //! gradient factor high (at surface).
double gf_low; //! gradient factor low (at bottom/start of deco calculation). double gf_low; //! gradient factor low (at bottom/start of deco calculation).
double gf_low_position_min; //! gf_low_position below surface_min_shallow. 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 = { struct buehlmann_config buehlmann_config = {

View file

@ -663,7 +663,7 @@ void finish_sample(struct divecomputer *dc)
* new ones. * new ones.
* *
* Why? Because a dive computer may well actually track the * 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 * samples it stores. So it's possible that the max and mean
* have been reported more correctly originally. * have been reported more correctly originally.
* *
@ -2440,7 +2440,7 @@ static int find_sample_offset(struct divecomputer *a, struct divecomputer *b)
* difference? * difference?
* *
* So for example, we'd expect different dive computers to give different * 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 * have different pressure sensors and possibly different ideas about
* water salinity etc. * water salinity etc.
* *

View file

@ -53,7 +53,7 @@ extern "C" {
* Also strive to use units that can not possibly be mistaken for a * Also strive to use units that can not possibly be mistaken for a
* valid value in a "normal" system without conversion. If the max * 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 * 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, * a really boring dive, or there was some missing input conversion,
* and a 60-ft dive got recorded as 60mm. * and a 60-ft dive got recorded as 60mm.
* *

View file

@ -1693,7 +1693,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_18"> <widget class="QLabel" name="label_18">
<property name="text"> <property name="text">
<string>Max depth</string> <string>Max. depth</string>
</property> </property>
</widget> </widget>
</item> </item>

View file

@ -1086,7 +1086,7 @@ void MainTab::acceptChanges()
} }
if (editMode == ADD || editMode == MANUALLY_ADDED_DIVE) { if (editMode == ADD || editMode == MANUALLY_ADDED_DIVE) {
// we just added or edited the dive, let fixup_dive() make // 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; current_dive->maxdepth.mm = current_dc->maxdepth.mm = 0;
fixup_dive(current_dive); fixup_dive(current_dive);
set_dive_nr_for_current_dive(); set_dive_nr_for_current_dive();

View file

@ -253,7 +253,7 @@
<item row="4" column="2" colspan="2"> <item row="4" column="2" colspan="2">
<widget class="QCheckBox" name="gf_low_at_maxdepth"> <widget class="QCheckBox" name="gf_low_at_maxdepth">
<property name="text"> <property name="text">
<string>GFLow at max depth</string> <string>GFLow at max. depth</string>
</property> </property>
</widget> </widget>
</item> </item>

View file

@ -129,7 +129,7 @@
</tr> </tr>
<tr> <tr>
<td class="fieldTitle"> <td class="fieldTitle">
<h1> Max depth </h1> <h1> Max. depth </h1>
</td> </td>
<td class="fieldData"> <td class="fieldData">
<p> {{ dive.depth }} </p> <p> {{ dive.depth }} </p>

View file

@ -142,7 +142,7 @@
</tr> </tr>
<tr> <tr>
<td class="fieldTitle"> <td class="fieldTitle">
<h1> Max depth </h1> <h1> Max. depth </h1>
</td> </td>
<td class="fieldData"> <td class="fieldData">
<p> {{ dive.depth }} </p> <p> {{ dive.depth }} </p>

View file

@ -136,7 +136,7 @@
<tr> <tr>
<td> <td>
<h1> Dive # {{ dive.number }} - {{ dive.date }} {{ dive.time }}</h1> <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> </td>
</tr> </tr>
<tr> <tr>

View file

@ -151,7 +151,7 @@
</tr> </tr>
<tr> <tr>
<td class="fieldTitle"> <td class="fieldTitle">
<h1> Max depth </h1> <h1> Max. depth </h1>
</td> </td>
<td class="fieldData"> <td class="fieldData">
<p> {{ dive.depth }} </p> <p> {{ dive.depth }} </p>

View file

@ -59,17 +59,17 @@
<td>Year</td> <td>Year</td>
<td>Dives</td> <td>Dives</td>
<td>Total Time</td> <td>Total Time</td>
<td>Avg Time</td> <td>Avg. Time</td>
<td>Shortest Time</td> <td>Shortest Time</td>
<td>Longest Time</td> <td>Longest Time</td>
<td>Avg Depth</td> <td>Avg. Depth</td>
<td>Min Depth</td> <td>Min. Depth</td>
<td>Max Depth</td> <td>Max. Depth</td>
<td>Avg SAC</td> <td>Avg. SAC</td>
<td>Min SAC</td> <td>Min. SAC</td>
<td>Max SAC</td> <td>Max. SAC</td>
<td>Min Temp</td> <td>Min. Temp</td>
<td>Max Temp</td> <td>Max. Temp</td>
</tr> </tr>
{% block main_rows %} {% block main_rows %}
{% for year in years %} {% for year in years %}

View file

@ -639,7 +639,7 @@ void ProfileWidget2::plotDive(struct dive *d, bool force)
if (shouldCalculateMaxTime || newMaxtime > maxtime) if (shouldCalculateMaxTime || newMaxtime > maxtime)
maxtime = newMaxtime; 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. * when we are dragging the handler to plan / add dive.
* otherwhise, update normally. * otherwhise, update normally.
*/ */

View file

@ -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."); ret = tr("Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.");
break; break;
case MOD: 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; break;
case MND: 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;
} }
break; break;
@ -383,7 +383,7 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
if (CHANGED()) { if (CHANGED()) {
if (QString::compare(vString.toUtf8().data(), "*") == 0) { if (QString::compare(vString.toUtf8().data(), "*") == 0) {
cyl->bestmix_o2 = true; cyl->bestmix_o2 = true;
// Calculate fO2 for max depth // Calculate fO2 for max. depth
cyl->gasmix.o2 = best_o2(displayed_dive.maxdepth, &displayed_dive); cyl->gasmix.o2 = best_o2(displayed_dive.maxdepth, &displayed_dive);
} else { } else {
cyl->bestmix_o2 = false; cyl->bestmix_o2 = false;
@ -400,7 +400,7 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
if (CHANGED()) { if (CHANGED()) {
if (QString::compare(vString.toUtf8().data(), "*") == 0) { if (QString::compare(vString.toUtf8().data(), "*") == 0) {
cyl->bestmix_he = true; cyl->bestmix_he = true;
// Calculate fO2 for max depth // Calculate fO2 for max. depth
cyl->gasmix.he = best_he(displayed_dive.maxdepth, &displayed_dive); cyl->gasmix.he = best_he(displayed_dive.maxdepth, &displayed_dive);
} else { } else {
cyl->bestmix_he = false; cyl->bestmix_he = false;

View file

@ -152,7 +152,7 @@ void DivePlannerPointsModel::setupCylinders()
CylindersModel::instance()->copyFromDive(&displayed_dive); 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() bool DivePlannerPointsModel::updateMaxDepth()
{ {
int prevMaxDepth = displayed_dive.maxdepth.mm; int prevMaxDepth = displayed_dive.maxdepth.mm;

View file

@ -246,7 +246,7 @@ QVariant DiveItem::data(int column, int role) const
retVal = tr("OTU"); retVal = tr("OTU");
break; break;
case MAXCNS: case MAXCNS:
retVal = tr("Max CNS"); retVal = tr("Max. CNS");
break; break;
case PHOTOS: case PHOTOS:
retVal = tr("Photos before/during/after dive"); retVal = tr("Photos before/during/after dive");

View file

@ -214,7 +214,7 @@ function changeAdvSearch(e){
<div id="time_header" onClick="change_sort_col('3')" class="item">Time</div> <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="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="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>
<div id="diveslist"> <div id="diveslist">
</div> </div>