Documentation: Merge/update french user-manual translation

Merge/update french user-manual translation.

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 463 insertions, 267 deletions

diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index b9f098763..cfb013a8e 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -505,22 +505,22 @@ sur l’option pour ne plus être sondé, cela devrait être la dernière
 communication de ce type que vous recevrez. Cependant, si vos habitudes de

 plongées ou d’utilisation de Subsurface changent, vous pouvez envoyer un

 nouveau sondage en démarrant <em>Subsurface</em> avec l&#8217;option  <em>--survey</em> sur la

-ligne de commande.</p></div>

-</div>

-</div>

+ligne de commande.</p></div>
+</div>
+</div>
 <div class="sect1">
 <h2 id="S_StartUsing">3. Commencer à utiliser le programme</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>The <em>Subsurface</em> window is usually divided into four panels with a <strong>Main
-Menu</strong> (File Import Log View Help) at the top of the window (for Windows and
-Linux) or the top of the screen (for Mac and Ubuntu Unity). The four panels
-are:</p></div>
+<div class="paragraph"><p>La fenêtre <em>Subsurface</em> est généralement divisée en 4 panneaux avec un <strong>Menu
+principal</strong> (Fichier Importer Journal Vue Aide) en haut de la fenêtre (pour
+Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les
+quatre panneaux sont :</p></div>
 <div class="paragraph"><p>La <strong>liste des plongées</strong> en bas à gauche, contenant une liste de toutes les
 plongées du journal (carnet) de plongées de l&#8217;utilisateur. Une plongée peut
 être sélectionnée et mise en surbrillance dans la liste en cliquant
-dessus. Dans la plupart des cas, les touches haut/bas peuvent être utilisée

-pour passer d&#8217;une plongée à l&#8217;autre. La <strong>liste des plongées</strong> est un outil

-important pour manipuler un journal (carnet) de plongée.</p></div>

+dessus. Dans la plupart des cas, les touches haut/bas peuvent être utilisée
+pour passer d&#8217;une plongée à l&#8217;autre. La <strong>liste des plongées</strong> est un outil
+important pour manipuler un journal (carnet) de plongée.</p></div>
 <div class="paragraph"><p>La <strong>carte de plongée</strong> en bas à droite, affiche les sites de plongées de

 l&#8217;utilisateur, sur une carte mondiale et centrée sur le site de la dernière

 plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div>

@@ -1566,9 +1566,9 @@ CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
 </p>

 </li>

 </ul></div>

-<div class="paragraph"><p>Selecting the appropriate file in the file list of the dialogue opens the

-imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not

-accessible through the Import dialogue are also supported, as explained

+<div class="paragraph"><p>Selecting the appropriate file in the file list of the dialogue opens the
+imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not
+accessible through the Import dialogue are also supported, as explained
 below.</p></div>
 </div>
 <div class="sect3">
@@ -1587,9 +1587,9 @@ OSTC dives are shown in the <strong>Dive List</strong> panel.</p></div>
 <div class="paragraph"><p>Since Mares utilise proprietary Windows software not compatible with
 multi-platform applications, these dive logs cannot be directly imported
 into <em>Subsurface</em>. Mares dive logs need to be imported using a three-step
-process, using <em>www.divelogs.de</em> as a mechanism to extract the dive log

-information.</p></div>

-<div class="olist arabic"><ol class="arabic">

+process, using <em>www.divelogs.de</em> as a mechanism to extract the dive log
+information.</p></div>
+<div class="olist arabic"><ol class="arabic">
 <li>

 <p>

 The dive log data from Mares Dive Organiser need to be exported to the

@@ -1609,9 +1609,9 @@ Data should then be imported into <em>www.divelogs.de</em>. One needs to create
 <li>

 <p>

 Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, using the

-   instructions below.

-</p>

-</li>

+   instructions below.
+</p>
+</li>
 </ol></div>
 </div>
 <div class="sect3">
@@ -1619,16 +1619,16 @@ Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, usin
 <div class="paragraph"><p>The import of dive information from <em>divelogs.de</em> is simple, using a single
 dialogue box. The <em>Import &#8594; Import from Divelogs.de</em> option should be
 selected from the Main Menu. This brings up a dialogue box (see figure on
-left [<strong>A</strong>] below). Enter a user-ID and password for <em>divelogs.de</em> into the

-appropriate fields and then select the <em>Download</em> button. Download from

-<em>divelogs.de</em> starts immediately, displaying a progress bar in the dialogue

+left [<strong>A</strong>] below). Enter a user-ID and password for <em>divelogs.de</em> into the
+appropriate fields and then select the <em>Download</em> button. Download from
+<em>divelogs.de</em> starts immediately, displaying a progress bar in the dialogue
 box. At the end of the download, the success status is indicated (see figure

 on the right [<strong>B</strong>], below). The <em>Apply</em> button should then be selected,

 after which the imported dives appear in the <em>Subsurface</em> <strong>Dive List</strong> panel.</p></div>

 <div class="imageblock" style="text-align:center;">

-<div class="content">

-<img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" />

-</div>

+<div class="content">
+<img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" />
+</div>
 </div>
 </div>
 <div class="sect3">
@@ -1636,9 +1636,9 @@ after which the imported dives appear in the <em>Subsurface</em> <strong>Dive Li
 <div class="paragraph"><p>A comma-separated file (.csv) can be used to import dive information either
 as dive profiles (as in the case of the APD Inspiration and Evolution closed
 circuit rebreathers) or as dive metadata (in case the user keeps dive data
-in a spreadsheet). The <em>CSV</em> format is a universal simplified format that

-allows for easy information exchange between different computers or software

-packages. For an introduction to CSV-formatted files see <a href="#S_CSV_Intro">A

