Documentation: Merge and update french translations

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>

1 files changed, 118 insertions, 117 deletions

diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index ce6a45baf..4770ef31f 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -1038,10 +1038,10 @@ Sur les systèmes d’exploitation de type Unix, l’utilisateur a-t-il
 </li>
 </ul></div>
 <div class="paragraph"><p>Si l&#8217;ordinateur utilisant <em>Subsurface</em> ne reconnaît pas l&#8217;adaptateur USB en
-ne montrant pas le bon nom de périphérique à côté du Point de monage, il est
-possible que le câble ou l&#8217;adaptateur USB soit fautif. Un câble défectueux
-est la cause la plus courante de problème de communication entre un
-ordinateur de plongée et <em>Subsurface</em>. Il est également possible que
+ne montrant pas le bon nom de périphérique à côté du Point de montage, il
+est possible que le câble ou l&#8217;adaptateur USB soit fautif. Un câble
+défectueux est la cause la plus courante de problème de communication entre
+un ordinateur de plongée et <em>Subsurface</em>. Il est également possible que
 <em>Subsurface</em> ne puisse pas interpréter les données. Réalisez un
 téléchargement de diagnostic en cochant les deux cases suivantes dans la
 boîte de dialogue de téléchargement décrite ci-dessus:</p></div>
@@ -1380,7 +1380,7 @@ dive location.</p></div>
 <img src="images/Globe_image2.jpg" alt="FIGURE:Location creation panel" />
 </div>
 </div>
-<div class="paragraph"><p>There are three ways of adding the the coordinates:</p></div>
+<div class="paragraph"><p>Il existe trois façons d&#8217;ajouter des coordonnées :</p></div>
 <div class="paragraph"><p><strong>(1):</strong> Entrer les coordonnées manuellement si vous les connaissez,
    en utilisant un des quatre formats avec la latitude suivie de la longitude :</p></div>
 <div class="literalblock">
@@ -1401,7 +1401,7 @@ géolocalisation de ce site. Les informations du site de plongée pourront
 être modifiées ultérieurement, en cliquant sur l&#8217;icône de globe à droite du
 nom du site de plongée, dans l'"onglet notes".</p></div>
 <div class="paragraph"><p><strong>(2):</strong> Use the Dive Map to specify the coordinates. The Dive map now shows
-all the existing dive lications in grey as well as an additional marker in red
+all the existing dive locations in grey as well as an additional marker in red
 (image B above). Drag the red marker to the location of the dive site being entered.
 The map can be dragged and zoomed using the mouse wheel. Position the red marker
 by dragging it on the map, zooming in on the appropriate part of the map and placing
@@ -1419,15 +1419,21 @@ dive site name in the <strong>Notes tab</strong>.</p></div>
 <div class="paragraph"><p>Once the dive location data have been saved, the dive on the Dive List has a
 globe icon immediately to the left of the location name of a particular
 dive.</p></div>
-<div class="paragraph"><p><strong>(3):</strong> Utiliser l&#8217;application Subsurface-Mobile ou l&#8217;application <em>Subsurface</em> Companion avec un
+<div class="paragraph"><p><strong>(3):</strong> Obtenir les coordonnées en utilisant soit l&#8217;application Subsurface-Mobile, soit l&#8217;application <em>Subsurface</em> Companion avec un
 périphérique Android ou un iPhone avec GPS si les coordonnées du site de plongée ont été stockées
 en utilisant une de ces applications.
 <a href="#S_Companion">Cliquez ici pour plus d&#8217;information</a></p></div>
-<div class="paragraph"><p><strong>Important</strong>: les coordonnées GPS d&#8217;un site de plongée sont liées au nom de
-lieu - ainsi, <strong>enregistrer</strong> un site de plongée avec uniquement les coordonnées mais aucun nom
-causera des problèmes. (Subsurface pensera que toutes ces
-plongées ont le même lieu et tentera de garder leurs coordonnées GPS
-identiques).</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/warning2.png" alt="Warning" />
+</td>
+<td class="content">Les coordonnées GPS d&#8217;un site de plongée sont liées au nom de lieu - ainsi,
+<strong>enregistrer</strong> un site de plongée avec uniquement les coordonnées mais aucun
+nom causera des problèmes. (Subsurface pensera que toutes cesplongées ont le
+même lieu et tentera de garder leurs coordonnées GPSidentiques).</td>
+</tr></table>
+</div>
 <div class="paragraph"><p><strong>Recherche du nom d&#8217;un site de plongée</strong>: si vous avez entré les coordonnées dans la boîte
 de texte appropriée, vous pouvez lancer une recherche de nom sur base des coordonnées.
 Ceci est réalisé lorsque <em>Subsurface</em> utilise Internet pour trouver le nom d&#8217;un site de plongée
