Documentation: update french translation of user-manual

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

Documentation/user-manual_fr.txt

@@ -39,6 +39,8 @@ rapport à d'autres solutions logicielles similaires :
    vos enregistrements de plongées sur d'autres systèmes d'exploitation.
  - Avez-vous besoin d'un planificateur de plongée graphique intuitif qui
    intègre et prend en compte les plongées qui ont déjà été enregistrées ?
+ - Do you need a way of storing or backing up your dive log on the Internet,
+   allowing you to view your dive log from anywhere, using an Internet browser?
 
 _Subsurface_ est disponible pour Windows (Win XP ou plus récent), les Macs
 basés sur processeurs Intel (OS/X) et de nombreuses distributions
@@ -121,10 +123,10 @@ taille de chaque panneau. _Subsurface_ mémorise la position de ces
 séparateurs, pour qu'au prochain lancement _Subsurface_ utilise ces
 positions.
 
-Si une plongée est sélectionnée dans la *liste des plongées*, l'emplacement
+Si une unique plongée est sélectionnée dans la *liste des plongées*,
-de la plongée, les informations détaillées et le profil de la _plongée
+l'emplacement de la plongée, les informations détaillées et le profil de la
-sélectionnée_ sont affichées dans les panneaux respectifs. D'autre part, si
+_plongée sélectionnée_ sont affichées dans les panneaux respectifs. D'autre
-plus d'une plongée est mise en surbrillance seule la dernière mise en
+part, si plusieurs plongées sont sélectionnées, la dernière mise en
 surbrillance est la _plongée sélectionnée_, mais les données de _toutes les
 plongées mises en surbrillances_ sont affichées dans l'onglet *Stats* du
 panneau *informations* (profondeur maximale, minimale et moyenne, les
@@ -234,7 +236,7 @@ image::images/AddDive1_f22.jpg["FIGURE: Add dive", align="center"]
 
 When one edits a field in Notes or Equipment panels, _Subsurface_ enters
 *Editing Mode*, indicated by the message in the blue box at the top of the
-_Notes_ panel (see the image below). This message is displayed in all the
+*Notes* panel (see the image below). This message is displayed in all the
 panels under Notes and Equipment when in *Editing Mode*.
 
 image::images/BlueEditBar_f22.jpg["Blue edit bar", align="center"]
@@ -259,32 +261,31 @@ best represent the dive being described:
 image::images/DiveProfile1_f20.jpg["FIGURE: Initial dive profile", align="center"]
 
 _Modifying the dive profile_: When the cursor is moved around the dive
-profile, its position is indicated by two coloured lines (red and green) as
+profile, its position is indicated by two right-angled red lines as shown
-shown below.  The depth and time that the cursor represents are indicated at
+below.  The time and depth represented by the cursor are indicated at the
-the top of the black information box (@ and D). The units (metric/imperial)
+top of the black information box (@ and D). The units (metric/imperial) on
-on the axes are determined by the *Preference* settings. The dive profile
+the axes are determined by the *Preference* settings. The dive profile
 itself comprises several line segments demarcated by waypoints (white dots
 on the profile, as shown above). The default dive depth is 15 m.  If the
 dive depth was 20 m then the user needs to drag the appropriate waypoints
 downwards to represent 20 m. To add a waypoint, double-click on any line
 segment. To move an additional waypoint, drag it.  To remove this waypoint,
-right-click on it and choose "Remove this point" from the context menu. The
+right-click on it and choose "Remove this point" from the context menu. Drag
-user needs to drag the waypoints to represent an accurate time duration for
+the waypoints to represent an accurate time duration for the dive. Below is
-the dive. Below is a dive profile that represents a dive to 20 m for 30 min,
+a dive profile for a dive to 20 m for 30 min, followed by a 5 minute safety
-followed by a 5 minute safety stop at 5 m.
+stop at 5 m.
 
 image::images/DiveProfile2_f20.jpg["FIGURE: Edited dive profile", align="center"]
 
 _Specifying the gas composition:_ The gas composition used is clearly
 indicated along the line segments of the dive profile. This defaults to the
 first gas mixture specified in the *Equipment* tab, which was air in the
-case of the profile illustrated above. The gas mixtures of segments of the
+case of the profile above. The gas mixtures of segments of the dive profile
-dive profile can be edited. This is done by right-clicking on the particular
+can be edited. This is done by right-clicking on the particular waypoint and
-waypoint and selecting the appropriate gas from the context menu. Changing
+selecting the appropriate gas from the context menu. Changing the gas for a
-the gas for a waypoint affects the gas shown in the segment _to the left_ of
+waypoint affects the gas shown in the segment _to the left_ of that
-that waypoint. Note that only the gases defined in the *Equipment* tab
+waypoint. Note that only the gases defined in the *Equipment* tab appear in
-appear in the context menu. Below is the profile of a dive to 25 m for 30
+the context menu (see image below).
-min and with a switch from air to EAN50 at the end of the duration at 20m.
 
 image::images/DiveProfile3_f20.jpg["FIGURE: Gas composition context menu", align="center"]
 
@@ -338,10 +339,10 @@ be achieved by following these steps:
 	or Bluetooth connection set up as described later in this manual)
 
 2. The dive computer should be placed into PC Communication mode.