+in a spreadsheet). The <em>CSV</em> format is a universal simplified format that
+allows for easy information exchange between different computers or software
+packages. For an introduction to CSV-formatted files see <a href="#S_CSV_Intro">A
 Diver&#8217;s Introduction To CSV Files</a>. <em>Subsurface</em> dive logs can also be

 exported in <em>CSV</em> format to other software that reads this format. See

 <a href="#S_Appendix_D">APPENDIX D: Exporting a spreadsheet to CSV format</a> for

@@ -2380,14 +2380,14 @@ profile with photos from an external drive, the normal procedure of
 selection and synchronisation (see text above) is used.  However, after the

 external drive has been disconnected, <em>Subsurface</em> cannot access these

 photos any more.  If the display of photos is activated (using the toolbox

-to the left of the <em>Dive Profile</em>), the program only shows a small white dot

-where each photo should be on the dive profile.  In addition the <em>Photos</em>

-tab only shows the file names of the photos. This is normal behaviour.  If,

+to the left of the <em>Dive Profile</em>), the program only shows a small white dot
+where each photo should be on the dive profile.  In addition the <em>Photos</em>
+tab only shows the file names of the photos. This is normal behaviour.  If,
 later, the external drive with the photos is connected again, the photos can
 be seen in the normal way.</p></div>
 </div>
 <div class="sect3">
-<h4 id="Moving_images">5.5.5. Moving photographs among directories, hard disks or computers</h4>
+<h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4>
 <div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, the directory
  where the photo lies is stored, allowing <em>Subsurface</em> to find the photograph when the dive is
  opened again. If the photo or the whole photo collection is moved to another drive or to a different
@@ -2452,12 +2452,12 @@ specific dive.</td>
 </div>
 <div class="sect2">
 <h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>
-<div class="sect3">

-<h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>

-<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one

-cylinder. Multicylinder diving usually happens (a) if a diver does not have

-enough gas for the complete dive in a single cylinder; (b) if the diver

-needs more than one gas mixture because of the depth or the decompression

+<div class="sect3">
+<h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>
+<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one
+cylinder. Multicylinder diving usually happens (a) if a diver does not have
+enough gas for the complete dive in a single cylinder; (b) if the diver
+needs more than one gas mixture because of the depth or the decompression
 needs of the dive. For this reason multicylinder dives are often used by
 technical divers who dive deep or long. As far as <em>Subsurface</em> is concerned,
 there are only two types of information that need to be provided:</p></div>
@@ -2517,9 +2517,9 @@ steps:</p></div>
   from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean
   that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
   has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning
-  from a dive with the information about cylinder changes is the only tricky part of logging sidemount dives.

-</p>

-</li>

+  from a dive with the information about cylinder changes is the only tricky part of logging sidemount dives.
+</p>
+</li>
 <li>

 <p>

 <strong>Within <em>Subsurface</em> describe the cylinders used during the dive</strong>. The diver needs to provide the

@@ -2542,9 +2542,9 @@ steps:</p></div>
 </p>

 </li>

 </ul></div>

-<div class="imageblock" style="text-align:center;">

-<div class="content">

-<img src="images/sidemount1.jpg" alt="FIGURE: Sidemount profile" />

+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/sidemount1.jpg" alt="FIGURE: Sidemount profile" />
 </div>
 </div>
 <div class="paragraph"><p>This section gives an example of the versatility of <em>Subsurface</em> as a dive
@@ -2606,9 +2606,9 @@ lasted over two hours.</p></div>
 <img src="images/APD.jpg" alt="Note" />
 </td>
 <td class="content">Closed system rebreathers use advanced technology to recirculate gas that
-has been breathed while doing two things to maintain a breathable oxygen

-concentration:

-a) remove carbon dioxide from the gas that has been exhaled

+has been breathed while doing two things to maintain a breathable oxygen
+concentration:
+a) remove carbon dioxide from the gas that has been exhaled
 regulate the oxygen concentration to remain within safe diving limits.

 Currently, within <em>Subsurface</em>, the Poseidon MkVI Discovery is the best

 supported CCR dive computer. The CCR interface of <em>Subsurface</em> is currently

@@ -3321,9 +3321,9 @@ Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters f
 </div>

 </div>

 </div>

-</div>

-<div class="sect1">

-<h2 id="_organising_the_logbook_manipulating_groups_of_dives">7. Organising the logbook (Manipulating groups of dives)</h2>

+</div>
+<div class="sect1">
+<h2 id="_organising_the_logbook_manipulating_groups_of_dives">7. Organising the logbook (Manipulating groups of dives)</h2>
 <div class="sectionbody">
 <div class="sect2">
 <h3 id="_the_dive_list_context_menu">7.1. The Dive List context menu</h3>
@@ -3333,9 +3333,9 @@ a group of dives and then right-clicking.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/ContextMenu.jpg" alt="Figure: Context Menu" />
-</div>

-</div>

-<div class="paragraph"><p>The context menu is used in many manipulations described below.</p></div>

+</div>
+</div>
+<div class="paragraph"><p>The context menu is used in many manipulations described below.</p></div>
 <div class="sect3">

 <h4 id="_customising_the_information_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the information showed in the <strong>Dive List</strong> panel</h4>

 <div class="imageblock" style="text-align:center;">

@@ -3369,9 +3369,9 @@ sequence numbers) to recent dives (having the highest sequence numbers). The
 numbering of the dives is not always consistent. For instance, when

 non-recent dives are added to the dive list the numbering does not

 automatically follow on because of the dives that are more recent in

-date/time than the newly-added dive with an older date/time. Therefore, one

-may sometimes need to renumber the dives.  This is performed by selecting

-(from the Main Menu) <em>Log &#8594; Renumber</em>. Users are given a choice with

+date/time than the newly-added dive with an older date/time. Therefore, one
+may sometimes need to renumber the dives.  This is performed by selecting
+(from the Main Menu) <em>Log &#8594; Renumber</em>. Users are given a choice with
 respect to the lowest sequence number to be used.  Completing this operation
 results in new sequence numbers (based on date/time)  for the dives in the
 <strong>Dive List</strong> panel.</p></div>