@@ -1665,19 +1671,19 @@ disque de l&#8217;ordinateur.</p></div>
 <div class="paragraph" id="S_ImportingAlienDiveLogs"><p>Many divers log their dives using the proprietary software provided by the
 manufacturers of their dive computers.  <em>Subsurface</em> can import dive logs
 from a range of other dive log software. While import from some software is
-supported natively, others require export of the the dive log to an
-intermediate format that can then be imported into <em>Subsurface</em>.  Currently,
-<em>Subsurface</em> supports importing CSV log files from several sources.  Dive
-log import from APD LogViewer, XP5, Sensus and Seabear files are
-preconfigured, but because the import is flexible, users can configure their
-own imports.  Manually kept log files (e.g. a spreadsheet) can also be
-imported by configuring the CSV import.  <em>Subsurface</em> can also import UDDF
-and UDCF files used by some dive log software and some dive computers, like
-the Heinrichs &amp; Weikamp DR5. Finally, for some dive log software like Mares
-Dive Organizer we currently recommend importing the logbook first into a web
-service like <em>divelogs.de</em> and then import from there with
-<em>Subsurface</em>. Divelogs.de supports a few additional logbook formats that
-<em>Subsurface</em> currently cannot handle.</p></div>
+supported natively, others require export of the dive log to an intermediate
+format that can then be imported into <em>Subsurface</em>.  Currently, <em>Subsurface</em>
+supports importing CSV log files from several sources.  Dive log import from
+APD LogViewer, XP5, Sensus and Seabear files are preconfigured, but because
+the import is flexible, users can configure their own imports.  Manually
+kept log files (e.g. a spreadsheet) can also be imported by configuring the
+CSV import.  <em>Subsurface</em> can also import UDDF and UDCF files used by some
+dive log software and some dive computers, like the Heinrichs &amp; Weikamp
+DR5. Finally, for some dive log software like Mares Dive Organizer we
+currently recommend importing the logbook first into a web service like
+<em>divelogs.de</em> and then import from there with <em>Subsurface</em>. Divelogs.de
+supports a few additional logbook formats that <em>Subsurface</em> currently cannot
+handle.</p></div>
 <div class="paragraph"><p>If the format of other software is supported natively on Subsurface, select
 either <em>Import &#8594; Import log files</em> or <em>File &#8594; Open log file</em>. Notice that
 the import adds the imported data to the current <strong>Dive list</strong>, and the open
@@ -2138,11 +2144,11 @@ humain. Voici les mêmes informations dans un format séparé par des
 tabulations :</p></div>
 <div class="literalblock">
 <div class="content">
-<pre><code>Dive site       Dive date       Time    Dive_duration   Dive_depth      Dive buddy
-Illovo Beach    2012-11-23      10:45   46:15   18.4    John Smith
-Key Largo       2012-11-24      09:12   34:15   20.4    Jason McDonald
-Wismar Baltic   2012-12-01      10:13   35:27   15.4    Dieter Albrecht
-Pulau Weh       2012-12-20      09:46   55:56   38.6    Karaeng Bontonompo</code></pre>
+<pre><code>Dive site      Dive date        Time    Dive_duration   Dive_depth      Dive buddy
+Illovo Beach   2012-11-23       10:45   46:15   18.4    John Smith
+Key Largo      2012-11-24       09:12   34:15   20.4    Jason McDonald
+Wismar Baltic  2012-12-01       10:13   35:27   15.4    Dieter Albrecht
+Pulau Weh      2012-12-20       09:46   55:56   38.6    Karaeng Bontonompo</code></pre>
 </div></div>
 <div class="paragraph"><p>It is clear why many people prefer the TAB-delimited format to the
 comma-delimited format. The disadvantage is that you cannot see the TAB