-	(Users should refer to the manual of their specific dive computer)
+	(Se reporter au manuel de l'ordinateur de plongée)
 
-3. In _Subsurface_, from the Main Menu, the user must select _Import -> Import
+3. In _Subsurface_, from the Main Menu, select _Import -> Import From Dive
-   From Dive Computer_.  Dialogue *A* in the figure below appears:
+   Computer_.  Dialogue *A* in the figure below appears:
 
 
 image::images/DC_import_f20.jpg["FIGURE: Download dialogue 1", align="center"]
@@ -351,10 +352,7 @@ though these dives have already been imported to _Subsurface_. For that
 reason, if the divecomputer allows this, _Subsurface_ only imports dives
 that have not been uploaded before. This makes the download process faster
 on most dive computers and also saves battery power of the dive computer (at
-least for those not charging while connected via USB).  If, for some reason,
+least for those not charging while connected via USB).
-the user wishes to import ALL dives from the dive computer, even though some
-may already be in the logbook, then check the check box labeled _Force
-download of all dives_.
 
  - The dialogue has two drop-down lists, *Vendor* and *Dive Computer*. On the
    *vendor* drop-down list select the make of the computer, e.g.  Suunto,
@@ -387,7 +385,7 @@ download of all dives_.
  - If the checkbox _Always prefer downloaded dives_ has been checked and,
    during download, dives with identical date-times exist on the dive computer
    and on the _Subsurface_ *Dive List* panel, the dive in the _Subsurface_
-   divelog will be overwritten by the dive record from the dive computer
+   divelog will be overwritten by the dive record from the dive computer.
 
  - The checkbox marked _Download into new trip_ ensures that, after upload, the
    downloaded dives are grouped together as a new trip(s) in the *Dive List*.
@@ -396,28 +394,25 @@ download of all dives_.
    _Save libdivecomputer dumpfile_. These are only used as diagnostic tools
    when problems with downloads are experienced (see below).
 
- - Then select the _Download_ button. After successful download, Dialogue *B*
+ - Then select the _Download_ button.  With communication established, one can
-   in the figure above appears.
+   see how the data are retrieved from the dive computer.  Depending on the
-
+   make of the dive computer and/or number of recorded dives, this could take
- - With communication established, one can see how the data are retrieved from
+   some time. Be patient. The _Download_ dialogue shows a progress bar at the
-   the dive computer.  Depending on the make of the dive computer and/or number
+   bottom of the dialogue (for some dive computers the progress information
-   of recorded dives, this could take some time. Be patient. The _Download_
+   could be inaccurate as we cannot determine how much downloadable data there
-   dialogue shows a progress bar at the bottom of the dialogue (for some dive
+   is until all data have been downloaded). After successful download, Dialogue
-   computers the progress information could be inaccurate as we cannot
+   *B* in the figure above appears.  After the dives have been downloaded, they
-   determine how much downloadable data there is until all data have been
+   appear in a tabular format on the righthand side of the dialogue (see image
-   downloaded). When the download of the dive information is complete, all the
+   *B*, above). Each dive comprises a row in the table, with the date, duration
+   and depth shown. Next to each dive is a checkbox: check all the dives that
+   need to be transfered to the *Dive List*. In the case of the image above,
+   the last six dives are checked and will be transfered to the *Dive
+   List*. Then click the _OK_ button at the bottom of the dialogue. All the
    imported dives appear in the *Dive List*, sorted by date and
    time. Disconnect and switch off the dive computer to conserve its battery
-   power.  If a particular dive is selected, the *Dive Profile* panel shows an
+   power.
-   informative graph of dive depth against time for that particular dive.
 
 
-After the dives have been downloaded, they appear in a tabular format on the
-righthand side of the dialogue (see image *B*, above). Each dive comprises a
-row in the table, with the date, duration and depth shown. Next to each dive
-is a checkbox: check all the dives that need to be transfered to the *Dive
-List*. In the case of the image above, the last six dives are checked and
-will be transfered to the *Dive List*.
 
 After this has been completed, select the OK button.  The checked dives are
 transfered to the *Dive List*.
@@ -490,7 +485,7 @@ upload dive logs to _Subsurface_. For instance if one's partner's dive
 computer is the same make and model as one's own and dive logs are uploaded
 from both dive computers to the same _Subsurface_ computer, then one would
 perhaps like to call one dc "Alice's Suunto D4" and the other one "Bob's
-Suunto D4". Alternatively, perhaps a technical diver dives with two or more
+Suunto D4". Alternatively, consider a technical diver dives with two or more
 dive computers of the same model, the logs of both (or all) being uploaded.
 In this case it might be prudent to call one of them "Suunto D4 (1)" and
 another one "Suunto D4 (2)". This is easily done in _Subsurface_.  On the
@@ -509,20 +504,20 @@ fuller record of the dives. To do this, the *Notes* and the *Equipment* tabs
 on the top left hand of the _Subsurface_ window should be used.
 
 [[S_Notes_dc]]
-==== Notes
+===== Notes
 
-The user needs to add additional information by hand in order to have a more
+To have a more complete dive record the user needs to add additional
-complete dive record. The information below is almost identical for
+information by hand. The procedure below is virtually identical for
 hand-entered dives and for dives downloaded from a dive computer.
 
 In some cases, one has to provide the date and time of the dive, e.g. when
 entering a dive by hand or when a dive computer does not privide the date
-and time of the dive.  (Often, the date and time of the dive, gas mixture
+and time of the dive.  (Usually the date and time of the dive, gas mixture
-and water temperature are usually shown as obtained from the dive computer)
+and water temperature are shown as obtained from the dive computer)  If the
-If the contents of the *Notes tab* is changed or edited in any way, the
+contents of the *Notes tab* is changed or edited in any way, the message in
-message in a blue box at the top of the panel indicates that the dive is
+a blue box at the top of the panel indicates that the dive is being
-being edited. If one clicks on the *Notes* tab, the following fields are
+edited. If one clicks on the *Notes* tab, the following fields are visible
-visible (left hand image, below):
+(left hand image, below):
 
 image::images/AddDive3_f22.jpg["FIGURE: The Notes tab", align="center"]
 