@@ -3392,7 +3392,7 @@ dive list comprising five dive trips (<strong>B</strong>, on the right):</p></di
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Group2.jpg" alt="Figure: Grouping dives" />
-</div>

+</div>
 </div>
 <div class="paragraph"><p>Grouping into trips allows a rapid way of accessing individual dives without
 having to scan a long lists of dives. In order to group the dives in a dive
@@ -3401,9 +3401,9 @@ now shows only the titles for the trips.</p></div>
 <div class="sect3">
 <h4 id="_editing_the_title_and_associated_information_for_a_particular_trip">7.3.1. Editing the title and associated information for a particular trip</h4>
 <div class="paragraph"><p>Normally, in the dive list, minimal information is included in the trip
-title.  More information about a trip can be added by selecting its trip

-title from the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong>

-panel. Here users can add or edit information about the date/time, the trip

+title.  More information about a trip can be added by selecting its trip
+title from the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong>
+panel. Here users can add or edit information about the date/time, the trip
 location and any other general comments about the trip as a whole (e.g. the

 dive company that was dived with, the general weather and surface conditions

 during the trip, etc.).  After entering this information, users should

@@ -3414,9 +3414,9 @@ information.</p></div>
 <div class="sect3">

 <h4 id="_viewing_the_dives_during_a_particular_trip">7.3.2. Viewing the dives during a particular trip</h4>

 <div class="paragraph"><p>Once the dives have been grouped into trips, users can expand one or more

-trips by clicking the arrow-head on the left of each trip title. This

-expands the selected trip, revealing the individual dives performed during

-the trip.</p></div>

+trips by clicking the arrow-head on the left of each trip title. This
+expands the selected trip, revealing the individual dives performed during
+the trip.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_collapsing_or_expanding_dive_information_for_different_trips">7.3.3. Collapsing or expanding dive information for different trips</h4>
@@ -3433,9 +3433,9 @@ above.(Merge trip with trip below; Merge trip with trip above)</p></div>
 </div>
 <div class="sect3">
 <h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4>
-<div class="paragraph"><p>If a trip includes five dives, the user can split this trip into two trips

-(trip 1: top 3 dives; trip 2: bottom 2 dives) by selecting and

-right-clicking the top three dives. The resulting context menu allows the

+<div class="paragraph"><p>If a trip includes five dives, the user can split this trip into two trips
+(trip 1: top 3 dives; trip 2: bottom 2 dives) by selecting and
+right-clicking the top three dives. The resulting context menu allows the
 user to create a new trip by choosing the option <strong>Create new trip

 above</strong>. The top three dives are then grouped into a separate trip. The

 figures below shows the selection and context menu on the left (A) and the

@@ -3456,9 +3456,9 @@ right-clicking them to bring up the context menu, and then selecting <strong>Del
 dive(s)</strong>. Typically this would apply to a case where a user wishes to delete

 workshop calibration dives of the dive computer or dives of extremely short

 duration.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_unlink_a_dive_from_a_trip">7.4.2. Unlink a dive from a trip</h4>

+</div>
+<div class="sect3">
+<h4 id="_unlink_a_dive_from_a_trip">7.4.2. Unlink a dive from a trip</h4>
 <div class="paragraph"><p>Users can unlink dives from the trip to which they belong. In order to do
 this, select and right-click the relevant dives to bring up the context
 menu. Then select the option <strong>Remove dive(s)  from trip</strong>. The dive(s) now
@@ -3473,10 +3473,10 @@ bring up the context menu, and then select <strong>Create new trip above</strong
 </div>
 <div class="sect3">
 <h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4>
-<div class="paragraph"><p>Sometimes it is necessary to adjust the start time of a dive. This may apply

-to situations where dives are performed in different time zones or when the

-dive computer has an erroneous time. In order to do this, user must select

-and right-click the dive(s) to be adjusted. This action brings up the

+<div class="paragraph"><p>Sometimes it is necessary to adjust the start time of a dive. This may apply
+to situations where dives are performed in different time zones or when the
+dive computer has an erroneous time. In order to do this, user must select
+and right-click the dive(s) to be adjusted. This action brings up the
 context menu on which the <strong>Shift times</strong> option should be selected. User must
 then specify the time (in hours and minutes) by which the dives should be
 adjusted and click on the option indicating whether the time adjustment
@@ -3484,18 +3484,18 @@ should be ealier or later.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_merge_dives_into_a_single_dive">7.4.5. Merge dives into a single dive</h4>
-<div class="paragraph"><p>Sometimes a dive is briefly interrupted, e.g. if a diver returns to the

-surface for a few minutes, resulting in two or more dives being recorded by

-the dive computer and appearing as different dives in the <strong>Dive List</strong>

+<div class="paragraph"><p>Sometimes a dive is briefly interrupted, e.g. if a diver returns to the
+surface for a few minutes, resulting in two or more dives being recorded by
+the dive computer and appearing as different dives in the <strong>Dive List</strong>
 panel. Users can merge these dives onto a single dive by selecting the

 appropriate dives, right-clicking them to bring up the context menu and then

 selecting <strong>Merge selected dives</strong>. It may be necessary to edit the dive

 information in the <strong>Notes</strong> panel to reflect events or conditions that apply

 to the merged dive. The figure below shows the depth profile of two such

 dives that were merged:</p></div>

-<div class="imageblock" style="text-align:center;">

-<div class="content">

-<img src="images/MergedDive.png" alt="Example: Merged dive" />

+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/MergedDive.png" alt="Example: Merged dive" />
 </div>
 </div>
 </div>
@@ -3510,11 +3510,11 @@ the <strong>Main Menu</strong> select <em>Edit</em>. This brings up the possibil
 </div>
 <div class="sect2">
 <h3 id="S_Filter">7.5. Filtering the dive list</h3>
-<div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, that is, one can select

-only some of the dives based on their attributes, e.g. dive tags, dive site,