@@ -2283,19 +2289,19 @@ If the diver moves, a trace of the route is obtained by saving a location every
 </div>
 <div class="sect4">
 <h5 id="_activate_the_automated_recording_of_gps_locations">Activate the automated recording of GPS locations</h5>
-<div class="paragraph"><p>The <em>Subsurface-mobile</em> main menu has a checkbox at the bottom left labled
-<em>Run location service</em> (see image below). Checking the box starts the
-automated recording of GPS positions.</p></div>
+<div class="paragraph"><p>The <em>Subsurface-mobile</em> GPS menu has an option at the bottom labled <em>Run
+location service</em> (see image below). Selecting this starts the automated
+recording of GPS positions.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/MobileMenu.jpg" alt="FIGURE: Subsurface-mobile main menu" />
+<img src="images/MobileGpsMenu.jpg" alt="FIGURE: Subsurface-mobile GPS menu" />
 </div>
 </div>
 </div>
 <div class="sect4">
 <h5 id="_after_the_dive_stop_the_automated_recording_of_gps_locations">After the dive, stop the automated recording of GPS locations</h5>
-<div class="paragraph"><p>Uncheck the check box at the bottom left of the <em>Subsurface-mobile</em> main
-menu.</p></div>
+<div class="paragraph"><p>Select the menu option <em>Disable location service</em> at the bottom of the
+<em>Subsurface-mobile</em> GPS menu.</p></div>
 </div>
 <div class="sect4">
 <h5 id="_upload_the_gps_locations_onto_the_em_subsurface_em_internet_server">Upload the GPS locations onto the <em>Subsurface</em> Internet server.</h5>
@@ -3126,7 +3132,7 @@ other digital sources</a> and
 data into a known directory. From the main menu of <em>Subsurface</em>, select
 <em>Import &#8594; Import log files</em> to bring up the <a href="#Unified_import">universal
 import dialogue</a>. As explained in that section, the bottom right hand of the
-import dialogue contains a dropdown list (labled <em>Filter:</em>) of appropriate
+import dialogue contains a dropdown list (labeled <em>Filter:</em>) of appropriate
 devices that currently include (Poseidon) MkVI or APD log viewer
 files. Import for other CCR equipment is under active development. Having
 selected the appropriate CCR format and the directory where the original
@@ -3193,7 +3199,7 @@ pressure and the setpoint values, as shown below.</p></div>
 </div>
 </div>
 <div class="paragraph"><p>The second checkbox allows the display of the data from each individual
-oxygen sensor of the CCR equipment. The data for each sensor is colour-coded
+oxygen sensor of the CCR equipment. The data for each sensor is color-coded
 as follows:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -3554,11 +3560,11 @@ divers breathing gases other than air. Their values are dependent on the
 composition of the breathing gas. The EAD is the depth of a hypothetical air
 dive that has the same partial pressure of nitrogen as the current depth of
 the nitrox dive at hand. A nitrox dive leads to the same decompression
-obligation as an air dive to the depth equalling the EAD. The END is the
+obligation as an air dive to the depth equaling the EAD. The END is the
 depth of a hypothetical air dive that has the same sum of partial pressures
 of the narcotic gases nitrogen and oxygen as the current trimix dive. A
 trimix diver can expect the same narcotic effect as a diver breathing air
-diving at a depth equalling the END.</td>
+diving at a depth equaling the END.</td>
 </tr></table>
 </div>
 <div class="paragraph"><p>La figure (<strong>B</strong>) ci-dessous affiche une boîte d&#8217;information avec un ensemble
@@ -3911,7 +3917,7 @@ after 23 minutes. Cylinders with air are shown as a light blue bar.</td>
 <td class="content">
 <div class="paragraph"><p>Display the tissue heat-map. The heat map summarises, for the duration of
 the dive, the inert gas tissue pressures for each of the 16 tissue
-compartments of the Bühlmann model. Blue colours mean low gas pressures in a
+compartments of the Bühlmann model. Blue colors mean low gas pressures in a
 tissue compartment and thus on-gassing, green to red means excess gas in the
 tissue and thus off-gassing. Fast to slow tissues are indicated from top to
 bottom. The figure below explains in greater detail how the heat map can be