@@ -534,14 +529,14 @@ minutes) can also be edited directly by clicking on each of them in the text
 box and by overtyping the information displayed.
 
 *Air/water temperatures*: Air and water temperatures during the dive are shown
-in these fields to the right of the Start time. Many dive computers supply water
+in text boxes to the right of the Start time. Many dive computers supply water
-temperature information and this field may therefore contain information obtained from the dive computer.
+temperature information and this box may therefore contain information.
 If air temperature is not provided by the dive computer, the first temperature reading
 might be used for the air temperature. Generally this is close enough to the real air temperature as
 the change in the temperature sensor reading is quite slow to follow the changes in the environment.
 If editing is required, only a value is required, the units of temperature will be
 automatically supplied by
-_Subsurface_ (according to the _Preferences_, metric or imperial units will
+_Subsurface_ (following the _Preferences_, metric or imperial units will
 be used).
 
 *Location*: Here the name of the dive site can be entered, e.g. "Tihany, Lake
@@ -551,9 +546,9 @@ performed at the same location, the information is re-used without requiring
 full dive site information again. Existing dive location information
 can be edited at any time by selecting (on the *Dive List* panel) a dive performed at that site
 and by opening the location information by clicking the globe button on the
-right of the location name (see image on the right above). When entering a dive location name, auto completion of
+right of the location name (see image on the righ, above). When entering a dive location name, auto location of
-location names makes it easy to select a dive site that already exists in the dive log
+dive site names makes it easy to select a dive site that already exists in the dive log
-(i.e. when typing in the name of a dive site,
+(i.e. when typing the name of a dive site,
 a dropdown list appears showing all sites with similar names). If the dive
 site has been used before, click on the already-existing name.
 
@@ -599,29 +594,29 @@ dives have the same location and try to keep their GPS coordinates the
 same).
 
 Enter any other textual information about the dive site (Description and
-Notes), then select _Apply Changes_ to save the information for this dive
+Notes), then select _Apply Changes_ to save the geolocation for this dive
 site. At a later stage the dive site information can be edited by clicking
 the globe icon to the right of the dive site name in the *Notes tab*.
 
 *Dive mode*: This is a dropdown box allowing one to choose the type of dive
-performed. The options are OC (Open Circuit, the default seting, meant for most recreational dives),
+performed. The options are OC (Open Circuit SCUBA, the default seting, meant for most recreational dives),
 Freedive (dive without SCUBA equipment), CCR (Closed-circuit
 rebreather) and pSCR (Passive semi-closed rebreather).
 
 *Divemaster*: The name of the dive master or dive guide for this dive should be
 entered in this field
-which offers auto completion based on the list of dive masters in
+which offers auto selection based on the list of dive masters in
 the current logbook.
 
 *Buddy*: In this field, one enters the name(s) of the buddy / buddies
 (separated with commas) who accompanied him/her on the
-dive. Auto completion based on the list of buddies in the current logbook is
+dive. Auto selection based on the list of buddies in the current logbook is
 offered.
 
-*Suit*: Here the type of diving suit used for the dive can be entered.
+*Suit*: Here the type of dive suit used can be entered.
-Auto completion of the suit description is available.
+Auto selection of the suit description is available.
 Some dry-suit users may choose to use this field to record what combination of
-suit and thermal protection undersuit was used.
+suit and thermal undersuit was used.
 
 *Rating*: One can provide a subjective overall rating of the dive on a
 5-point scale by clicking the appropriate star on the rating scale.
@@ -641,14 +636,13 @@ typed
 
 *Notes*: Any additional information for the dive can be entered here.
 
-The *Save* and *Cancel* buttons are used to save all the information for
+The _Apply changes_ and _Discard changes_ buttons are used to save all the
-tabs in the info panel and in the dive profile panel, so there's no need to
+information for tabs in the *Info* panel and in the *Dive Profile* panel, so
-use them until ALL other information has been added. The image
+there's no need to use them until *ALL* other information has been
-xref:S_Notes_dc[at the beginning of this section] shows an example of a
+added. The image xref:S_Notes_dc[at the beginning of this section] shows an
-*Notes tab* containing dive information.
+example of a *Notes tab* after completion of the dive information.
 
-
+===== Equipment
-==== Equipment
 
 The Equipment tab allows one to enter information about the type of cylinder
 and gas used as well as the weights used for the dive. The message in a blue
@@ -658,7 +652,7 @@ image::images/BlueEditBar_f22.jpg["FIGURE: Blue edit bar", align="center"]
 
 indicates that the dive is being edited. This is a highly interactive part
 of _Subsurface_ and the information on cylinders and gases (entered here)
-determines the behaviour of the dive profile (top right-hand panel).
+determines the behaviour of the *Dive profile* (top right-hand panel).
 
 [[cylinder_definitions]]
 *Cylinders*: The cylinder information is entered through a dialogue that looks
@@ -667,28 +661,28 @@ like this:
 image::images/DC_gas-dialogue1_f20.jpg["FIGURE: Initial cylinder dialogue", align="center"]
 
 For hand-entered dives, this information needs to be typed in. For dive