-dive master, buddy or protective clothing. For instance, filtering allows

-one to list the deep dives at a particular dive site, or otherwise the cave

-dives with a particular buddy.</p></div>

+<div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, that is, one can select
+only some of the dives based on their attributes, e.g. dive tags, dive site,
+dive master, buddy or protective clothing. For instance, filtering allows
+one to list the deep dives at a particular dive site, or otherwise the cave
+dives with a particular buddy.</p></div>
 <div class="paragraph"><p>To open the filter, select <em>Log &#8594; Filter divelist</em> from the main menu. This
 opens the <em>Filter Panel</em> at the top of the <em>Subsurface</em> window. Three icons
 are located at the top right hand of the filter panel. The <em>Filter Panel</em>
@@ -3527,13 +3527,13 @@ white cross.  An example of the <em>Filter Panel</em> is shown in the figure bel
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Filterpanel.jpg" alt="Figure: Filter panel" />
-</div>

-</div>

-<div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person

+</div>
+</div>
+<div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person
 (buddy / dive master), dive site and dive suit, each of which is represented

-by a check list with check boxes. Above each check list is a second-level

-filter tool, allowing the listing of only some of the attributes within that

-check list. For instance, typing "<em>ca</em>" in the filter textbox above the tags

+by a check list with check boxes. Above each check list is a second-level
+filter tool, allowing the listing of only some of the attributes within that
+check list. For instance, typing "<em>ca</em>" in the filter textbox above the tags
 check list results in the tags check list being reduced to "<em>cave</em>" and
 "<em>cavern</em>". Filtering of the check list enables the rapid finding of search
 terms for filtering the dive list.</p></div>
@@ -3547,9 +3547,9 @@ those dives that have either one OR both of these tags.</p></div>
 </div>
 </div>
 </div>
-<div class="sect1">

-<h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2>

-<div class="sectionbody">

+<div class="sect1">
+<h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2>
+<div class="sectionbody">
 <div class="paragraph"><p>There are two routes for the export of dive information from Subsurface:</p></div>

 <div class="ulist"><ul>

 <li>

@@ -4057,9 +4057,9 @@ the dive profile:
 </p>

 </li>

 <li>

-<p>

-<em>Show average depth</em>: Activating this checkbox causes <em>Subsurface</em> to draw a grey line across

-   the dive profile, indicating the mean depth of the dive up to a particular point in time during

+<p>
+<em>Show average depth</em>: Activating this checkbox causes <em>Subsurface</em> to draw a grey line across
+   the dive profile, indicating the mean depth of the dive up to a particular point in time during
    that dive. Normally this is a u-shaped line indicating the deepest average depth just before the
    ascent.
 </p>
@@ -4067,9 +4067,9 @@ the dive profile:
 <li>
 <p>
 <strong>Misc</strong>:
-</p>

-</li>

-</ul></div>

+</p>
+</li>
+</ul></div>
 </li>

 <li>

 <p>

@@ -4273,9 +4273,9 @@ Details</em>. This is where the details of the dive plan are provided in a way
 that can easily be copied to other software. This is also where any warning

 messages about the dive plan are printed.</p></div>

 <div class="imageblock" style="text-align:center;">

-<div class="content">

-<img src="images/PlannerWindow1_f20.jpg" alt="FIGURE: Dive planner startup window" />

-</div>

+<div class="content">
+<img src="images/PlannerWindow1_f20.jpg" alt="FIGURE: Dive planner startup window" />
+</div>
 </div>
 </div>
 <div class="sect2">
@@ -4288,9 +4288,9 @@ Towards the centre bottom of the planner (circled in blue in the image
 </p>
 <div class="ulist"><ul>
 <li>
-<p>

-Open Circuit (the default)

-</p>

+<p>
+Open Circuit (the default)
+</p>
 </li>

 <li>

 <p>

@@ -4300,9 +4300,9 @@ CCR
 <li>

 <p>

 pSCR

-</p>

-</li>

-</ul></div>

+</p>
+</li>
+</ul></div>
 </li>
 <li>
 <p>
@@ -4319,16 +4319,16 @@ In the top left-hand area of the planning screen, ensure that the constant
 </p>
 </li>
 <li>
-<p>

-In the table labeled <em>Available Gases</em>, add the information of the cylinders

-  to be used as well as the gas composition within that cylinder. This is done

+<p>
+In the table labeled <em>Available Gases</em>, add the information of the cylinders
+  to be used as well as the gas composition within that cylinder. This is done
   in a similar way as for <a href="#S_CylinderData">providing cylinder data for dive   logs</a>. Choose the cylinder type by double clicking the cylinder type and

   using the dropdown list, then specify the work pressure of this cylinder. By

   leaving the oxygen concentration (O2%) filed empty, the cylinder is assumed

   to contain air. Otherwise enter the oxygen and/or helium concentration in

-  the boxes provided in this dialogue. Add additional cylinders by using the

-  "+" icon to the top righthand of the dialogue.

-</p>

+  the boxes provided in this dialogue. Add additional cylinders by using the
+  "+" icon to the top righthand of the dialogue.
+</p>
 </li>
 <li>
 <p>
@@ -4456,9 +4456,9 @@ using multiple breathing gases.  Such dives are planned in three stages:</p></di
 <div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is performed by specifying the rates for descent and ascent,
 as well as the gradient factors (GFLow and GFHigh) under the headings <em>Rates</em> and <em>Planning</em>
 to the bottom left of the planning screen. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
-panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within

-the planner), the new values are

-used without changing the original values in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.

+panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within
+the planner), the new values are
+used without changing the original values in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.
 A very low GFLow value brings about decompression stops early on during the dive.

  ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.

 For more information external to this manual see:</p></div>

@@ -4570,9 +4570,9 @@ diveplan</em> is requested, a detailed sentence-level explanation of the dive
 plan is given. If any of the management specifications have been exceeded

 during the planning, a warning message is printed underneath the dive plan

 information.</p></div>