@@ -3929,19 +3935,19 @@ with the quick tissue compartments on the left and the slow tissue
 compartments on the right. Refer to the section on the
 <a href="#S_gas_pressure_graph">Gas Pressure Graph</a> for more details on the
 different elements of this graph.</p></div>
-<div class="paragraph"><p>Image <strong>B</strong> shows a gradient of unique colours, spanning the whole range of
+<div class="paragraph"><p>Image <strong>B</strong> shows a gradient of unique colors, spanning the whole range of
 inert gas pressures.  It is possible to map the height of each of the dark
-green vertical bars of <strong>A</strong> to a colour in <strong>B</strong>. For instance, the fastest
-(leftmost) dark green verical bar in <strong>A</strong> has a height corresponding to the
+green vertical bars of <strong>A</strong> to a color in <strong>B</strong>. For instance, the fastest
+(leftmost) dark green vertical bar in <strong>A</strong> has a height corresponding to the
 medium green part of <strong>B</strong>. The height of this bar can therefore be summarised
-using a medium green colour. Similarly, the highest dark green bar in <strong>A</strong> is
+using a medium green color. Similarly, the highest dark green bar in <strong>A</strong> is
 as high as the yellow part of <strong>B</strong>. The 14 remaining tissue pressure bars in
-<strong>A</strong> can also be translated to colours. The colours represent three ranges of
+<strong>A</strong> can also be translated to colors. The colors represent three ranges of
 tissue inert gas pressure:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-The bottom range in <strong>B</strong> (marked <em>On-gassing</em>) includes colours from light
+The bottom range in <strong>B</strong> (marked <em>On-gassing</em>) includes colors from light
     blue to black, representing tissue gas pressures below the equilibrium
     pressure of inert gas (bottom horizontal line in <strong>A</strong>). The measurement unit
     is the % of inert gas pressure, relative to the equilibrium inert gas
@@ -3955,8 +3961,8 @@ The bottom range in <strong>B</strong> (marked <em>On-gassing</em>) includes col
 </li>
 <li>
 <p>
-The central range in <strong>B</strong> includes the colours from black to light green,
-    when the inert gas pressure of a tissue compartment is higher than the
+The central range in <strong>B</strong> includes the colors from black to light green, when
+    the inert gas pressure of a tissue compartment is higher than the
     equilibrium pressure but less than the ambient pressure.  In this zone
     decompression is not very efficient because the gradient of inert gas
     pressure from tissue to the environment is relatively small and indicated by
@@ -3965,42 +3971,41 @@ The central range in <strong>B</strong> includes the colours from black to light
 </li>
 <li>
 <p>
-The top range in <strong>B</strong> (marked <em>Off-gassing</em>) includes colours from light
-    green to red and white, repesenting tissue gas pressures above that of the
-    total ambient pressure (top of light green area of <strong>A</strong>). The measurement
-    unit is the % of inert gas pressure above ambient pressure, relative to the
-    Bühlmann M-value gradient (bottom of red area in <strong>A</strong>). These tissue
-    pressures are normally reached while ascending to a shallower depth.  Below
-    a value of 100%, this range indicates efficient off-gassing of inert gas
-    from the tissue compartment into the environment. Usually, efficient
-    off-gassing is indicated by light green, yellow or orange colours.  Above
-    100% (red to white in <strong>B</strong>) the M-value gradient is exceeded and the
-    probability of decompression sickness increases markedly.
+The top range in <strong>B</strong> (marked <em>Off-gassing</em>) includes colors from light green
+    to red and white, repesenting tissue gas pressures above that of the total
+    ambient pressure (top of light green area of <strong>A</strong>). The measurement unit is
+    the % of inert gas pressure above ambient pressure, relative to the Bühlmann
+    M-value gradient (bottom of red area in <strong>A</strong>). These tissue pressures are
+    normally reached while ascending to a shallower depth.  Below a value of
+    100%, this range indicates efficient off-gassing of inert gas from the
+    tissue compartment into the environment. Usually, efficient off-gassing is
+    indicated by light green, yellow or orange colors.  Above 100% (red to white
+    in <strong>B</strong>) the M-value gradient is exceeded and the probability of
+    decompression sickness increases markedly.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Image <strong>C</strong> shows the colour mapping of each of the vertical bars in <strong>A</strong>, the
+<div class="paragraph"><p>Image <strong>C</strong> shows the color mapping of each of the vertical bars in <strong>A</strong>, the
 fast tissues (on the left in <strong>A</strong>) depicted at the top and the slow tissue
 compartments at the bottom of <strong>C</strong>. The highest vertical bar in <strong>A</strong> (vertical
 bar 3rd from the left) is presented as the yellow rectangle 3rd from the top
 in <strong>C</strong>. The 16 vertical bars in <strong>A</strong> are now presented as a vertical column