-computers _Subsurface_ often obtains the gas used from the dive computer and
+computers, _Subsurface_ often obtains the gas used from the dive computer
-automatically inserts the gas composition(% oxygen) in the table. The +
+and automatically inserts the gas composition(% oxygen or % helium) in the
-button at the top right allows the user to add more cylinders for this
+table. The + button at the top right allows the user to add more cylinders
-dive. The dark dustbin icon on the left allows the deletion of information
+for this dive. The dark dustbin icon on the left allows the deletion of
-for a cylinder.  Note that it is not possible to delete a cylinder if it is
+information for a cylinder.  Note that it is not possible to delete a
-used during the dive. A cylinder might be implicitly used in the dive, even
+cylinder if it is used during the dive. A cylinder might be implicitly used
-without a gas change event.
+in the dive, even without a gas change event.
 
 The user should start by selecting a cylinder type on the left-hand side of
-the table.  To select a cylinder, the *cylinder type* box should be
+the table.  To select a cylinder, the _Type_ box should be clicked. This
-clicked. This brings up a list button that can be used to display a dropdown
+brings up a list button that can be used to display a dropdown list of
-list of cylinders:
+cylinders:
 
 image::images/DC_gas-dialogue2_f20.jpg["FIGURE: The cylinder drop-down list button", align="center"]
 
 The drop-down list can then be used to select the cylinder type that was
 used for this dive or the user may start typing in the box which shows the
 available options for the entered characters. The *Size* of the cylinder as
-well as its working pressure (*WorkPress*) will automatically be shown in
+well as its working pressure (_Work.press_) will automatically be shown in
 the dialogue.
 
-Next one must indicate the starting pressure and the ending pressure of the
+Next, indicate the starting pressure and the ending pressure of the
 specified gas during the dive. The unit of pressure (metric/imperial)
 corresponds to the settings chosen in the _Preferences_.
 
@@ -696,10 +690,11 @@ Finally, provide the gas mixture used. If air was used, the value of 21% can
 be entered or this field can be left blank. If nitrox or trimix were used,
 their percentages of oxygen and/or helium should be entered.  Any
 inappropriate fields should be left empty. After typing the information for
-the cylinder, either press _ENTER_ on the keyboard or click outside the cell
+the cylinder, save the data either by pressing _ENTER_ on the keyboard or by
-that contains the cursor. Information for any additional cylinders can be
+clicking outside the cell containing the cursor. Information for any
-added by using the + button at the top right hand. Following is an example
+additional cylinders can be added by using the + button at the top right
-of a complete description for a dive using two cylinders (air and EAN50):
+hand. Following is an example of a complete description for a dive using two
+cylinders (air and EAN50):
 
 image::images/CylinderDataEntry3_f20.jpg["FIGURE: a completed cylinder dive information table", align="center"]
 
@@ -711,28 +706,27 @@ this:
 
 image::images/WeightsDataEntry1_f20.jpg["FIGURE:The Weights dialogue", align="center"]
 
-By clicking on the *Type* field, a drop-down list becomes accessible through
+By clicking on the _Type_ field, a drop-down list becomes accessible through
 a down-arrow:
 
 image::images/WeightsDataEntry2_f20.jpg["FIGURE:Weights type drop-down list button", align="center"]
-
+This can be used to select the type of weight system used during the dive or
-The drop-down list can then be used to select the type of weight system used
+the user may start typing in the box to specify a different weighting
-during the dive or the user may start typing in the box which shows the
+mechanism that will be saved by _Subsurface_.  In the *Weight* field, type
-available options for the entered characters.  In the *Weight* field, type
 in the amount of weight used during the dive. After specifying the weight
-system, the user can either press _ENTER_ on the keyboard or click outside
+system, save the data by either pressing _ENTER_ on the keyboard or by
-the cell with the cursor.  It is possible to enter information for more than
+clicking outside the cell with the cursor.  It is possible to enter
-one weight system by adding an additional system using the + button on the
+information for more than one weight system by adding an additional system
-top right hand. Weight systems can be deleted using the dustbin icon on the
+using the + button on the top right hand. Weight systems can be deleted
-left hand. Here is an example of information for a dive with two types of
+using the dustbin icon on the left hand. Here is an example of information
-weights: integrated as well as a weight belt:
+for a dive with two types of weights: integrated as well as a weight belt:
 
 image::images/WeightsDataEntry3_f20.jpg["FIGURE: A completed weights information table", align="center"]
 
 ==== Editing several selected dives simultaneously
 
 _METHOD 1_: After uploading dives from a dive computer, the dive profiles of
-the uploaded dives are shown in the *Dive profile* tab, as well as a few
+each uploaded dive is shown in the *Dive profile* tab, as well as a few
 items of information in the *Notes* tab (e.g. water temperature) and in the
 *Equipment* tab (e.g. gas pressures and gas composition). However the other
 fields remain empty.  It may be useful to simultaneously edit some of the
@@ -815,7 +809,7 @@ has to export the logbook(s) to an intermediate format so that they can then
 be imported by _Subsurface_.  Currently, _Subsurface_ supports importing CSV
 log files from several sources.  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. in spreadsheet)
+configure their own imports.  Manually kept log files (e.g. a spreadsheet)
 can also be imported by configuring the CSV import.  _Subsurface_ can also
 import UDDF and UDCF files used by some divelog software and some dive
 computers, like the Heinrichs & Weikamp DR5. Finally, for some divelog