-<div class="paragraph"><p>If the option <em>Display segment duration</em> is checked, then the duration of

-each depth level is indicated in the <em>Dive Plan Details</em>. This duration

-INCLUDES the transition time to get to that level. However, if the <em>Display

+<div class="paragraph"><p>If the option <em>Display segment duration</em> is checked, then the duration of
+each depth level is indicated in the <em>Dive Plan Details</em>. This duration
+INCLUDES the transition time to get to that level. However, if the <em>Display
 transition in deco</em> option is checked, the transitions are shown separately
 from the segment durations at a particular level.</p></div>
 </div>
@@ -4603,9 +4603,9 @@ in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.<
 <div class="paragraph"><p>To plan a dive using a closed circuit rebreather, select the <em>CCR</em> option in
 the dropdown list, circled in blue in the image below.</p></div>
 <div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the
-diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen

-cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div>

-<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File &#8594;  Preferences &#8594;  Graph</em> from the main menu. All user-entered segments in the <em>Dive planner points</em> table

+diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen
+cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div>
+<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File &#8594;  Preferences &#8594;  Graph</em> from the main menu. All user-entered segments in the <em>Dive planner points</em> table
 use the default setpoint value. Then, different setpoints can be specified for dive segments

 in the <em>Dive planner points</em> table. A zero setpoint

 means the diver bails out to open circuit mode for that segment. The decompression is always calculated