-of 16 coloured rectangles, representing a snapshot of tissue compartment gas
+of 16 colored rectangles, representing a snapshot of tissue compartment gas
 pressures at a particular instant during the dive.</p></div>
-<div class="paragraph"><p>Image <strong>D</strong> is a compilation of similar colour mappings of 16 tissue
-compartments during a 10-minute period of a dive, the colours representing
+<div class="paragraph"><p>Image <strong>D</strong> is a compilation of similar color mappings of 16 tissue
+compartments during a 10-minute period of a dive, the colors representing
 the inert gas loading of a tissue compartment at a point in time during the
 dive. Faster tissues are shown at the top and slower tissues at the bottom,
 with time forming the horizontal axis of the graph. The column of rectangles
 in <strong>C</strong> can be found on the horizontal axis between 9 and 10 minutes.</p></div>
-<div class="paragraph"><p>The colours of the heat map are not affected by the gradient factor
+<div class="paragraph"><p>The colors of the heat map are not affected by the gradient factor
 settings.  This is because the heat map indicates tissue pressures relative
 to the Bühlmann M-value gradient, and not relative to any specific gradient
 factor. For more information external to this manual see:</p></div>
 <div class="paragraph"><p><a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding M-values by
 Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a></p></div>
-<div class="paragraph"><p>Since the colours of the heat map are not affected by the gradient
-factor(s), the heat map is also applicable when using the VPM-B
-decompression model.</p></div>
+<div class="paragraph"><p>Since the colors of the heat map are not affected by the gradient factor(s),
+the heat map is also applicable when using the VPM-B decompression model.</p></div>
 <div class="paragraph"><p>The image below compares the profiles and heat maps for two planned
 decompression dives to 60m: the first using the Bühlmann decompression
 model, the second using the VPM-B decompression model.  Both profiles have
@@ -4105,8 +4110,8 @@ after the dive, or of landscapes as seen from the boat.</td>
 <td class="icon">
 <img src="images/icons/inAndOutPhoto.png" alt="Note" />
 </td>
-<td class="content">This dive has photographs taken both during the dive and immdiately before
-or after the dive.</td>
+<td class="content">Cette plongée contient à la fois des photos prises pendant la plongée, et
+juste avant ou juste après la plongée.</td>
 </tr></table>
 </div>
 </div>
@@ -5095,10 +5100,7 @@ Bühlmann: Set the <em>gradient factors</em> (GFLow and GFHigh) for calculcating
    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 <em>GFLow at max. depth</em> 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:
+   For more information see:
 </p>
 </li>
 <li>
@@ -5500,12 +5502,12 @@ Define the amount of gas the cylinder must have at the end of the bottom
 <p>
 Define the depth of the dive by dragging the waypoints (white dots) on the
   dive profile or (even better) defining the appropriate depths using the
-  table under <em>Dive planner points</em> as desribed under the previous heading. If
-  this is a multilevel dive, set the appropriate dive depths to represent the
-  dive plan by adding waypoints to the dive profile or by adding appropriate
-  dive planner points to the <em>Dive Planner Points</em> table. <em>Subsurface</em> will
-  automatically extend the bottom section of the dive to the maximum duration
-  within the no-decompression limits (NDL).
+  table under <em>Dive planner points</em> as described under the previous
+  heading. If this is a multilevel dive, set the appropriate dive depths to
+  represent the dive plan by adding waypoints to the dive profile or by adding
+  appropriate dive planner points to the <em>Dive Planner Points</em>
+  table. <em>Subsurface</em> will automatically extend the bottom section of the dive
+  to the maximum duration within the no-decompression limits (NDL).
 </p>
 </li>
 <li>