@@ -831,14 +825,16 @@ computers, including Suunto and Shearwater. When importing dives,
 _Subsurface_ tries to detect multiple records for the same dive and merges
 the information as best as it can. If there are no time zone issues (or
 other reasons that would cause the beginning time of the dives to be
-significantly different) _Subsurface_ will not create duplicate entries.
+significantly different) _Subsurface_ will not create duplicate
+entries. Below follows more specific information to achieve data import to
+_Subsurface_.
 
 ==== Using the universal import dialogue
 [[Unified_import]]
 
 Importing dives from other software is performed through a universal
-interface that is activated by selecting _Import_ from the Main Menu, then
+interface activated by selecting _Import_ from the Main Menu, then clicking
-clicking on _Import Log Files_. This brings up the dialogue *A* below.
+on _Import Log Files_. This brings up dialogue *A*, below.
 
 image::images/Import1_f20.jpg["FIGURE: Import dialogue: step 1", align="center"]
 
@@ -848,14 +844,20 @@ available, as in dialogue *B*, above. Currently these are:
 
  - XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log
    systems)
+ - Cochran dive logs
  - UDDF-formatted dive logs (e.g. Kenozoooid)
  - UDCF-formatted dive logs
  - Poseidon MkVI CCR logs
+ - APD Inspiration/Evolution CCR logs
+ - LiquiVision logs
+ - divelog.de logs
+ - OSTC Tools logs
  - JDiveLog
  - Suunto Dive Manager (DM3 and DM4)
  - CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
 
-Selecting the appropriate file in the file list of the dialogue opens the
+Selecting the appropriate format and then the specific log file in the large
+window containing the file list on the right of the dialogue opens the
 imported dive log in the _Subsurface_ *Dive List*. Some other formats, not
 accessible through the Import dialogue are also supported, as explained
 below.
@@ -871,15 +873,15 @@ select _OSTCTools Files (.dive .DIVE)_. This makes the _OSTC Tools_ dive
 logs visible in the file list panel. Select one or more dive, then click the
 _Open_ button. The OSTC dives are shown in the *Dive List* panel.
 
-Actually, every H&W device supported by OSTCTools can be imported to
+Actually, all H&W devices supported by OSTCTools can be imported to
 _Subsurface_, this includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport,
 and probably although untested, Frog, OSTC2 and OSTC CR.
 
 Please, remember that OSTCTools is *not* a true diving log software, but a
 useful set of tools for analysis and management of OSTC devices. This way,
-only raw dive computer data will be achieved with the import to
+only raw dive computer data will be performed with the import to
-_Subsurface_; user still have to manually complete the rest of data which
+_Subsurface_; one has to to manually complete the rest of data which may be
-may be of some importance for him (buddies, equipment, notes, etc).
+important (buddies, equipment, notes, etc).
 
 
 ==== Importing from Mares Dive Organiser V2.1
@@ -890,9 +892,9 @@ into _Subsurface_. Mares dive logs need to be imported using a three-step
 process, using _www.divelogs.de_ as a mechanism to extract the dive log
 information.
 
-1. The dive log data from Mares Dive Organiser need to be exported to the
+1. Export the dive log data from Mares Dive Organiser to the user's desktop,
-   user's desktop, using a _.sdf_ file name extension. Refer to
+   using a _.sdf_ file name extension. Refer to xref:Mares_Export[Appendix C]
-   xref:Mares_Export[Appendix C] for more information.
+   for more information.
 2. Data should then be imported into _www.divelogs.de_. One needs to create a
    user account in _www.divelogs.de_, log into that web site, then select
    _Import Logbook -> Dive Organiser_ from the menu on the left hand side.  The
@@ -907,13 +909,13 @@ information.
 
 The import of dive information from _divelogs.de_ is simple, using a single
 dialogue box. The _Import -> Import from Divelogs.de_ option should be
-selected from the Main Menu. This brings up a dialogue box (see figure on
+selected from the Main Menu. This brings up a dialogue box (see image *A*
-left [*A*] below). Enter a user-ID and password for _divelogs.de_ into the
+below). Enter a user-ID and password for _divelogs.de_ into the appropriate
-appropriate fields and then select the _Download_ button. Download from
+fields and then select the _Download_ button. Download from _divelogs.de_
-_divelogs.de_ starts immediately, displaying a progress bar in the dialogue
+starts immediately, displaying a progress bar in the dialogue box. At the
-box. At the end of the download, the success status is indicated (see figure
+end of the download, the success status is indicated (see image *B*,
-on the right [*B*], below). The _Apply_ button should then be selected,
+below). The _Apply_ button should then be selected, after which the imported
-after which the imported dives appear in the _Subsurface_ *Dive List* panel.
+dives appear in the _Subsurface_ *Dive List* panel.
 
 image::images/Divelogs1.jpg["FIGURE:Download from Divelogs.de", align="center"]
 
@@ -964,12 +966,12 @@ Before being able to import the _CSV_ data to _Subsurface_ *one needs to
 know a few things about the data being imported*:
 
 a. Which character separates the different columns within a single line of
-   data? This field separator should be either a comma (,) or a TAB character.
+   data? This field separator should be either a comma (,) a semicolon (;) or a
-   This can be determined by opening the file with a text editor. If it is
+   TAB character.  This can be determined by opening the file with a text
-   comma-delimited, then the comma characters between the values are clearly
+   editor. If it is comma-delimited or semicolon-delimited, the comma or
-   visible. If no commas are evident and the numbers are aligned in columns,
+   semicolon characters between the values are clearly visible. If these are
-   the file is probably TAB-delimited (i.e. it uses a TAB as a field
+   not evident and the numbers are aligned in columns, the file is probably
-   separator).
+   TAB-delimited (i.e. it uses a TAB as a field separator).
 
 b. Which data columns need to be imported into _Subsurface_? Is it a _CSV dive
    details_ file or a _CSV dive profile_ file? Open the file using a text