@@ -4616,18 +4616,18 @@ algorithm does not switch deco-gases automatically while in CCR mode (i.e. when
 <div class="imageblock" style="text-align:center;">

 <div class="content">

 <img src="images/Planner_CCR1_f20.jpg" alt="FIGURE: Planning a CCR dive: setup" />

-</div>

-</div>

-<div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment

+</div>
+</div>
+<div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment
 is not calculated, so gas consumptions of 0 litres are the norm.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_Replan">13.5. Modifying an existing dive plan</h3>
 <div class="paragraph"><p>Normally, when a dive plan has been saved, it is accessible from the <strong>Dive
 List</strong>, like any other dive log. Within the <strong>Dive List</strong> there is not a way to
-change a saved dive plan.  To perform changes to a dive plan, select it on

-the <strong>Dive List</strong>. Then, in the main menu, select <em>Log &#8594; Re-plan dive</em>. This

-will open the selected dive plan within the dive planner, allowing changes

+change a saved dive plan.  To perform changes to a dive plan, select it on
+the <strong>Dive List</strong>. Then, in the main menu, select <em>Log &#8594; Re-plan dive</em>. This
+will open the selected dive plan within the dive planner, allowing changes
 to be made and saved as usual.</p></div>

 <div class="paragraph"><p>In addition there is the option "Save new". This keeps the original planned

 dive and adds a (possibly modified) copy to the dive list. If that copy is

@@ -4720,12 +4720,20 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <a href="#S_PrintDivelog"><em>Imprimer</em></a> - Imprimer le carnet de plongée actuellement

   ouvert.

 </p>

-</li>

-<li>

-<p>

-<a href="#S_Preferences"><em>Préférences</em></a> - Définir les  préférences de <em>Subsurface</em>.

-</p>

-</li>

+</li>
+<li>
+<p>
+<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos taken during dives
+  have been moved to
+      a different disk or directory, locate them and link them to the appropriate
+      dives.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Preferences"><em>Préférences</em></a> - Définir les  préférences de <em>Subsurface</em>.
+</p>
+</li>
 <li>

 <p>

 <a href="#S_Configure"><em>Configurer l&#8217;ordinateur de plongée</em></a> - Modifier la

@@ -4778,20 +4786,26 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <a href="#S_EnterData"><em>Ajouter une plongée</em></a> -  Ajouter manuellement une nouvelle

   plongée au panneau de la <strong>liste des plongées</strong>.

 </p>

-</li>

-<li>

-<p>

-<a href="#S_DivePlanner"><em>Planifier une plongée</em></a> - Cette fonctionnalité permet de

-  planifier des plongées.

-</p>

-</li>

-<li>

-<p>

-<a href="#S_Replan"><em>Replanifier une plongée</em></a> - Modifier une plongée planifiée qui

-  a été enregistrée dans la <strong>liste des plongées</strong>.

-</p>

-</li>

-<li>

+</li>
+<li>
+<p>
+<em>Edit dive</em> - Edit a dive of which the profile was entered by hande and not
+  from a dive computer.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_DivePlanner"><em>Planifier une plongée</em></a> - Cette fonctionnalité permet de
+  planifier des plongées.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Replan"><em>Modifier la plongée dans le planificateur</em></a> - Modifier une
+  plongée planifiée qui a été enregistrée dans la <strong>liste des plongées</strong>.
+</p>
+</li>
+<li>
 <p>

 <a href="#S_CopyComponents"><em>Copier les composants de la plongée</em></a> - En

   sélectionnant cette option, vous pouvez copier les informations de plusieurs

@@ -5074,78 +5088,255 @@ Log</em> and wait for the <em>Wait PC</em> message.</p></div>
 <li>

 <p>

 <strong>Pair the <em>Subsurface</em> computer with the dive computer.</strong>

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><div class="title">Sur Windows :</div><p>Bluetooth is most likely already enabled. For pairing with the dive computer

-choose <em>Control Panel &#8594; Bluetooth Devices &#8594; Add Wireless Device</em>.  This

-should bring up a dialog showing your dive computer (in Bluetooth mode) and

-allowing pairing. Right click on it and choose <em>Propertie s&#8594; COM Ports</em> to

-identify the port used for your dive computer. If there are several ports

-listed, use the one saying "Outgoing" instead of "Incoming".</p></div>

-<div class="paragraph"><p>For downloading to <em>Subsurface</em>, the <em>Subsurface</em> drop-down list should

-contain this COM port already. If not, enter it manually.</p></div>

-<div class="paragraph"><p>Note: If there are issues afterwards when downloading from the dive computer

-using other software, remove the existing pairing with the dive computer.</p></div>

-<div class="paragraph"><div class="title">Sur MacOS :</div><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up Bluetooth

-Device&#8230;</em>. The dive computer should then show up in the list of

-devices. Select it and go through the pairing process. This step should only

-be needed once for initial setup.</p></div>

-<div class="paragraph"><p>Once the pairing is completed the correct device is shown in the <em>Device or

-Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>

-<div class="paragraph"><div class="title">Sur Linux</div><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.  On most common

-distributions this should be true out of the box and pairing should be

-straight forward. For instance, Gnome3 shows a Bluetooth icon in the upper

-right corner of the desktop where one selects <em>Set up New Device</em>. This

-should show a dialog where one can select the dive computer (which already

-should be in Bluetooth mode) and pair it.  If a PIN is required, try

-manually setting <em>0000</em>.</p></div>

-<div class="paragraph"><p>In the rare cases where the above is not true, then depending on your

-system, try <code>initd</code> or <code>systemd</code>. This might be different and also involve

-loading modules specific to your hardware. In case your system is running

-<code>systemd</code>, manually run <code>systemctl start bluetooth.service</code> to enable it, in

-case of <code>initd</code>, run something like <code>rc.config start bluetoothd</code> or

-<code>/etc/init.d/bluetooth start</code>.</p></div>

-<div class="paragraph"><p>One may also use a manual approach by using such commands:</p></div>

-<div class="ulist"><ul>

-<li>

-<p>

-<code>hciconfig</code> shows the Bluetooth devices available on your computer (not dive

-   computer), most likely one will see a hci0, if not try <code>hcitool -a</code> to see

-   inactive devices and run <code>sudo hciconfig hci0 up</code> to bring them up.

-</p>

-</li>

-<li>

-<p>

-<code>hcitool scanning</code> gets a list of bluetooth enabled client devices, look for

-   the dive computer and remember the MAC address are shown there

-</p>

-</li>

-<li>

-<p>

-<code>bluez-simple-agent hci0 10:00:E8:C4:BE:C4</code> pairs the dive computer with the

-   bluetooth stack of the <em>Subsurface</em> computer, copy/paste the MAC address

-   from the output of <em>hcitool scanning</em>

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>Unfortunately on Linux binding to a communication device has to be done

-manually by running:</p></div>

-<div class="ulist"><ul>

-<li>

-<p>

-<code>rfcomm bind /dev/rfcomm0 10:00:E8:C4:BE:C4</code> binds the dive computer to a

-   communication device in the desktop computer, in case rfcomm is already

-   taken use rfcomm1 or up. IMPORTANT: Copy/paste the MAC address from the

-   output of <code>hcitool scanning</code>, the MAC address shown above will not work.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>For downloading dives in <em>Subsurface</em> specify the device name connected to

-the MAC address in the last step above, e.g. <em>/dev/rfcomm0</em>.</p></div>

-</div>

-</div>

-</div>

+</p>
+</li>
+</ul></div>
+<div class="sect3">
+<h4 id="_sur_windows">15.3.1. Sur Windows :</h4>
+<div class="paragraph"><p>Bluetooth is most likely already enabled. For pairing with the dive computer
+choose <em>Control Panel &#8594; Bluetooth Devices &#8594; Add Wireless Device</em>.  This
+should bring up a dialog showing your dive computer (which should be in
+Bluetooth mode) and allowing pairing. Right click on it and choose
+<em>Properties&#8594; COM Ports</em> to identify the port used for your dive
+computer. If there are several ports listed, use the one saying "Outgoing"
+instead of "Incoming".</p></div>
+<div class="paragraph"><p>For downloading to <em>Subsurface</em>, the <em>Subsurface</em> drop-down list should
+contain this COM port already. If not, enter it manually.</p></div>
+<div class="paragraph"><p>Note: If there are issues afterwards when downloading from the dive computer
+using other software, remove the existing pairing with the dive computer.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_sur_macos">15.3.2. Sur MacOS :</h4>
+<div class="paragraph"><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up Bluetooth
+Device&#8230;</em>. The dive computer should then show up in the list of
+devices. Select it and go through the pairing process. This step should only
+be needed once for initial setup.</p></div>
+<div class="paragraph"><p>Once the pairing is completed the correct device is shown in the <em>Device or
+Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_sur_linux">15.3.3. Sur Linux</h4>
+<div class="paragraph"><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.  On most common
+distributions this should be true out of the box and pairing should be
+straight forward. For instance, Gnome3 shows a Bluetooth icon on the right
+of the toolbar at the top of the screen.  Users have reported difficulties
+with some Bluetooth controllers.  If you have an onboard controller, try
+that first.  It is simplest if you remove any USB Bluetooth dongles.  If you
+have a USB dongle that came with your dive computer, try that before any
+others.</p></div>
+<div class="paragraph"><p>Setting up a connection to download dives from your Bluetooth-enabled
+device, such as the <em>Shearwater Petrel</em>, is not yet an automated process and
+will generally require the command prompt.  It is essentially a three step
+process.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Enable the Bluetooth controller and pair your dive computer&lt;/li&gt;
+</p>
+</li>
+<li>
+<p>
+Establish an RFCOMM connection
+</p>
+</li>
+<li>
+<p>
+Download the dives with Subsurface
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em> and
+<em>Petrel 2</em>, cycle through the menu, select <em>Dive Log</em>, then <em>Upload Log</em>.
+The display will read <em>Initializing</em>, then <em>Wait PC 3:00</em> and will
+countdown.  Once the connection is established, the display reads <em>Wait CMD
+&#8230;</em> and the countdown continues. When downloading the dive from Subsurface,
+the display reads <em>Sending</em> then <em>Sent Dive</em>.</p></div>
+<div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>.
+The correct permission is required to download the dives in the computer. On
+most Linux systems this means becoming a member of the dialout group (This
+is identical as for many dive computers using a Linux USB port, descibed in
+the previous section). On the command terminal, enter:</p></div>
+<div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
+<div class="paragraph"><p>Then log out and log in for the change to take effect.</p></div>
+<div class="sect4">
+<h5 id="_enabling_the_bluetooth_controller_and_pairing_your_dive_computer">Enabling the Bluetooth controller and pairing your dive computer</h5>
+<div class="paragraph"><p>Attempt to set up the Bluetooth controller and pair your dive computer using
+the graphical environment of the operating system. After setting the dive
+computer to upload mode, click the Bluetooth icon in the system tray and
+select <em>Add new device</em>. The dive computer should appear. If asked for a
+password, enter 0000.  Write down or copy the MAC address of your dive
+computer - this needed later and should be in the form  00:11:22:33:44:55.</p></div>
+<div class="paragraph"><p>If the graphical method didn&#8217;t work, pair the device from the command
+line. Open a terminal and use <code>hciconfig</code> to check the Bluetooth controller
+status</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ hciconfig
+hci0:   Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *DOWN*
+        RX bytes:504 acl:0 sco:0 events:22 errors:0
+        TX bytes:92 acl:0 sco:0 commands:21 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB,
+connected as hci0.  Its status is <em>DOWN</em>, i.e. not powered.  Additional
+controllers will appear as hci1, etc.  If there is not a Bluetooth dongle
+plugged in upon booting the computer, hci0 is probably the onboard.  Now
+power on the controller and enable authentication:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci0 up auth+  (enter password when prompted)
+hciconfig
+hci0:  Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *UP RUNNING PSCAN AUTH*
+        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><code>Check that the status now includes +<em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div>
+<div class="paragraph"><p>If there are multiple controllers running, it&#8217;s easiest to off the unused
+controller(s). For example, for <code>hci1</code>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci1 down</code></pre>
+</div></div>
+<div class="paragraph"><p>Next step is to <em>trust</em> and <em>pair</em> the dive computer. On distros with Bluez
+5, such as Fedora 22, one can use a tool called <code>blutootctl</code>, which will
+bring up its own command prompt.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>bluetoothctl
+[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]
+[bluetooth]# agent on
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# scan on                        &lt;----now set your dive computer to upload mode
+Discovery started
+[CHG] Controller 01:23:45:67:89:AB Discovering: yes
+[NEW] Device 00:11:22:33:44:55 Petrel
+[bluetooth]# trust 00:11:22:33:44:55        &lt;----you can use the tab key to autocomplete the MAC address
+[CHG] Device 00:11:22:33:44:55 Trusted: yes
+Changing 00:11:22:33:44:55 trust succeeded
+[bluetooth]# pair 00:11:22:33:44:55
+Attempting to pair with 00:11:22:33:44:55
+[CHG] Device 00:11:22:33:44:55 Connected: yes
+[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345
+[CHG] Device 00:11:22:33:44:55 Paired: yes
+Pairing successful
+[CHG] Device 00:11:22:33:44:55 Connected: no</code></pre>
+</div></div>
+<div class="paragraph"><p>If asked for a password, enter 0000. It&#8217;s ok if the last line says
+<em>Connected: no</em>. The important part is the line above, <code>Pairing successful</code>.</p></div>
+<div class="paragraph"><p>If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04),
+there is probably not a <code>bluetoothctl</code>, but a script called
+<code>bluez-simple-agent</code> or just <code>simple-agent</code>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>hcitool -i hci0 scanning
+Scanning ...
+        00:11:22:33:44:55       Petrel
+        bluez-simple-agent hci0 00:11:22:33:44:55</code></pre>
+</div></div>
+<div class="paragraph"><p>Once ther dive computer is pired, set up the RFCOMM connection</p></div>
+</div>
+<div class="sect4">
+<h5 id="_establishing_the_rfcomm_connection">Establishing the RFCOMM connection</h5>
+<div class="paragraph"><p>The command to establish an RFCOMM connection is:</p></div>
+<div class="paragraph"><p><code>sudo rfcomm -i &lt;controller&gt; connect &lt;dev&gt; &lt;bdaddr&gt; [channel]</code></p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+&lt;controller&gt;+ is the Bluetooth controller, <code>hci0</code>.
+</p>
+</li>
+<li>
+<p>
+&lt;dev&gt; is the RFCOMM device file, <code>rfcomm0</code>
+</p>
+</li>
+<li>
+<p>
+&lt;bdaddr&gt; is the dive computer&#8217;s MAC address, <code>00:11:22:33:44:55</code>
+</p>
+</li>
+<li>
+<p>
+[channel] is the dive computer&#8217;s Bluetooth channel we need to connect to.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>If one omits it, channel 1 is assumed.  Based on a limited number of user
+reports, the appropriate channel for the dive computer is probably:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Shearwater Petrel 2</em>: channel 5
+</p>
+</li>
+<li>
+<p>
+<em>Shearwater Petrel 1</em>: channel 1
+</p>
+</li>
+<li>
+<p>
+<em>Heinrichs-Weikamp OSTC Sport</em>: channel 1
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>E.g. to connect a <em>Shearwater Petrel 2</em>, set the dive computer to upload
+mode and enter:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)</code></pre>
+</div></div>
+<div class="paragraph"><p>This gives the response:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive
+computer to upload mode and enter:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)
+Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>If the specific channel the dive computer needs is not known, or the channel
+in the list above doesn&#8217;t work, the command <code>sdptool records</code> should help
+determine the appropriate channel. The output below is for a <em>Shearwater
+Petrel 2</em>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sdptool -i hci0 records 00:11:22:33:44:55
+Service Name: Serial Port
+Service RecHandle: 0x10000
+Service Class ID List:
+        "Serial Port" (0x1101)
+        Protocol Descriptor List:
+        "L2CAP" (0x0100)
+        "RFCOMM" (0x0003)
+        Channel: 5</code></pre>
+</div></div>
+<div class="paragraph"><p>For a Bluetooth dive computer not in the list above, or if the channel
+listed is not correct, please let the Subsurface developers know on the user
+forum or the developer mailing list <em>subsurface@subsurface-divelog.org</em>.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_download_the_dives_with_subsurface_lt_em_gt">Download the dives with Subsurface&lt;/em&gt;</h5>
+<div class="paragraph"><p>After establishing the RFCOMM connection and while the dive computer&#8217;s
+upload mode countdown is still running, go to_Subsurface_, select
+<em>Import&#8594;Import from dive computer</em> and enter appropriate Vendor
+(e.g. <em>Shearwater</em>), Dive Computer (<em>Petrel</em>), Device or Mount Point
+(<em>/dev/rfcomm0</em>) and click <em>Download</em>.</p></div>
+</div>
+</div>
+</div>
+</div>
+</div>
 <div class="sect1">

 <h2 id="_appendix_b_dive_computer_specific_information_for_importing_dive_information">16. APPENDIX B: Dive Computer specific information for importing dive data.</h2>

 <div class="sectionbody">