@@ -5621,7 +5623,7 @@ the limit of the gas supply but that an appropriate reserve is kept
 for unforeseen circumstances.
 For technical diving, this reserve can be up to 66% of the total available gas.
 In addition to calculating the total gas consumption for every cylinder the planner provides one way
-of calculating the recommended volume of bottom gas which is needed for safe asscent to the
+of calculating the recommended volume of bottom gas which is needed for safe ascent to the
 first deco gas change depth or the surface. This procedure is called the "minimum gas" or "rock bottom"
 consideration and it is used by various (but not all)
 technical diving organisations. See the text below for a detailed explanation.</p></div>
@@ -5714,10 +5716,13 @@ transition in deco</em> option is checked, the transitions are shown separately
 from the segment durations at a particular level.</p></div>
 <div class="paragraph"><p>The planner has a check box <em>Display plan variations</em>. By checking this box,
 the planner provides information about a dive that is a little deeper or
-slightly longer than the planned dive. This can be found near the top of the
-<em>Dive plan details</em> where the dive duration is indicated. Checking this
-option creates a lot of additional computation, to such a degree that the
-planner is slower than otherwise. The information is typically given as:</p></div>
+slightly longer than the planned dive. This is found near the top of the
+<em>Dive plan details</em> where the dive duration is indicated. The information is
+intended to be used if it is necessary to modify the ascent "on the fly" in
+the case of unexpected deviations from the dive plan during the dive.
+Checking this option creates a lot of additional computation, to such a
+degree that the planner is slower than otherwise. The information is
+typically given as:</p></div>
 <div class="literalblock">
 <div class="content">
 <pre><code>Runtime: 53min + 0:52/m + 4:21/min</code></pre>
@@ -5732,56 +5737,52 @@ Calculated dive duration is 53 min.
 <li>
 <p>
 For each extra meter in depth during the bottom phase of the dive, the
-   duration increases by 52 seconds.
+   ascent duration increases by 52 seconds.
 </p>
 </li>
 <li>
 <p>
 For each extra minute of bottom time, the duration increases by 4 min 21
-   sec. Thus, if the bottom time is two minutes longer than planned, the dive
-   duration will be (2+2*4min 21 sec) = 10 minutes 42 sec longer and would
-   probably require that each deco stop is 10:42/53:00 = 20% longer than
-   planned. These calculations are only applicable for small deviations from
-   the dive plan, not for larger deviations.
-</p>
-</li>
-<li>
-<p>
-Minimum gas requirements*
+   sec. Thus, if the bottom time is two minutes longer than planned, ascent
+   duration duration will be (2 * 4min 21 sec) = 8 minutes 42 sec longer and
+   would probably require that each deco stop is 8:42/53:00 = around 16% longer
+   than planned. These calculations are only applicable for small deviations
+   from the dive plan, not for larger deviations.
 </p>
 </li>
 </ul></div>
+<div class="paragraph"><p><strong>Minimum gas requirements</strong></p></div>
 <div class="paragraph"><p>The planner also estimates the <strong>minimum gas</strong> pressure required for safe
 ascent after an event that causes the dive to be aborted. The calculation
-assumes that in worst case an out of gas (OoG)  situation could occur at the
-end of the planned bottom time at maximum depth. This OoG event forces the
-buddy team the share the gas of one diver and to stay at maximum depth for
-an additional number of minutes.  At the same moment the combined SAC of
-both divers is increased by a estimated factor compared to the SAC factor of
-a single diver under normal conditions.  The result of the minimum gas
-calculation for the bottom gas is printed to the planner output. No
-automatic checks are performed based on this result.  The feature only gives
-valid results for simple, rectengular shaped single level dive profiles. For
-multi level dives one would need to check every leg of the profile
-independently.</p></div>
+assumes that in worst case an out of gas (OoG)  situation occurs at the end
+of the planned bottom time at maximum depth. This OoG event forces the buddy
+team the share the gas of one diver and that they require an additional
+period of time at maximum depth to solve the problem at hand.  In addition
+the combined SAC of both divers is increased by an estimated factor compared
+to the SAC factor of a single diver under normal conditions.  The result of
+the minimum gas calculation for the bottom gas is printed to the planner
+output. No automatic checks are performed based on this result.  The feature
+only gives valid results for simple, rectangular shaped single level dive
+profiles. For multi level dives one would need to check every leg of the
+profile independently.</p></div>
 <div class="paragraph"><p>There are two selector boxes on the left of the <em>Dive plan details</em>:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<strong>SAC factor</strong>. This is your estimate of the degree to which your SAC increases if a critical problem arises underwater,