@@ -998,15 +1000,13 @@ imperial). Selecting the appropriate options among these is critical for the
 successful import of the data.
 
 The last remaining task is to ensure that all the data columns have the
-appropriate column headings. The top line of the white part of the data
+appropriate column headings. The top blue row of the data table contains the
-table contains the column headings found in the _CSV_ data file. The blue
+column headings found in the _CSV_ data file. The blue row of balloons
-row of cells immediately above these contains the names understood by
+immediately above these contains the names understood by _Subsurface_. These
-_Subsurface_. The white area below the dropdown lists contains all the field
+balloons can be moved using a drag-and-drop action. For instance,
-names that _Subsurface_ recognises. These names are in blue balloons and can
+_Subsurface_ expects the column heading for Dive number (" # ") to be "Dive
-be moved using a drag-and-drop action. For instance, _Subsurface_ expects
+# ". If the column heading that _Subsurface_ expects is not in the blue row,
-the column heading for Dive number (" # ") to be "Dive # ". If the column
+then drag the appropriate balloon from the upper area and drop it in the
-heading that _Subsurface_ expects is not in the blue cells, then drag the
-appropriate column heading from the upper area and drop it in the
 appropriate blue cell at the top of the table. To indicate the correct
 column for "Dive #", drag the ballooned item labeled "Dive # " and drop it
 in the blue cell immediately above the white cell containing " # ". This is