@@ -5204,13 +5395,16 @@ name from the console as follows: <code>irattach irda0</code></td>
 </tr></table>

 </div>

 <div class="paragraph"><p>After executing this command, Subsurface will recognise the Galileo dive

-computer and download dive information.</p></div>

-<div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are

-available from some Internet web sites e.g.

-<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.</p></div>

-<div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not available

-for OSX 10.6 or higher.</p></div>

-</div>

+computer and download dive information.</p></div>
+<div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are
+available from some Internet web sites e.g.
+<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.
+Windows-based IrDA drivers for the Uwatec can also be downloaded from the
+ScubaPro web site, drivers being located on the download page for the
+ScubaPro SmartTrak software.</p></div>
+<div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not available
+for OSX 10.6 or higher.</p></div>
+</div>
 <div class="sect2">

 <h3 id="S_ImportingDR5">16.3. Importing from Heinrichs Weikamp DR5</h3>

 <div class="admonitionblock">

@@ -5460,9 +5654,9 @@ Within the list of dives, select the dives you would like to import later:
 </p>

 <div class="ulist"><ul>

 <li>

-<p>

-To select certain dives: hold <em>ctrl</em> and click the dive

-</p>

+<p>
+To select certain dives: hold <em>ctrl</em> and click the dive
+</p>
 </li>
 <li>
 <p>