+<strong>SAC factor</strong>. This is an estimate of the degree to which your SAC increases if a critical problem arises underwater,
    e.g. gas sharing or entanglement. Realistic values range from 2 to 5, reflecting the gas use of two divers sharing
    a single gas cylinder after an OoG situation.
 </p>
 </li>
 <li>
 <p>
-<strong>Problem solving time</strong>. This is your estimate of how long you would take to solve the problem before starting the ascent
+<strong>Problem solving time</strong>. This is an estimate of how long you would take to solve the problem before starting the ascent
    to terminate the dive. The default value is 2 minutes.
 </p>
 </li>
 </ul></div>
 <div class="paragraph"><p>Using the above information, the planner then estimates what the minimum
-botom gas cylinder pressure needs to be for a safe ascent. This information
+bottom gas cylinder pressure needs to be for a safe ascent. This information
 is given near the bottom of the <em>Dive plan details</em>, following the
 calculation of bottom gas used during the dive if it exactly follows the
 plan. the minimum gas is typically given as:</p></div>
@@ -5841,11 +5842,11 @@ within the framework of your formal training to perform dive planning.</td>
 The parameters of the pSCR dive can be set by selecting  <em>File &#8594;   Preferences &#8594;   Profile</em>
 from the main menu, where the gas consumption calculation takes into account the pSCR dump
 ratio (default 1:10) as well as the metabolic rate. The calculation also takes the oxygen drop
-accross the mouthpiece of the rebreather into account. If the
+across the mouthpiece of the rebreather into account. If the
 pO<sub>2</sub> drops below what is considered safe, a warning appears in the <em>Dive plan
 details</em>. A typical pSCR cylinder setup is very similar to an open circuit dive;
-one or more drive cilinders, possibly with different bottom and decompression
-gasses, including gas switches during the dive like in open circuit diving.
+one or more drive cylinders, possibly with different bottom and decompression
+gases, including gas switches during the dive like in open circuit diving.
 Therefore, the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables
 are very similar to that of a open circuit dive plan, described above. However, no oxygen setpoints
 are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable
@@ -5953,14 +5954,14 @@ Change the date and time of the <em>dive plan</em> to coincide with that of the
 <p>
 In the <em>Dive List</em>, highlight the dive plan as well as the data for the real
   dive and merge the two dives, making use of the Dive List Context Menu
-  (available by righ-clicking a dive).
+  (available by right-clicking a dive).
 </p>
 </li>
 </ul></div>
 <div class="paragraph"><p>The text version of the dive plan is appended to the Notes in the <em>Notes
 Tab</em>. With this merged dive highlighted in the <em>Dive List</em>, switch between
 the planned profile and the real-life profile using the
-righ-arrow/left-arrow keyboard keys.</p></div>
+right-arrow/left-arrow keyboard keys.</p></div>
 </div>
 </div>
 </div>
@@ -6599,7 +6600,7 @@ hci0:  Type: BR/EDR  Bus: USB
         RX bytes:1026 acl:0 sco:0 events:47 errors:0
         TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre>
 </div></div>
-<div class="paragraph"><p>Check that the status now includes <code><em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div>
+<div class="paragraph"><p>Check that the status now includes <em><code>UP</code></em>, <em><code>RUNNING</code></em> AND <em><code>AUTH</code></em>.</p></div>
 <div class="paragraph"><p>If there are multiple controllers running, it&#8217;s easiest to turn off the
 unused controller(s). For example, for <code>hci1</code>:</p></div>
 <div class="literalblock">
@@ -7919,7 +7920,7 @@ salvaged after being overwritten by new dives.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2017-10-20 22:56:42 CEST
+ 2017-11-28 08:54:18 CET
 </div>
 </div>
 </body>