@@ -1017,7 +1017,7 @@ image::images/csv_import2_f20.jpg["FIGURE: CSV download dialogue 2", align="cent
 Continue in this way to ensure that all the column headings in the blue row
 of cells correspond to the headings listed in the top part of the
 dialogue. Having completed this task, select the _OK_ button to the bottom
-right og the dialogue.  The data from the _CSV_ file are imported and shown
+right of the dialogue.  The data from the _CSV_ file are imported and shown
 in the *Dive List* panel.
 
 [[S_CSV_Intro]]
@@ -1057,8 +1057,8 @@ using a comma as a field separator:
 	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
 
-In this format the data are not easily read by a human. Here is the same
+The above data are not easily read by a human. Here is the same information
-information in TAB-delimited format:
+in TAB-delimited format:
 
 	Dive site	Dive date	Time	Dive_duration	Dive_depth	Dive buddy
 	Illovo Beach	2012-11-23	10:45	46:15	18.4	John Smith
@@ -1104,7 +1104,7 @@ characters like ampersand (&), less than (<), greater than (>) and double
 quotes (") as part of the numbers or text within a cell. The file should use
 UTF-8 character set, if using non-ASCII characters. Also the size of the
 _CSV_ file might cause problems. Importing 100 dives at a time (_CSV dive
-details_) works, but larger files might exceed limits of the parser
+details_) works, but larger files might exceed the limits of the parser
 used. When encountering problems with _CSV_ imports, first try with a
 smaller file to make sure everything works.
 
@@ -1112,11 +1112,13 @@ smaller file to make sure everything works.
 [[S_Companion]]
 === Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones
 
-Using the *Subsurface Companion App* on an _Android device_ with a GPS or
+Using the *Subsurface Companion App* on an _Android device_   or
-xref:S_iphone[_iPhone_], the coordinates for the diving location can be
+xref:S_iphone[_iPhone_] with GPS, the coordinates
-automatically passed to the _Subsurface_ dive log. The Companion App stores
+for the diving
-the dive locations on a dedicated Internet-based file server. _Subsurface_,
+location can be automatically passed to the _Subsurface_
-in turn, can collect the localities from the file server.
+dive log. The Companion App stores the dive locations on
+a dedicated Internet file server. _Subsurface_, in turn, can collect
+the localities from the file server.
 
 To do this:
 
@@ -1207,7 +1209,7 @@ where the dive description or other details may be changed.
 image::images/Companion_4.jpg["FIGURE: Companion App, add location using map", align="center"]
 
 
-When one clicks on a dive (*not* selecting the check box), the name given to
+When one selects a dive (*not* selecting the check box), the name given to
 it, date/time and GPS coordinates will be shown, with two options at the top
 of the screen:
 
@@ -1416,15 +1418,17 @@ to be loaded into _Subsurface_ and click the _Open_ button.
 
 image::images/LoadImage2_f20.jpg["FIGURE: Load images option", align="center"]
 
-This brings one to the time synchronisation dialog, shown below. The
+This brings up the time synchronisation dialog, shown below. The critical
-critical problem is that the time synchronisation is not perfect between the
+problem is that the time synchronisation is not perfect between the dive
-dive computer used during a dive, and the camera used during that same
+computer used during a dive, and the camera used during that same
 dive. These two devices often differ by several minutes. If _Subsurface_ can
 achieve synchronisation, then the exact times of photographs can be used to
 position photographs on the dive profile.
 
-_Subsurface_ achieves this synchronisation in two ways:
+_Subsurface_ achieves this synchronisation in three ways:
 
+- *Pro-actively*: Before the dive, ensure synchronisation of the dive computer time settings with
+  the time settings of the camera by changing the date-time settings on one or both of these devices.
 - *Manually*: If the user wrote down the exact camera time at the start of a dive, the
   difference in time between the two devices can be determined. Actually, as long as the device
   settings for time has not been changed in either device, one could write down the times of
@@ -1443,35 +1447,35 @@ image::images/LoadImage3b_f20.jpg["FIGURE: Synchronisation dialog", align="cente
 - *By photograph*: There is a very slick way of achieving synchronisation. If one takes a
   photograph of the face of the dive computer showing the time, then _Subsurface_ can obtain
   the exact time the photograph was taken, using the metadata that the camera stores within
-  each photo. In order to do this, use the bottom half of the Time shift_ dialog. If one uses
+  each photo. In order to do this, use the bottom half of the _Time shift_ dialog. If one uses
   the bottom part, the top part of the dialog is ignored. Click on
   the horizontal bar entitled "_Select image of divecomputer showing time_. This brings up
-  a file browser with which one can select the photograph of the dive computer. Select the
+  a file browser with which one can select the photograph of the dive computer time. Select the
   photograph using the file browser and click on _OK_. This photograph of the dive computer
   appears in the bottom panel of the _Shift times_ dialog. Now _Subsurface_ knows exactly
   when the photograph has been taken. Now set the date-time dialog to the left of the photo
   so that this tool reflects the date and time of the dive computer in the photo. When the
   date-time tool has been set, _Subsurface_ knows exactly what the time difference between
-  camera and dive computer is, and synchronisation is achieved. There is a
+  camera and dive computer is, and synchronisation is achieved.
-  photograph with the face of the dive computer and with the date-time tool set to the
+  Image *B* above shows a photograph of the face of the dive computer and with the date-time tool set to the
-  date-time on image *B* above.
+  date-time.
 
-If the timestamp of a photograph is long before or after the dive, it is not
+If the timestamp of a photograph is more than 30 minutes before or after the
-placed on the dive profile. If the timestamp of the photo is within 30
+dive, it is not placed on the dive profile.
-minutes of the dive, it is shown.
 
 ==== Viewing the photos
 
-In order to view the photos added to a dive, activate the _show-photos_
-button in the tool bar to the left of the dive profile:
-
-image::images/icons/ShowPhotos_f20.png["FIGURE:Show photos toolbar button", align="left"]
-
 After the images have been loaded, they appear in two places:
 
  - the _Photos_ tab of the *Notes* panel.
  - as tiny icons (stubs) on the dive profile at the appropriate positions
-   reflecting the time each photograph was taken. See below:
+   reflecting the time each photograph was taken.  In order to view the photos
+   on the dive profile, activate the _show-photos_ button in the tool bar to
+   the left of the dive profile:
+
+image::images/icons/ShowPhotos_f20.png["FIGURE:Show photos toolbar button", align="left"]
+
+This results in a profile display as in the image below:
 
 image::images/LoadImage4_f20.jpg["FIGURE: Photos on dive profile", align="center"]
 
@@ -1507,18 +1511,18 @@ removes the photo both from the _Photos_ tab as well as the dive profile.
 ==== Photos on an external hard disk
 
 Most underwater photographers store their photos on an external drive. If
-such a drive can be mapped (almost always the case) the photos can be
+such a drive can be mapped by the operating system (almost always the case)
-directly accessed by _Subsurface_. This facilitates the interaction between
+the photos can be directly accessed by _Subsurface_. This facilitates the
-_Subsurface_ and an external repository of photos. When associating a dive
+interaction between _Subsurface_ and an external repository of photos. When
-profile with photos from an external drive, the normal procedure of
+associating a dive profile with photos from an external drive, the normal
-selection and synchronisation (see text above) is used.  However, after the
+procedure of selection and synchronisation (see text above) is used.
-external drive has been disconnected, _Subsurface_ cannot access these
+However, after the external drive has been disconnected, _Subsurface_ cannot
-photos any more.  If the display of photos is activated (using the toolbox
+access these photos any more.  If the display of photos is activated (using
-to the left of the _Dive Profile_), the program only shows a small white dot
+the toolbox to the left of the _Dive Profile_), the program only shows a
-where each photo should be on the dive profile.  In addition the _Photos_
+small white dot where each photo should be on the dive profile.  In addition
-tab only shows the file names of the photos. This is normal behaviour.  If,
+the _Photos_ tab only shows the file names of the photos. This is normal
-later, the external drive with the photos is connected again, the photos can
+behaviour.  If, later, the external drive with the photos is connected
-be seen in the normal way.
+again, the photos can be seen in the normal way.
 
 [[S_FindMovedImages]]
 ==== Moving photographs among directories, hard disks or computers
@@ -1561,16 +1565,16 @@ This is achieved by selecting from the Main Menu: _File ->      Find moved image
 [icon="images/icons/important.png"]
 [IMPORTANT]
 
-Software for the automated update of existing photo collections is under
+Software for the automated finger print calculation of existing photo
-developement. Currently single dives must be upgraded one at a time. Select
+collections is under developement. Currently single dives must be upgraded
-the toolbar button on the *Dive profile* panel that enables the display of
+one at a time. Select the toolbar button on the *Dive profile* panel that
-images. The thumbnails of images are shown on the dive profile. Then open
+enables the display of images. The thumbnails of images are shown on the
-the dive and change anything in the *Notes* panel that brings up the blue
+dive profile. Then open the dive and change anything in the *Notes* panel
-edit bar at the top of the notes panel to save the edits. For instance, add
+that brings up the blue edit bar at the top of the notes panel to save the
-a space character at the end of the _Notes_ text box and immediately delete
+edits. For instance, add a space character at the end of the _Notes_ text
-that space character. Select the optio _Apply changes_ in the blue edit bar
+box and immediately delete that space character. Select the optio _Apply
-to save the dive information.  Fingerprints are calculated while saving this
+changes_ in the blue edit bar to save the dive information.  Fingerprints
-specific dive.
+are calculated while saving this specific dive.
 
 ****
 
@@ -1623,12 +1627,12 @@ steps:
 
 - *During the dive, record cylinder switch events*. Since sidemount diving normally involves two
   cylinders with air or with the same gas mixture, _Subsurface_ distinguishes among these different
-  cylinders. In contrast, most dive computers that allow gas switching only distinguish among different
+  cylinders. In contrast, many dive computers that allow gas switching only distinguish among different
   _gases_ used, not among different _cylinders_ used. This means that when sidemount dives are downloaded
   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.
+  from a dive with the times of cylinder changes is the only tricky part of logging sidemount dives.
 - *Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the
   specifications of the different cylinders, using the *Equipment* tab of the *Info Panel* (see
   image below where two 12 litre cylinder were used).
@@ -1720,7 +1724,8 @@ format and the directory where the original dive logs have been stored from
 the CCR dive computer, one can select a particular dive log file (in the
 case of the MkVI it is a file with a .txt extension). After selecting the
 appropriate dive log, activate the _Open_ button at the bottom right hand of
-the universal import dialogue.  See the section below for
+the universal import dialogue.  The selected dive is imported to the
+_Subsurface_ dive list.
 
 ===== Displayed information for a CCR dive
 
@@ -1741,7 +1746,7 @@ follows:
   sensors are treated as spurious. If one of the three sensors provides
   spurious data, it is ignored.
 
-- If no sensor data is available, the pO~2~ value is assumed to be equal to
+- If no sensor data are available, the pO~2~ value is assumed to be equal to
   the setpoint.
 
 The mean pO~2~ of the sensors is indicated with a green line,
@@ -1903,12 +1908,12 @@ the area of the panel efficiently.
 *Water temperature* is displayed with its own blue line with temperature values
 placed adjacent to significant changes.
 
-The dive profile can include graphs of the *partial pressures* of O2, N2,
+The dive profile can include graphs of the *partial pressures* of O~2~,
-and He during the dive (see figure above) as well as a calculated and dive
+N~2~, and He during the dive (see figure above) as well as a calculated and
-computer reported deco ceilings (only visible for deep, long, or repetitive
+dive computer reported deco ceilings (only visible for deep, long, or
-dives).  Partial pressures of oxygen are indicated in green, those of
+repetitive dives).  Partial pressures of oxygen are indicated in green,
-nitrogen in black, and those of helium in dark red. These partial pressure
+those of nitrogen in black, and those of helium in dark red. These partial
-graphs are shown below the profile data.
+pressure graphs are shown below the profile data.
 
 [icon="images/icons/O2.jpg"]
 [NOTE]
@@ -2079,14 +2084,14 @@ Computer. Markers are placed against the depth profile line and with the
 time of the event set by where the mouse cursor was when the right mouse
 button was initially clicked to bring up the menu. Gas Change events involve
 a selection of which gas is being switched to, the list of choices being
-based on the available gases defined in the Equipment Tab. Set-point change
+based on the available gases defined in the *Equipment* Tab. Set-point
-events open a dialog allowing to choose the next set-point value. As in the
+change events open a dialog allowing to choose the next set-point value. As
-planner, a set-point value of zero indicates the diver is breathing from an
+in the planner, a set-point value of zero indicates the diver is breathing
-open circuit system while any non-zero value indicates the use of a closed
+from an open circuit system while any non-zero value indicates the use of a
-circuit rebreather (CCR).  By right-clicking while over an existing marker a
+closed circuit rebreather (CCR).  By right-clicking while over an existing
-menu appears, adding options to allow deletion of the marker or to allow all
+marker a menu appears, adding options to allow deletion of the marker or to
-markers of that type to be hidden. Hidden events can be restored to view by
+allow all markers of that type to be hidden. Hidden events can be restored
-selecting Unhide all events from the context menu.
+to view by selecting Unhide all events from the context menu.
 
 [[S_InfoBox]]
 === The *Information Box*
@@ -2127,8 +2132,10 @@ four buttons on the left of the profile panel. These are:
 Clicking this button causes the Information Box to display the *Maximum
 Operating Depth (MOD)* of the dive, given the gas mixture used. MOD is
 dependent on the oxygen concentration in the breathing gas.  For air (21%
-oxygen) it is around 57 m. Below the MOD there is a markedly increased risk
+oxygen) it is around 57 m if a maximum pO~2~ of 1.4 is specified in the
-of exposure to the dangers associated with oxygen toxicity.
+*Preferences* section (select _File_ -> Preferences -> Graph_ and edit the
+text box _Max pO~2~ when showing MOD_.  Below the MOD there is a markedly
+increased risk of exposure to the dangers associated with oxygen toxicity.
 
 [icon="images/icons/NDL.jpg"]
 [NOTE]
@@ -2201,7 +2208,7 @@ image::images/GasPressureBarGraph.jpg["FIGURE:Gas Pressure bar Graph", align="ce
 
 - The top black horizontal line indicates the gradient factor that applies to
   the depth of the diver at the particular point on the *Dive Profile*. The
-  appropriate gradient factor is an interpolation between the FGLow and GFHigh
+  gradient factor shown is an interpolation between the FGLow and GFHigh
   values specified in the Graph tab of the *Preferences Panel* of
   *Subsurface*.