@@ -5471,9 +5665,9 @@ To select all dives: Select the first dive, hold down shift and select the
 </p>
 </li>
 </ul></div>
-</li>

-<li>

-<p>

+</li>
+<li>
+<p>
 With the dives marked, use the program menu <em>File &#8594; Export</em>

 </p>

 </li>

@@ -5700,39 +5894,41 @@ information for each dive is stored in a single row.  <em>Subsurface</em> suppor
 many data items (Dive #, Date, Time, Duration, Location, GPS, Max Depth,

 Mean Depth, Buddy, Notes, Weight and Tags).  The user can organize dive data

 following a few simple rules:</p></div>

-<div class="olist arabic"><ol class="arabic">

-<li>

-<p>

-Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy

-</p>

-</li>

-<li>

-<p>

-Duration: the format should be minutes:seconds.

-</p>

-</li>

-<li>

+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa
+</p>
+</li>
+<li>
+<p>
+Durée : le format est minutes:secondes.
+</p>
+</li>
+<li>
 <p>

 Unit system: only one unit system should be used (i.e., no mixture between

    imperial and metric units)

 </p>

-</li>

-<li>

-<p>

-Tags and buddies: values should be separated using a comma.

-</p>

-</li>

-<li>

-<p>

-GPS position: users must use decimal degrees, e.g. 30.22496 30.821798

-</p>

-</li>

-</ol></div>

-<div class="sect2">

-<h3 id="_em_libreoffice_calc_em_and_em_openoffice_calc_em">18.1. <em>LibreOffice Calc</em> and <em>OpenOffice Calc</em></h3>

-<div class="paragraph"><p>These are open source spreadsheet applications forming parts of larger open

-source office suite applications. The user interaction with <em>LibreOffice</em>

-and <em>OpenOffice</em> is very similar.  In Libreoffice Calc the time format

+</li>
+<li>
+<p>
+Étiquettes et équipiers : les valeurs doivent être séparées par des
+   virgules.
+</p>
+</li>
+<li>
+<p>
+Position GPS : vous devez utiliser les degrés décimaux, par exemple :
+   30.22496 30.821798
+</p>
+</li>
+</ol></div>
+<div class="sect2">
+<h3 id="_em_libreoffice_calc_em_et_em_openoffice_calc_em">18.1. <em>LibreOffice Calc</em> et <em>OpenOffice Calc</em></h3>
+<div class="paragraph"><p>These are open source spreadsheet applications forming parts of larger open
+source office suite applications. The user interaction with <em>LibreOffice</em>
+and <em>OpenOffice</em> is very similar.  In Libreoffice Calc the time format
 should be set to minutes:seconds - [mm]:ss and dates should be set to one

 of: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy. A typical dive log may look like

 this:</p></div>

@@ -5881,16 +6077,16 @@ because you have fifty minutes worth of samples - but subsurface will say
 it&#8217;s 45 minutes - because you were actually diving for 45 minutes.  It&#8217;s

 even more noticeable if you do things like divemastering the initial OW

 dives, when you may stay in the water for a long time, but spend most of it

-at the surface. And then you don&#8217;t want that to count as some kind of long

-dive”.</p></div>

-</div>

+at the surface. And then you don&#8217;t want that to count as some kind of long
+dive”.</p></div>
+</div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-05-18 11:34:51 CEST
+Last updated 2015-05-28 16:14:18 CEST
 </div>
 </div>
 </body>