Documentation: update french translation of user-manual

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

4 files changed, 943 insertions, 938 deletions

diff --git a/Documentation/50-pot/subsurface-manual.pot b/Documentation/50-pot/subsurface-manual.pot
index 5f4a46ca6..762e3d6df 100644
--- a/Documentation/50-pot/subsurface-manual.pot
+++ b/Documentation/50-pot/subsurface-manual.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: subsurface-manual VERSION\n"
 "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n"
-"POT-Creation-Date: 2015-02-06 09:16+0100\n"
+"POT-Creation-Date: 2015-02-15 14:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -205,9 +205,9 @@ msgstr ""
 #. type: Plain text
 #: ./user-manual.txt:108
 msgid ""
-"The *Dive Info* to the top left, giving more detailed information on the "
-"dive selected in the *Dive List*, including some statistics for the selected "
-"dive or for all highlighted dive(s)."
+"The *Info* to the top left, giving more detailed information on the dive "
+"selected in the *Dive List*, including some statistics for the selected dive "
+"or for all highlighted dive(s)."
 msgstr ""
 
 #. type: Plain text
@@ -233,7 +233,7 @@ msgid ""
 "information and profile of the _selected dive_ are shown in the respective "
 "panels. On the other hand, if one highlights more than one dive the last "
 "highlighted dive is the _selected dive_, but summary data of all "
-"_highlighted dives_ are shown in the *Stats* tab of the *Dive Info* panel "
+"_highlighted dives_ are shown in the *Stats* tab of the *Info* panel "
 "(maximum, minimum and average depths, durations, water temperatures and SAC; "
 "total time and number of dives selected)."
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 #: ./user-manual.txt:141
 #, no-wrap
 msgid ""
-"*Info*: Show only the Dive Notes about the last selected dive and statistics "
+"*Info*: Show only the Notes about the last selected dive and statistics "
 "for\n"
 "all highlighted dives.\n"
 msgstr ""
@@ -430,11 +430,11 @@ msgid ""
 "guide, and some remarks about the dive. _Subsurface_ can store much more "
 "information than this for each dive. In order to add a dive to a dive log, "
 "select _Log -> Add Dive_ from the Main Menu. The program then shows three "
-"panels to enter information for a dive: two tabs in the *Dive Info* panel "
-"(*Dive Notes* and *Equipment*), as well as the *Dive Profile* panel that "
-"displays a graphical profile of each dive. These panels are respectively "
-"marked [red]#A#, [red]#B# and [red]#C# in the figure below. Each of these "
-"tabs will now be explained for data entry."
+"panels to enter information for a dive: two tabs in the *Info* panel "
+"(*Notes* and *Equipment*), as well as the *Dive Profile* panel that displays "
+"a graphical profile of each dive. These panels are respectively marked "
+"[red]#A#, [red]#B# and [red]#C# in the figure below. Each of these tabs will "
+"now be explained for data entry."
 msgstr ""
 
 #. type: Target for macro image
@@ -446,10 +446,10 @@ msgstr ""
 #. type: Plain text
 #: ./user-manual.txt:215
 msgid ""
-"When one edits a field in Dive notes or Equipment panels, _Subsurface_ "
-"enters *Editing Mode*, indicated by the message in the blue box at the top "
-"of the _Dive Notes_ panel (see the image below). This message is displayed "
-"in all the panels under Dive notes and Equipment when in *Editing Mode*."
+"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 "
+"panels under Notes and Equipment when in *Editing Mode*."
 msgstr ""
 
 #. type: Target for macro image
@@ -473,7 +473,7 @@ msgstr ""
 #. type: Title ====
 #: ./user-manual.txt:224 ./user-manual.txt:700
 #, no-wrap
-msgid "Dive Notes"
+msgid "Notes"
 msgstr ""
 
 #. type: Plain text
@@ -481,8 +481,8 @@ msgstr ""
 msgid ""
 "This panel contains the date, time and place information for a particular "
 "dive, environmental conditions, co-divers and buddies, as well as some "
-"descriptive information. If one clicks on the *Dive Notes* tab, the "
-"following fields are visible:"
+"descriptive information. If one clicks on the *Notes* tab, the following "
+"fields are visible:"
 msgstr ""
 
 #. type: Target for macro image
@@ -683,7 +683,7 @@ msgid ""
 "The *Save* and *Cancel* buttons are used to save all the information for "
 "tabs in the info panel and in the dive profile panel, so there's no need to "
 "use them until ALL other information has been added. Here is an example of a "
-"completed Dive Notes panel:"
+"completed Notes panel:"
 msgstr ""
 
 #. type: Target for macro image
@@ -938,13 +938,13 @@ msgstr ""
 #. type: Plain text
 #: ./user-manual.txt:473
 msgid ""
-"The information entered in the *Dive Notes* tab, the *Equipment* tab as well "
-"as the *Dive Profile* can now be saved in the user's logbook by using the "
-"two buttons on the top right hand of the Dive Notes tab. If the _Save_ "
-"button is clicked, the dive data are saved in the current logbook. If the "
-"_Cancel_ button is clicked, the newly entered dive data are discarded. When "
-"exiting _Subsurface_, the user will be prompted once more to save the "
-"logbook with the new dive(s)."
+"The information entered in the *Notes* tab, the *Equipment* tab as well as "
+"the *Dive Profile* can now be saved in the user's logbook by using the two "
+"buttons on the top right hand of the Notes tab. If the _Save_ button is "
+"clicked, the dive data are saved in the current logbook. If the _Cancel_ "
+"button is clicked, the newly entered dive data are discarded. When exiting "
+"_Subsurface_, the user will be prompted once more to save the logbook with "
+"the new dive(s)."
 msgstr ""
 
 #. type: Title ===
@@ -1057,7 +1057,7 @@ msgid ""
 "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, "
 "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 labelled _Force "
+"may already be in the logbook, then check the check box labeled _Force "
 "download of all dives_."
 msgstr ""
 
@@ -1324,8 +1324,8 @@ msgstr ""
 msgid ""
 "With the uploaded dives in the *Dive List*, the information from the dive "
 "computer is not complete and more details must be added in order to have a "
-"fuller record of the dives. To do this, the *Dive Notes* and the *Equipment* "
-"tabs on the top left hand of the _Subsurface_ window should be used."
+"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."
 msgstr ""
 
 #. type: Plain text
@@ -1337,8 +1337,8 @@ msgid ""
 "record. In a few cases, (e.g. APD rebreathers) one also has to provide the "
 "date and time of the dive.  If the contents of this tab is changed or edited "
 "in any way, the message in a blue box at the top of the panel indicates that "
-"the dive is being edited. If one clicks on the *Dive Notes* tab, the "
-"following fields are visible:"
+"the dive is being edited. If one clicks on the *Notes* tab, the following "
+"fields are visible:"
 msgstr ""
 
 #. type: Target for macro image
@@ -1611,17 +1611,17 @@ msgstr ""
 msgid ""
 "_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 "
-"items of information in the *Dive 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 fields in the *Dive Notes* and *Equipment* tabs.  For instance, it is "
-"possible that a diver performed several dives during a single day, using "
-"identical equipment while diving at the same dive site or with the same dive "
-"master and/or buddy or tags. Instead of completing the information for each "
-"of these dives separately, one can select all the dives for that day in the "
-"*Dive List* and insert the same information in the *Dive Notes* and "
-"*Equipment* fields that need identical information. This is achieved by "
-"editing the dive notes or the equipment for any one of the selected dives."
+"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 "
+"fields in the *Notes* and *Equipment* tabs.  For instance, it is possible "
+"that a diver performed several dives during a single day, using identical "
+"equipment while diving at the same dive site or with the same dive master "
+"and/or buddy or tags. Instead of completing the information for each of "
+"these dives separately, one can select all the dives for that day in the "
+"*Dive List* and insert the same information in the *Notes* and *Equipment* "
+"fields that need identical information. This is achieved by editing the dive "
+"notes or the equipment for any one of the selected dives."
 msgstr ""
 
 #. type: Plain text
@@ -1643,15 +1643,15 @@ msgstr ""
 #: ./user-manual.txt:933
 msgid ""
 "_METHOD 2_:There is a different way of achieving the same goal. Select a "
-"dive with all the appropriate information typed into the *Dive Notes* and "
+"dive with all the appropriate information typed into the *Notes* and "
 "*Equipment* tabs. Then, from the main menu, select _Log -> Copy dive "
 "components_.  A box is presented with a selection of check boxes for most of "
-"the fields in the *Dive Notes* and *Equipment* tabs.  Select the fields to "
-"be copied from the currently selected dive, then select _OK_. Now, in the "
-"*Dive List*, select the dives into which this information is to be "
-"pasted. Then, from the main menu, select _Log -> Paste dive components_.  "
-"All the selected dives now contain the data initially selected in the "
-"original source dive log."
+"the fields in the *Notes* and *Equipment* tabs.  Select the fields to be "
+"copied from the currently selected dive, then select _OK_. Now, in the *Dive "
+"List*, select the dives into which this information is to be pasted. Then, "
+"from the main menu, select _Log -> Paste dive components_.  All the selected "
+"dives now contain the data initially selected in the original source dive "
+"log."
 msgstr ""
 
 #. type: Title ====
@@ -1713,13 +1713,13 @@ msgstr ""
 #. type: Plain text
 #: ./user-manual.txt:967
 msgid ""
-"The information entered in the *Dive Notes* tab and the *Equipment* tab can "
-"be saved by using the two buttons on the top right hand of the *Dive Notes* "
-"tab. If the _Save_ button is clicked, the dive data are saved. If the "
-"_Cancel_ button is clicked, then the newly entered dive data are deleted, "
-"although the dive profile obtained from the dive computer will be "
-"retained. When the user exits _Subsurface_ there is a final prompt to "
-"confirm that the new data should be saved."
+"The information entered in the *Notes* tab and the *Equipment* tab can be "
+"saved by using the two buttons on the top right hand of the *Notes* tab. If "
+"the _Save_ button is clicked, the dive data are saved. If the _Cancel_ "
+"button is clicked, then the newly entered dive data are deleted, although "
+"the dive profile obtained from the dive computer will be retained. When the "
+"user exits _Subsurface_ there is a final prompt to confirm that the new data "
+"should be saved."
 msgstr ""
 
 #. type: Title ===
@@ -2048,12 +2048,12 @@ msgid ""
 "row of cells immediately above these contains the names understood by "
 "_Subsurface_. The white area below the dropdown lists contains all the field "
 "names that _Subsurface_ recognises. These names are in blue balloons and can "
-"be moved using a drag-and-frop action. For instance, _Subsurface_ expects "
+"be moved using a drag-and-drop action. For instance, _Subsurface_ expects "
 "the column heading for Dive number (\" # \") to be \"Dive # \". If the "
 "column 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 labelled \"Dive # \" and drop "
+"column for \"Dive #\", drag the ballooned item labeled \"Dive # \" and drop "
 "it in the blue cell immediately above the white cell containing \" # "
 "\". This is depicted in the image below."
 msgstr ""
@@ -2084,8 +2084,8 @@ msgstr ""
 #: ./user-manual.txt:1179
 msgid ""
 "_CSV_ is an abbreviation for a data file format: _Comma-Separated "
-"Variables_. It is a file format allowing someone to view or edit the "
-"information using a text editor such as Notebook (Windows), gedit (Linux) or "
+"Values_. It is a file format allowing someone to view or edit the "
+"information using a text editor such as Notepad (Windows), gedit (Linux) or "
 "TextWrangler (OS/X). The two main advantages of the _CSV_ format is that the "
 "data are easily editable as text without any proprietary software and "
 "ensuring all information is human-readable, not being obscured by any custom "
@@ -2920,7 +2920,7 @@ msgstr ""
 
 #. type: Plain text
 #: ./user-manual.txt:1592
-msgid "the _Photos_ tab of the *Dive Notes* panel."
+msgid "the _Photos_ tab of the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
@@ -2977,9 +2977,9 @@ msgstr ""
 #: ./user-manual.txt:1623
 msgid ""
 "Photographs associated with a dive are shown as thumbnails in the _Photos_ "
-"tab of the _Dive Notes_ panel. Photos taken in rapid succession during a "
-"dive (therefore sometimes with large overlap on the dive profile) can easily "
-"be accessed in the _Photos_ tab. This tab serves as a tool for individually "
+"tab of the _Notes_ panel. Photos taken in rapid succession during a dive "
+"(therefore sometimes with large overlap on the dive profile) can easily be "
+"accessed in the _Photos_ tab. This tab serves as a tool for individually "
 "accessing the photos of a dive, while the stubs on the dive profile give an "
 "indication of when during a dive a photo was taken. By single-clicking on a "
 "thumbnail in the _Photos_ panel, a photo is selected. By double-clicking a "
@@ -3043,8 +3043,8 @@ msgstr ""
 msgid ""
 "*Describe the cylinders used during the dive* This is performed in the "
 "*Equipment tab* of\n"
-"the *Dive Info* panel, as xref:cylinder_definitions[described above]. Enter "
-"the cylinders one by one,\n"
+"the *Info* panel, as xref:cylinder_definitions[described above]. Enter the "
+"cylinders one by one,\n"
 "specifying the characteristics of the cylinder and the gas composition "
 "within each cylinder.\n"
 msgstr ""
@@ -3074,7 +3074,7 @@ msgid ""
 "right-clicking, follow the context menu to \"Add gas change\" and select the "
 "appropriate cylinder from\n"
 "those defined during the first step, above (see image below). If the\n"
-"*tank bar* button in the ttolbar has been activated, the cylinder switches "
+"*tank bar* button in the toolbar has been activated, the cylinder switches "
 "are also indicated in the\n"
 "tank bar.\n"
 msgstr ""
@@ -3140,7 +3140,7 @@ msgid ""
 "*Within _Subsurface_ describe the cylinders used during the dive*. The diver "
 "needs to provide the\n"
 "specifications of the different cylinders, using the *Equipment* tab of the "
-"*Dive Info Panel* (see\n"
+"*Info Panel* (see\n"
 "image below where two 12 litre cylinder were used).\n"
 msgstr ""
 
@@ -3166,7 +3166,7 @@ msgid ""
 "image below). After all\n"
 "the cylinder change events have been recorded on the dive profile, the "
 "correct cylinder pressures\n"
-"for both cylinders are shown on the dive profile, as inthe image below.\n"
+"for both cylinders are shown on the dive profile, as in the image below.\n"
 msgstr ""
 
 #. type: Target for macro image
@@ -3178,7 +3178,7 @@ msgstr ""
 #. type: Plain text
 #: ./user-manual.txt:1703
 msgid ""
-"This section gives an example of the versatility of _Subsurface_ as a give "
+"This section gives an example of the versatility of _Subsurface_ as a dive "
 "logging tool."
 msgstr ""
 
@@ -3219,7 +3219,7 @@ msgstr ""
 
 #. type: Plain text
 #: ./user-manual.txt:1722
-msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Dive Info* panel."
+msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel."
 msgstr ""
 
 #. type: Plain text
@@ -3235,7 +3235,7 @@ msgstr ""
 #: ./user-manual.txt:1731
 msgid ""
 "If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is "
-"adjusted for the oxygen drop accross the mouthpiece which often requires "
+"adjusted for the oxygen drop across the mouthpiece which often requires "
 "longer decompression periods. Below is a dive profile of a pSCR dive using "
 "EAN36 on the back cylinder and oxygen for decompression. Note that this dive "
 "lasted over two hours."
@@ -3453,7 +3453,7 @@ msgid ""
 "two cylinders are shown as green lines overlapping the depth profile. In "
 "addition, start and end pressures for both oxygen and diluent cylinders are "
 "shown in the _Equipment Tab_.  Below is a dive profile for a CCR dive, "
-"including an overaly of setpoint and oxygen sensor data, as well as the "
+"including an overlay of setpoint and oxygen sensor data, as well as the "
 "cylinder pressure data. In this case there is good agreement from the "
 "readings of the two oxygen sensors."
 msgstr ""
@@ -3489,17 +3489,17 @@ msgstr ""
 #. type: Title ===
 #: ./user-manual.txt:1848
 #, no-wrap
-msgid "The *Dive Info* tab (for individual dives)"
+msgid "The *Info* tab (for individual dives)"
 msgstr ""
 
 #. type: Plain text
 #: ./user-manual.txt:1855
 msgid ""
-"The Dive Info tab gives some summary information about a particular dive "
-"that has been selected in the *Dive List*. Useful information here includes "
-"the surface interval before the dive, the maximum and mean depths of the "
-"dive, the gas volume consumed, the surface air consumption (SAC) and the "
-"number of oxygen toxicity units (OTU) incurred."
+"The Info tab gives some summary information about a particular dive that has "
+"been selected in the *Dive List*. Useful information here includes the "
+"surface interval before the dive, the maximum and mean depths of the dive, "
+"the gas volume consumed, the surface air consumption (SAC) and the number of "
+"oxygen toxicity units (OTU) incurred."
 msgstr ""
 
 #. type: Plain text
@@ -4084,11 +4084,11 @@ msgid ""
 "breathing gas.  The EAD is the depth of a hypothetical air dive that has the "
 "same partial pressure of nitrogen as the current depth of the nitrox dive at "
 "hand. A nitrox dive leads to the same decompression obligation as an air "
-"dive to the depth equalling the EAD. The END is the depth of a hypothetical "
+"dive to the depth equaling the EAD. The END is the depth of a hypothetical "
 "air dive that has the same sum of partial pressures of the narcotic gases "
 "nitrogen and oxygen as the current trimix dive. A trimix diver can expect "
-"the same narcotic effect as a diver breathing air diving at a depth "
-"equalling the END."
+"the same narcotic effect as a diver breathing air diving at a depth equaling "
+"the END."
 msgstr ""
 
 #. type: Plain text
@@ -4362,14 +4362,14 @@ msgstr ""
 msgid ""
 "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 *Dive List*. This shows a *Trip Notes* tab in the *Dive "
-"Notes* 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 select *Save* from the buttons at the top right of the *Trip Notes* "
-"tab. The trip title in the *Dive List* panel should now reflect some of the "
-"edited information."
+"title from the *Dive List*. This shows a *Trip Notes* tab in the *Notes* "
+"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 "
+"select *Save* from the buttons at the top right of the *Trip Notes* tab. The "
+"trip title in the *Dive List* panel should now reflect some of the edited "
+"information."
 msgstr ""
 
 #. type: Title ====
@@ -4526,9 +4526,9 @@ msgid ""
 "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 *Merge selected dives*. It may be necessary to edit the dive "
-"information in the *Dive Notes* 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:"
+"information in the *Notes* 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:"
 msgstr ""
 
 #. type: Target for macro image
@@ -4651,10 +4651,10 @@ msgstr ""
 #: ./user-manual.txt:2465
 msgid ""
 "Having established a login to _Facebook_, transfer of a dive profile to "
-"one's _Facebook_ timeline is easy.  A _Facebook_ icon appears in the *Dive "
-"Notes* panel of _Subsurface_ (See image *A* below). Ensure that the dive "
-"that you want to transfer to the timeline is depicted in the _Subsurface_ "
-"*Dive Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, "
+"one's _Facebook_ timeline is easy.  A _Facebook_ icon appears in the *Notes* "
+"panel of _Subsurface_ (See image *A* below). Ensure that the dive that you "
+"want to transfer to the timeline is depicted in the _Subsurface_ *Dive "
+"Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, "
 "determining the amount of additional information transferred with the dive "
 "profile (see image *B*, below). In order to transfer a dive profile to "
 "_Facebook_, the name of a _Facebook_ album needs to be provided. The "
@@ -4744,7 +4744,7 @@ msgstr ""
 #. type: Plain text
 #: ./user-manual.txt:2501
 msgid ""
-"_DiveShare_ is also a dive log repostory on the Internet focusing on the "
+"_DiveShare_ is also a dive log repository on the Internet focusing on the "
 "recreational dives. In order to upload dives one has to provide a used ID, "
 "so registration with _http://scubadiveshare.com_ is required."
 msgstr ""
@@ -5219,7 +5219,7 @@ msgstr ""
 msgid ""
 "  ** *Default cylinder*: Here users can specify the default cylinder listed "
 "in\n"
-"     the *Equipment* tab of the *Dive Notes* panel.\n"
+"     the *Equipment* tab of the *Notes* panel.\n"
 msgstr ""
 
 #. type: Plain text
@@ -5658,7 +5658,7 @@ msgid ""
 "sections (see image below). The *setup* parameters for a dive are entered "
 "into the several sections on the left hand side of the screen.  The setup is "
 "divided into several sections: Available Gases, Rates, Planning, Gas Options "
-"and Dive Notes."
+"and Notes."
 msgstr ""
 
 #. type: Plain text
@@ -5720,16 +5720,15 @@ msgstr ""
 #. type: Plain text
 #: ./user-manual.txt:2924
 msgid ""
-"In the table labelled _Available Gases_, 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 <<S_CylinderData,providing "
-"cylinder data for dive logs>>. 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."
+"In the table labeled _Available Gases_, 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 <<S_CylinderData,providing cylinder data for dive "
+"logs>>. 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."
 msgstr ""
 
 #. type: Plain text
@@ -5883,7 +5882,7 @@ msgid ""
 "features of the dive have been completed, e.g. the bottom time segment and "
 "deep stops (if these are implemented). Leave the remaining waypoints on the "
 "ascent to _Subsurface_. In most cases _Subsurface_ computes additional way "
-"points in order to fulfil decompression requirements for that dive. A "
+"points in order to fulfill decompression requirements for that dive. A "
 "waypoint can be moved by selecting that waypoint and by using the arrow "
 "keys.  The waypoints listed in the _Dive Planner Points_ dialogue can be "
 "edited by hand in order to obtain a precise presentation of the dive "
@@ -5949,7 +5948,7 @@ msgstr ""
 msgid ""
 "On the bottom right of the dive planner, under _Dive Plan Details_, the "
 "exact details of the dive plan are provided. These details may be modified "
-"by checking any of the options under the _Dive Notes_ section of the dive "
+"by checking any of the options under the _Notes_ section of the dive "
 "planner, immediately to the left of the _Dive Plan Details_. If a _Verbatim "
 "diveplan_ is requested, a detailed sentence-level explanation of the dive "
 "plan is given. If any of the management specifications have been exceeded "
@@ -6050,7 +6049,7 @@ msgid ""
 "ratio (default 10:1) as well as the metabolism rate. The calculation also "
 "takes the oxygen drop\n"
 "accross the mouthpiece of the rebreather into account. If the\n"
-"pO~2~ drops below what is considered a save value, a warning apears in the "
+"pO~2~ drops below what is considered a save value, a warning appears in the "
 "_Dive plan\n"
 "details_. A typical pSCR configuration is with a single cylinder and one or "
 "more bail-out\n"
@@ -6062,7 +6061,7 @@ msgid ""
 "is comparable\n"
 "to that of the CCR dive above, but note the longer ascent duration due to "
 "the lower oxygen\n"
-"in the loop due to the oxygen drop accross the mouthpiece of the pSCR "
+"in the loop due to the oxygen drop across the mouthpiece of the pSCR "
 "equipment.\n"
 msgstr ""
 
@@ -6153,8 +6152,8 @@ msgstr ""
 msgid ""
 "Dive plans have many characteristics in common with dive logs (dive profile, "
 "dive notes, etc).  After a dive plan has been saved, the dive details and "
-"gas calculations are saved in the *Dive Notes* tab. While a dive plan is "
-"being designed, it can be printed using the _Print_ button in the dive "
+"gas calculations are saved in the *Notes* tab. While a dive plan is being "
+"designed, it can be printed using the _Print_ button in the dive "
 "planner. This prints the dive details and gas calculations in the _Dive Plan "
 "Details_ panel of the dive planner. However, after the plan has been saved, "
 "it is represented in a way very similar to a dive log and the gas "
@@ -6368,7 +6367,7 @@ msgstr ""
 
 #. type: Plain text
 #: ./user-manual.txt:3187
-msgid "<<S_ViewPanels,_Info_>> - View only the *Dive Notes* panel."
+msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
@@ -7132,8 +7131,8 @@ msgstr ""
 #. type: Plain text
 #: ./user-manual.txt:3549
 msgid ""
-"In the dropdown list on the middle right labeled '_Pre-configured "
-"imports_\", select _APD Log Viewer_."
+"In the dropdown list on the top left labeled '_Pre-configured imports_\", "
+"select _APD Log Viewer_."
 msgstr ""
 
 #. type: Plain text
@@ -7386,30 +7385,36 @@ msgstr ""
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
+#. type: Named 'icon' AttributeList argument for style 'icon'
+#: ./user-manual.txt:3632
+#, no-wrap
+msgid "images/icons/atomiclogo.jpg"
+msgstr ""
+
 #. type: Plain text
-#: ./user-manual.txt:3638
+#: ./user-manual.txt:3639
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
-"The divelog is kept in a SQlite database at "
+"The divelog is kept in a SQLite database at "
 "C:\\ProgramData\\AtomicsAquatics\\Cobalt-Logbook\\Cobalt.db. This file can "
 "be directly imported to Subsurface."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3640
+#: ./user-manual.txt:3641
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3643
+#: ./user-manual.txt:3644
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3651
+#: ./user-manual.txt:3652
 msgid ""
 "Mares Dive Organiser is a Windows application. The dive log is kept as a "
 "Microsoft SQL Compact Edition database with a '.sdf' filename extension. The "
@@ -7420,7 +7425,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3656
+#: ./user-manual.txt:3657
 msgid ""
 "Within Dive Organiser, select _Database -> Backup_ from the main menu and "
 "back up the database to the desk top.  This creates a zipped file "
@@ -7428,36 +7433,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3659
+#: ./user-manual.txt:3660
 msgid ""
 "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganiser.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3660
+#: ./user-manual.txt:3661
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3661
+#: ./user-manual.txt:3662
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3663
+#: ./user-manual.txt:3664
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3665
+#: ./user-manual.txt:3666
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3674
+#: ./user-manual.txt:3675
 msgid ""
 "Unfortunately DivingLog XML files give us no indication on the preferences "
 "set on one's system. So in order for _Subsurface_ to be able to successfully "
@@ -7468,28 +7473,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3676
+#: ./user-manual.txt:3677
 msgid "In DivingLog open the 'File -> Export -> XML' menu"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3677
+#: ./user-manual.txt:3678
 msgid "Select the dives to export"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3678
+#: ./user-manual.txt:3679
 msgid "Click on the export button and select the filename"
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3680
+#: ./user-manual.txt:3681
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3689
+#: ./user-manual.txt:3690
 msgid ""
 "Many divers keep a diving log in some form of a digital file, commonly a "
 "spreadsheet with various fields of information. These logs can be easily "
@@ -7502,7 +7507,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3695
+#: ./user-manual.txt:3696
 msgid ""
 "The first step is to organize the diving data in the spreadsheet, so that "
 "the first row contains the names (or titles) of each column and the "
@@ -7513,40 +7518,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3697
+#: ./user-manual.txt:3698
 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3698
+#: ./user-manual.txt:3699
 msgid "Duration: the format should be minutes:seconds."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3699
+#: ./user-manual.txt:3700
 msgid ""
-"Unit system: only one unit system shold be used (i.e., no mixture between "
+"Unit system: only one unit system should be used (i.e., no mixture between "
 "imperial and metric units)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3700
+#: ./user-manual.txt:3701
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3701
+#: ./user-manual.txt:3702
 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3702
+#: ./user-manual.txt:3703
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3706
+#: ./user-manual.txt:3707
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -7557,13 +7562,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3707
+#: ./user-manual.txt:3708
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3710
+#: ./user-manual.txt:3711
 msgid ""
 "To export the data as a .CSV file from within LibreOffice click _File -> "
 "Save As_. On the dialogue that comes up, select the _Text CSV (.csv)_ as the "
@@ -7571,13 +7576,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3711
+#: ./user-manual.txt:3712
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3714
+#: ./user-manual.txt:3715
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -7585,13 +7590,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3715
+#: ./user-manual.txt:3716
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3718
+#: ./user-manual.txt:3719
 msgid ""
 "One can double check the .CSV file by opening it with a text editor, and "
 "then import the dive data as explained on the section "
@@ -7599,13 +7604,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3719
+#: ./user-manual.txt:3720
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3725
+#: ./user-manual.txt:3726
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -7616,19 +7621,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3727
+#: ./user-manual.txt:3728
 msgid ""
 "In Microsoft Windows, click the *Start* button, and then select _Control "
 "Panel_ from the list on the right-hand side."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3728
+#: ./user-manual.txt:3729
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3731
+#: ./user-manual.txt:3732
 msgid ""
 "Do one of the following: ** In Windows 7, click the _Formats_ tab, and then "
 "click _Customize this format_.  ** In Windows XP, click the _Regional "
@@ -7636,48 +7641,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3732
+#: ./user-manual.txt:3733
 msgid ""
 "Type a new separator in the _List separator_ box. To use a TAB-delimited "
 "file, type the word TAB in the box."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3733
+#: ./user-manual.txt:3734
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3735
+#: ./user-manual.txt:3736
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3736
+#: ./user-manual.txt:3737
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3739
+#: ./user-manual.txt:3740
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3741
+#: ./user-manual.txt:3742
 msgid ""
 "With the dive log opened in _Excel_, select the round Windows button at the "
 "top left, then _Save As_."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3742
+#: ./user-manual.txt:3743
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3745
+#: ./user-manual.txt:3746
 msgid ""
 "Click on the left-hand part of the _Save as_ option, NOT on the arrow on the "
 "right-hand. This brings up a dialogue for saving the spreadsheet in an "
@@ -7687,13 +7692,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3746
+#: ./user-manual.txt:3747
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3749
+#: ./user-manual.txt:3750
 msgid ""
 "Select the _Save_ button. The CSV-formatted file is saved into the folder "
 "that was selected. One can double check the .CSV file by opening it with a "
@@ -7702,19 +7707,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3750
+#: ./user-manual.txt:3751
 #, no-wrap
 msgid "APPENDIX E: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3752
+#: ./user-manual.txt:3753
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3756
+#: ./user-manual.txt:3757
 msgid ""
 "'Question': I dived with a 12.2 l tank, starting with 220 bar and ending "
 "with 100 bar, and I calculate a different SAC compared what _Subsurface_ "
@@ -7722,7 +7727,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3762
+#: ./user-manual.txt:3763
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -7732,7 +7737,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3768
+#: ./user-manual.txt:3769
 msgid ""
 "and that's true for an ideal gas, and it's what you get taught in dive "
 "theory.  But an \"ideal gas\" doesn't actually exist, and real gases "
@@ -7742,12 +7747,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3770
+#: ./user-manual.txt:3771
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3776
+#: ./user-manual.txt:3777
 msgid ""
 "where the amount of air is *not* just \"tank size times pressure in bar\".  "
 "It's a combination of: \"take compressibility into account\" (which is a "
@@ -7758,12 +7763,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3778
+#: ./user-manual.txt:3779
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3783
+#: ./user-manual.txt:3784
 msgid ""
 "which is about 1445, not 1464. So there was 19 l too much in your simple "
 "calculation that ignored the difference between 1 bar and one ATM.  The "
@@ -7773,7 +7778,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3789
+#: ./user-manual.txt:3790
 msgid ""
 "So be happy: your SAC really is better than your calculations indicated.  Or "
 "be sad: your cylinder contains less air than you thought it did.  And as "
@@ -7784,7 +7789,7 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3790
+#: ./user-manual.txt:3791
 #, no-wrap
 msgid ""
 "Some dive profiles have time discrepancies with the recorded samples from my "
@@ -7792,7 +7797,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3794
+#: ./user-manual.txt:3795
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -7800,7 +7805,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3802
+#: ./user-manual.txt:3803
 msgid ""
 "'Answer': For example, if you end up doing a weight check (deep enough to "
 "trigger the \"dive started\")  but then come back up and wait five minutes "
diff --git a/Documentation/fr/po/subsurface-manual.fr.po b/Documentation/fr/po/subsurface-manual.fr.po
index 18f4a6d06..77012e9b2 100644
--- a/Documentation/fr/po/subsurface-manual.fr.po
+++ b/Documentation/fr/po/subsurface-manual.fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n"
-"POT-Creation-Date: 2015-02-06 09:16+0100\n"
-"PO-Revision-Date: 2015-02-06 14:30+0100\n"
+"POT-Creation-Date: 2015-02-15 14:23+0100\n"
+"PO-Revision-Date: 2015-02-15 14:25+0100\n"
 "Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n"
 "Language-Team: French <opensuse-fr@opensuse.org>\n"
 "Language: fr\n"
@@ -275,14 +275,14 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:108
 msgid ""
-"The *Dive Info* to the top left, giving more detailed information on the "
-"dive selected in the *Dive List*, including some statistics for the selected "
-"dive or for all highlighted dive(s)."
+"The *Info* to the top left, giving more detailed information on the dive "
+"selected in the *Dive List*, including some statistics for the selected dive "
+"or for all highlighted dive(s)."
 msgstr ""
-"Les *informations de plongée* en haut à gauche, fournissent des informations "
-"détaillées sur la plongée sélectionnée dans la *liste des plongées*, dont "
-"des statistiques pour la plongée sélectionnée ou pour toutes les plongées "
-"mises en surbrillance."
+"Les *informations* en haut à gauche, fournissent des informations détaillées "
+"sur la plongée sélectionnée dans la *liste des plongées*, dont des "
+"statistiques pour la plongée sélectionnée ou pour toutes les plongées mises "
+"en surbrillance."
 
 #. type: Plain text
 #: user-manual.txt:111
@@ -313,7 +313,7 @@ msgid ""
 "information and profile of the _selected dive_ are shown in the respective "
 "panels. On the other hand, if one highlights more than one dive the last "
 "highlighted dive is the _selected dive_, but summary data of all "
-"_highlighted dives_ are shown in the *Stats* tab of the *Dive Info* panel "
+"_highlighted dives_ are shown in the *Stats* tab of the *Info* panel "
 "(maximum, minimum and average depths, durations, water temperatures and SAC; "
 "total time and number of dives selected)."
 msgstr ""
@@ -323,9 +323,9 @@ msgstr ""
 "plus d'une plongée est mise en surbrillance seule 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 de plongée* (profondeur maximale, minimale et moyenne, "
-"les durées, les températures de l'eau et le SAC (air consommé); temps total "
-"et nombre de plongées sélectionnées)."
+"panneau *informations* (profondeur maximale, minimale et moyenne, les "
+"durées, les températures de l'eau et le SAC (air consommé); temps total et "
+"nombre de plongées sélectionnées)."
 
 #. type: Target for macro image
 #: user-manual.txt:127
@@ -366,7 +366,7 @@ msgstr "*Profil* : affiche uniquement le profile de plongée de la plongée sél
 #: user-manual.txt:141
 #, no-wrap
 msgid ""
-"*Info*: Show only the Dive Notes about the last selected dive and statistics for\n"
+"*Info*: Show only the Notes about the last selected dive and statistics for\n"
 "all highlighted dives.\n"
 msgstr ""
 "*Info* : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour\n"
@@ -541,11 +541,11 @@ msgid ""
 "guide, and some remarks about the dive. _Subsurface_ can store much more "
 "information than this for each dive. In order to add a dive to a dive log, "
 "select _Log -> Add Dive_ from the Main Menu. The program then shows three "
-"panels to enter information for a dive: two tabs in the *Dive Info* panel "
-"(*Dive Notes* and *Equipment*), as well as the *Dive Profile* panel that "
-"displays a graphical profile of each dive. These panels are respectively "
-"marked [red]#A#, [red]#B# and [red]#C# in the figure below. Each of these "
-"tabs will now be explained for data entry."
+"panels to enter information for a dive: two tabs in the *Info* panel "
+"(*Notes* and *Equipment*), as well as the *Dive Profile* panel that displays "
+"a graphical profile of each dive. These panels are respectively marked "
+"[red]#A#, [red]#B# and [red]#C# in the figure below. Each of these tabs will "
+"now be explained for data entry."
 msgstr ""
 
 #. type: Target for macro image
@@ -557,10 +557,10 @@ msgstr "images/AddDive1_f20.jpg"
 #. type: Plain text
 #: user-manual.txt:215
 msgid ""
-"When one edits a field in Dive notes or Equipment panels, _Subsurface_ "
-"enters *Editing Mode*, indicated by the message in the blue box at the top "
-"of the _Dive Notes_ panel (see the image below). This message is displayed "
-"in all the panels under Dive notes and Equipment when in *Editing Mode*."
+"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 "
+"panels under Notes and Equipment when in *Editing Mode*."
 msgstr ""
 
 #. type: Target for macro image
@@ -584,16 +584,16 @@ msgstr ""
 #. type: Title ====
 #: user-manual.txt:224 user-manual.txt:700
 #, no-wrap
-msgid "Dive Notes"
-msgstr "Notes de plongée"
+msgid "Notes"
+msgstr "Notes"
 
 #. type: Plain text
 #: user-manual.txt:230
 msgid ""
 "This panel contains the date, time and place information for a particular "
 "dive, environmental conditions, co-divers and buddies, as well as some "
-"descriptive information. If one clicks on the *Dive Notes* tab, the "
-"following fields are visible:"
+"descriptive information. If one clicks on the *Notes* tab, the following "
+"fields are visible:"
 msgstr ""
 
 #. type: Target for macro image
@@ -781,7 +781,7 @@ msgid ""
 "The *Save* and *Cancel* buttons are used to save all the information for "
 "tabs in the info panel and in the dive profile panel, so there's no need to "
 "use them until ALL other information has been added. Here is an example of a "
-"completed Dive Notes panel:"
+"completed Notes panel:"
 msgstr ""
 
 #. type: Target for macro image
@@ -1031,13 +1031,13 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:473
 msgid ""
-"The information entered in the *Dive Notes* tab, the *Equipment* tab as well "
-"as the *Dive Profile* can now be saved in the user's logbook by using the "
-"two buttons on the top right hand of the Dive Notes tab. If the _Save_ "
-"button is clicked, the dive data are saved in the current logbook. If the "
-"_Cancel_ button is clicked, the newly entered dive data are discarded. When "
-"exiting _Subsurface_, the user will be prompted once more to save the "
-"logbook with the new dive(s)."
+"The information entered in the *Notes* tab, the *Equipment* tab as well as "
+"the *Dive Profile* can now be saved in the user's logbook by using the two "
+"buttons on the top right hand of the Notes tab. If the _Save_ button is "
+"clicked, the dive data are saved in the current logbook. If the _Cancel_ "
+"button is clicked, the newly entered dive data are discarded. When exiting "
+"_Subsurface_, the user will be prompted once more to save the logbook with "
+"the new dive(s)."
 msgstr ""
 
 #. type: Title ===
@@ -1150,7 +1150,7 @@ msgid ""
 "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, "
 "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 labelled _Force "
+"may already be in the logbook, then check the check box labeled _Force "
 "download of all dives_."
 msgstr ""
 
@@ -1416,8 +1416,8 @@ msgstr ""
 msgid ""
 "With the uploaded dives in the *Dive List*, the information from the dive "
 "computer is not complete and more details must be added in order to have a "
-"fuller record of the dives. To do this, the *Dive Notes* and the *Equipment* "
-"tabs on the top left hand of the _Subsurface_ window should be used."
+"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."
 msgstr ""
 
 #. type: Plain text
@@ -1429,8 +1429,8 @@ msgid ""
 "In a few cases, (e.g. APD rebreathers) one also has to provide the date and "
 "time of the dive.  If the contents of this tab is changed or edited in any "
 "way, the message in a blue box at the top of the panel indicates that the "
-"dive is being edited. If one clicks on the *Dive Notes* tab, the following "
-"fields are visible:"
+"dive is being edited. If one clicks on the *Notes* tab, the following fields "
+"are visible:"
 msgstr ""
 
 #. type: Target for macro image
@@ -1686,17 +1686,17 @@ msgstr ""
 msgid ""
 "_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 "
-"items of information in the *Dive 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 fields in the *Dive Notes* and *Equipment* tabs.  For instance, it is "
-"possible that a diver performed several dives during a single day, using "
-"identical equipment while diving at the same dive site or with the same dive "
-"master and/or buddy or tags. Instead of completing the information for each "
-"of these dives separately, one can select all the dives for that day in the "
-"*Dive List* and insert the same information in the *Dive Notes* and "
-"*Equipment* fields that need identical information. This is achieved by "
-"editing the dive notes or the equipment for any one of the selected dives."
+"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 "
+"fields in the *Notes* and *Equipment* tabs.  For instance, it is possible "
+"that a diver performed several dives during a single day, using identical "
+"equipment while diving at the same dive site or with the same dive master "
+"and/or buddy or tags. Instead of completing the information for each of "
+"these dives separately, one can select all the dives for that day in the "
+"*Dive List* and insert the same information in the *Notes* and *Equipment* "
+"fields that need identical information. This is achieved by editing the dive "
+"notes or the equipment for any one of the selected dives."
 msgstr ""
 
 #. type: Plain text
@@ -1718,15 +1718,15 @@ msgstr ""
 #: user-manual.txt:933
 msgid ""
 "_METHOD 2_:There is a different way of achieving the same goal. Select a "
-"dive with all the appropriate information typed into the *Dive Notes* and "
+"dive with all the appropriate information typed into the *Notes* and "
 "*Equipment* tabs. Then, from the main menu, select _Log -> Copy dive "
 "components_.  A box is presented with a selection of check boxes for most of "
-"the fields in the *Dive Notes* and *Equipment* tabs.  Select the fields to "
-"be copied from the currently selected dive, then select _OK_. Now, in the "
-"*Dive List*, select the dives into which this information is to be pasted. "
-"Then, from the main menu, select _Log -> Paste dive components_.  All the "
-"selected dives now contain the data initially selected in the original "
-"source dive log."
+"the fields in the *Notes* and *Equipment* tabs.  Select the fields to be "
+"copied from the currently selected dive, then select _OK_. Now, in the *Dive "
+"List*, select the dives into which this information is to be pasted. Then, "
+"from the main menu, select _Log -> Paste dive components_.  All the selected "
+"dives now contain the data initially selected in the original source dive "
+"log."
 msgstr ""
 
 #. type: Title ====
@@ -1787,13 +1787,13 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:967
 msgid ""
-"The information entered in the *Dive Notes* tab and the *Equipment* tab can "
-"be saved by using the two buttons on the top right hand of the *Dive Notes* "
-"tab. If the _Save_ button is clicked, the dive data are saved. If the "
-"_Cancel_ button is clicked, then the newly entered dive data are deleted, "
-"although the dive profile obtained from the dive computer will be retained. "
-"When the user exits _Subsurface_ there is a final prompt to confirm that the "
-"new data should be saved."
+"The information entered in the *Notes* tab and the *Equipment* tab can be "
+"saved by using the two buttons on the top right hand of the *Notes* tab. If "
+"the _Save_ button is clicked, the dive data are saved. If the _Cancel_ "
+"button is clicked, then the newly entered dive data are deleted, although "
+"the dive profile obtained from the dive computer will be retained. When the "
+"user exits _Subsurface_ there is a final prompt to confirm that the new data "
+"should be saved."
 msgstr ""
 
 #. type: Title ===
@@ -2121,12 +2121,12 @@ msgid ""
 "row of cells immediately above these contains the names understood by "
 "_Subsurface_. The white area below the dropdown lists contains all the field "
 "names that _Subsurface_ recognises. These names are in blue balloons and can "
-"be moved using a drag-and-frop action. For instance, _Subsurface_ expects "
+"be moved using a drag-and-drop action. For instance, _Subsurface_ expects "
 "the column heading for Dive number (\" # \") to be \"Dive # \". If the "
 "column 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 labelled \"Dive # \" and drop "
+"column for \"Dive #\", drag the ballooned item labeled \"Dive # \" and drop "
 "it in the blue cell immediately above the white cell containing \" # \". "
 "This is depicted in the image below."
 msgstr ""
@@ -2156,18 +2156,18 @@ msgstr ""
 #. type: delimited block *
 #: user-manual.txt:1179
 msgid ""
-"_CSV_ is an abbreviation for a data file format: _Comma-Separated "
-"Variables_. It is a file format allowing someone to view or edit the "
-"information using a text editor such as Notebook (Windows), gedit (Linux) or "
-"TextWrangler (OS/X). The two main advantages of the _CSV_ format is that the "
-"data are easily editable as text without any proprietary software and "
-"ensuring all information is human-readable, not being obscured by any custom "
-"or proprietary attributes that proprietary software insert into files.  "
-"Because of its simplicity the _CSV_ format is used as an interchange format "
-"between many software packages, e.g. between spreadsheet, statistical, "
-"graphics, database and diving software. Within _Subsurface_, _CSV_ files can "
-"also be used to import information from other sources such as spreadsheet-"
-"based dive logs and even from some dive computers."
+"_CSV_ is an abbreviation for a data file format: _Comma-Separated Values_. "
+"It is a file format allowing someone to view or edit the information using a "
+"text editor such as Notepad (Windows), gedit (Linux) or TextWrangler (OS/X). "
+"The two main advantages of the _CSV_ format is that the data are easily "
+"editable as text without any proprietary software and ensuring all "
+"information is human-readable, not being obscured by any custom or "
+"proprietary attributes that proprietary software insert into files.  Because "
+"of its simplicity the _CSV_ format is used as an interchange format between "
+"many software packages, e.g. between spreadsheet, statistical, graphics, "
+"database and diving software. Within _Subsurface_, _CSV_ files can also be "
+"used to import information from other sources such as spreadsheet-based dive "
+"logs and even from some dive computers."
 msgstr ""
 
 #. type: delimited block *
@@ -2965,7 +2965,7 @@ msgstr ""
 
 #. type: Plain text
 #: user-manual.txt:1592
-msgid "the _Photos_ tab of the *Dive Notes* panel."
+msgid "the _Photos_ tab of the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
@@ -3022,9 +3022,9 @@ msgstr ""
 #: user-manual.txt:1623
 msgid ""
 "Photographs associated with a dive are shown as thumbnails in the _Photos_ "
-"tab of the _Dive Notes_ panel. Photos taken in rapid succession during a "
-"dive (therefore sometimes with large overlap on the dive profile) can easily "
-"be accessed in the _Photos_ tab. This tab serves as a tool for individually "
+"tab of the _Notes_ panel. Photos taken in rapid succession during a dive "
+"(therefore sometimes with large overlap on the dive profile) can easily be "
+"accessed in the _Photos_ tab. This tab serves as a tool for individually "
 "accessing the photos of a dive, while the stubs on the dive profile give an "
 "indication of when during a dive a photo was taken. By single-clicking on a "
 "thumbnail in the _Photos_ panel, a photo is selected. By double-clicking a "
@@ -3087,7 +3087,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n"
-"the *Dive Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one,\n"
+"the *Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one,\n"
 "specifying the characteristics of the cylinder and the gas composition within each cylinder.\n"
 msgstr ""
 
@@ -3110,7 +3110,7 @@ msgid ""
 "in time on the *Dive Profile* panel and indicating the cylinder to which the change was made. After\n"
 "right-clicking, follow the context menu to \"Add gas change\" and select the appropriate cylinder from\n"
 "those defined during the first step, above (see image below). If the\n"
-"*tank bar* button in the ttolbar has been activated, the cylinder switches are also indicated in the\n"
+"*tank bar* button in the toolbar has been activated, the cylinder switches are also indicated in the\n"
 "tank bar.\n"
 msgstr ""
 
@@ -3165,7 +3165,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n"
-"specifications of the different cylinders, using the *Equipment* tab of the *Dive Info Panel* (see\n"
+"specifications of the different cylinders, using the *Equipment* tab of the *Info Panel* (see\n"
 "image below where two 12 litre cylinder were used).\n"
 msgstr ""
 
@@ -3182,7 +3182,7 @@ msgid ""
 "profile with a cylinder symbol. If the *Tank Bar* is activated using the toolbar to the left of the\n"
 "profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all\n"
 "the cylinder change events have been recorded on the dive profile, the correct cylinder pressures\n"
-"for both cylinders are shown on the dive profile, as inthe image below.\n"
+"for both cylinders are shown on the dive profile, as in the image below.\n"
 msgstr ""
 
 #. type: Target for macro image
@@ -3194,7 +3194,7 @@ msgstr "images/sidemount1.jpg"
 #. type: Plain text
 #: user-manual.txt:1703
 msgid ""
-"This section gives an example of the versatility of _Subsurface_ as a give "
+"This section gives an example of the versatility of _Subsurface_ as a dive "
 "logging tool."
 msgstr ""
 
@@ -3235,7 +3235,7 @@ msgstr ""
 
 #. type: Plain text
 #: user-manual.txt:1722
-msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Dive Info* panel."
+msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel."
 msgstr ""
 
 #. type: Plain text
@@ -3251,7 +3251,7 @@ msgstr ""
 #: user-manual.txt:1731
 msgid ""
 "If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is "
-"adjusted for the oxygen drop accross the mouthpiece which often requires "
+"adjusted for the oxygen drop across the mouthpiece which often requires "
 "longer decompression periods. Below is a dive profile of a pSCR dive using "
 "EAN36 on the back cylinder and oxygen for decompression. Note that this dive "
 "lasted over two hours."
@@ -3468,7 +3468,7 @@ msgid ""
 "two cylinders are shown as green lines overlapping the depth profile. In "
 "addition, start and end pressures for both oxygen and diluent cylinders are "
 "shown in the _Equipment Tab_.  Below is a dive profile for a CCR dive, "
-"including an overaly of setpoint and oxygen sensor data, as well as the "
+"including an overlay of setpoint and oxygen sensor data, as well as the "
 "cylinder pressure data. In this case there is good agreement from the "
 "readings of the two oxygen sensors."
 msgstr ""
@@ -3504,17 +3504,17 @@ msgstr ""
 #. type: Title ===
 #: user-manual.txt:1848
 #, no-wrap
-msgid "The *Dive Info* tab (for individual dives)"
+msgid "The *Info* tab (for individual dives)"
 msgstr ""
 
 #. type: Plain text
 #: user-manual.txt:1855
 msgid ""
-"The Dive Info tab gives some summary information about a particular dive "
-"that has been selected in the *Dive List*. Useful information here includes "
-"the surface interval before the dive, the maximum and mean depths of the "
-"dive, the gas volume consumed, the surface air consumption (SAC) and the "
-"number of oxygen toxicity units (OTU) incurred."
+"The Info tab gives some summary information about a particular dive that has "
+"been selected in the *Dive List*. Useful information here includes the "
+"surface interval before the dive, the maximum and mean depths of the dive, "
+"the gas volume consumed, the surface air consumption (SAC) and the number of "
+"oxygen toxicity units (OTU) incurred."
 msgstr ""
 
 #. type: Plain text
@@ -4097,10 +4097,10 @@ msgid ""
 "The EAD is the depth of a hypothetical air dive that has the same partial "
 "pressure of nitrogen as the current depth of the nitrox dive at hand. A "
 "nitrox dive leads to the same decompression obligation as an air dive to the "
-"depth equalling the EAD. The END is the depth of a hypothetical air dive "
-"that has the same sum of partial pressures of the narcotic gases nitrogen "
-"and oxygen as the current trimix dive. A trimix diver can expect the same "
-"narcotic effect as a diver breathing air diving at a depth equalling the END."
+"depth equaling the EAD. The END is the depth of a hypothetical air dive that "
+"has the same sum of partial pressures of the narcotic gases nitrogen and "
+"oxygen as the current trimix dive. A trimix diver can expect the same "
+"narcotic effect as a diver breathing air diving at a depth equaling the END."
 msgstr ""
 
 #. type: Plain text
@@ -4373,14 +4373,14 @@ msgstr ""
 msgid ""
 "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 *Dive List*. This shows a *Trip Notes* tab in the *Dive "
-"Notes* 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 select *Save* from the buttons at the top right of the *Trip Notes* "
-"tab. The trip title in the *Dive List* panel should now reflect some of the "
-"edited information."
+"title from the *Dive List*. This shows a *Trip Notes* tab in the *Notes* "
+"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 "
+"select *Save* from the buttons at the top right of the *Trip Notes* tab. The "
+"trip title in the *Dive List* panel should now reflect some of the edited "
+"information."
 msgstr ""
 
 #. type: Title ====
@@ -4537,9 +4537,9 @@ msgid ""
 "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 "
 "*Merge selected dives*. It may be necessary to edit the dive information in "
-"the *Dive Notes* 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:"
+"the *Notes* 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:"
 msgstr ""
 
 #. type: Target for macro image
@@ -4673,10 +4673,10 @@ msgstr "images/facebook1_f20.jpg"
 #: user-manual.txt:2465
 msgid ""
 "Having established a login to _Facebook_, transfer of a dive profile to "
-"one's _Facebook_ timeline is easy.  A _Facebook_ icon appears in the *Dive "
-"Notes* panel of _Subsurface_ (See image *A* below). Ensure that the dive "
-"that you want to transfer to the timeline is depicted in the _Subsurface_ "
-"*Dive Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, "
+"one's _Facebook_ timeline is easy.  A _Facebook_ icon appears in the *Notes* "
+"panel of _Subsurface_ (See image *A* below). Ensure that the dive that you "
+"want to transfer to the timeline is depicted in the _Subsurface_ *Dive "
+"Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, "
 "determining the amount of additional information transferred with the dive "
 "profile (see image *B*, below). In order to transfer a dive profile to "
 "_Facebook_, the name of a _Facebook_ album needs to be provided. The "
@@ -4767,7 +4767,7 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:2501
 msgid ""
-"_DiveShare_ is also a dive log repostory on the Internet focusing on the "
+"_DiveShare_ is also a dive log repository on the Internet focusing on the "
 "recreational dives. In order to upload dives one has to provide a used ID, "
 "so registration with _http://scubadiveshare.com_ is required."
 msgstr ""
@@ -5251,7 +5251,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "  ** *Default cylinder*: Here users can specify the default cylinder listed in\n"
-"     the *Equipment* tab of the *Dive Notes* panel.\n"
+"     the *Equipment* tab of the *Notes* panel.\n"
 msgstr ""
 
 #. type: Plain text
@@ -5637,7 +5637,7 @@ msgid ""
 "sections (see image below). The *setup* parameters for a dive are entered "
 "into the several sections on the left hand side of the screen.  The setup is "
 "divided into several sections: Available Gases, Rates, Planning, Gas Options "
-"and Dive Notes."
+"and Notes."
 msgstr ""
 
 #. type: Plain text
@@ -5699,15 +5699,15 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:2924
 msgid ""
-"In the table labelled _Available Gases_, 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 <<S_CylinderData,providing cylinder "
-"data for dive logs>>. 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."
+"In the table labeled _Available Gases_, 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 <<S_CylinderData,providing cylinder data for dive "
+"logs>>. 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."
 msgstr ""
 
 #. type: Plain text
@@ -5846,7 +5846,7 @@ msgid ""
 "features of the dive have been completed, e.g. the bottom time segment and "
 "deep stops (if these are implemented). Leave the remaining waypoints on the "
 "ascent to _Subsurface_. In most cases _Subsurface_ computes additional way "
-"points in order to fulfil decompression requirements for that dive. A "
+"points in order to fulfill decompression requirements for that dive. A "
 "waypoint can be moved by selecting that waypoint and by using the arrow "
 "keys.  The waypoints listed in the _Dive Planner Points_ dialogue can be "
 "edited by hand in order to obtain a precise presentation of the dive plan. "
@@ -5911,7 +5911,7 @@ msgstr ""
 msgid ""
 "On the bottom right of the dive planner, under _Dive Plan Details_, the "
 "exact details of the dive plan are provided. These details may be modified "
-"by checking any of the options under the _Dive Notes_ section of the dive "
+"by checking any of the options under the _Notes_ section of the dive "
 "planner, immediately to the left of the _Dive Plan Details_. If a _Verbatim "
 "diveplan_ is requested, a detailed sentence-level explanation of the dive "
 "plan is given. If any of the management specifications have been exceeded "
@@ -5999,13 +5999,13 @@ msgid ""
 "from the main menu, where the gas consumption calculation takes into account the pSCR dump\n"
 "ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop\n"
 "accross the mouthpiece of the rebreather into account. If the\n"
-"pO~2~ drops below what is considered a save value, a warning apears in the _Dive plan\n"
+"pO~2~ drops below what is considered a save value, a warning appears in the _Dive plan\n"
 "details_. A typical pSCR configuration is with a single cylinder and one or more bail-out\n"
 "cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables\n"
 "are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints\n"
 "are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable\n"
 "to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen\n"
-"in the loop due to the oxygen drop accross the mouthpiece of the pSCR equipment.\n"
+"in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.\n"
 msgstr ""
 
 #. type: Target for macro image
@@ -6095,15 +6095,15 @@ msgstr ""
 msgid ""
 "Dive plans have many characteristics in common with dive logs (dive profile, "
 "dive notes, etc).  After a dive plan has been saved, the dive details and "
-"gas calculations are saved in the *Dive Notes* tab. While a dive plan is "
-"being designed, it can be printed using the _Print_ button in the dive "
-"planner. This prints the dive details and gas calculations in the _Dive Plan "
-"Details_ panel of the dive planner. However, after the plan has been saved, "
-"it is represented in a way very similar to a dive log and the gas "
-"calculations cannot be accessed in the same way as during the planning "
-"process. The only way to print the dive plan is to use the _File -> Print_ "
-"facility on the main menu in the same way as for dive logs or by copy and "
-"paste to a word processor."
+"gas calculations are saved in the *Notes* tab. While a dive plan is being "
+"designed, it can be printed using the _Print_ button in the dive planner. "
+"This prints the dive details and gas calculations in the _Dive Plan Details_ "
+"panel of the dive planner. However, after the plan has been saved, it is "
+"represented in a way very similar to a dive log and the gas calculations "
+"cannot be accessed in the same way as during the planning process. The only "
+"way to print the dive plan is to use the _File -> Print_ facility on the "
+"main menu in the same way as for dive logs or by copy and paste to a word "
+"processor."
 msgstr ""
 
 #. type: Title ==
@@ -6364,10 +6364,8 @@ msgstr ""
 
 #. type: Plain text
 #: user-manual.txt:3187
-msgid "<<S_ViewPanels,_Info_>> - View only the *Dive Notes* panel."
-msgstr ""
-"<<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes de "
-"plongée*."
+msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel."
+msgstr "<<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes*."
 
 #. type: Plain text
 #: user-manual.txt:3188
@@ -7199,8 +7197,8 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:3549
 msgid ""
-"In the dropdown list on the middle right labeled '_Pre-configured imports_"
-"\", select _APD Log Viewer_."
+"In the dropdown list on the top left labeled '_Pre-configured imports_\", "
+"select _APD Log Viewer_."
 msgstr ""
 
 #. type: Plain text
@@ -7455,30 +7453,36 @@ msgstr ""
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
+#. type: Named 'icon' AttributeList argument for style 'icon'
+#: user-manual.txt:3632
+#, no-wrap
+msgid "images/icons/atomiclogo.jpg"
+msgstr "images/icons/atomiclogo.jpg"
+
 #. type: Plain text
-#: user-manual.txt:3638
+#: user-manual.txt:3639
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
-"The divelog is kept in a SQlite database at C:\\ProgramData\\AtomicsAquatics"
+"The divelog is kept in a SQLite database at C:\\ProgramData\\AtomicsAquatics"
 "\\Cobalt-Logbook\\Cobalt.db. This file can be directly imported to "
 "Subsurface."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3640
+#: user-manual.txt:3641
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3643
+#: user-manual.txt:3644
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr "images/icons/mareslogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3651
+#: user-manual.txt:3652
 msgid ""
 "Mares Dive Organiser is a Windows application. The dive log is kept as a "
 "Microsoft SQL Compact Edition database with a '.sdf' filename extension. The "
@@ -7489,7 +7493,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3656
+#: user-manual.txt:3657
 msgid ""
 "Within Dive Organiser, select _Database -> Backup_ from the main menu and "
 "back up the database to the desk top.  This creates a zipped file "
@@ -7497,36 +7501,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3659
+#: user-manual.txt:3660
 msgid ""
 "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganiser.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3660
+#: user-manual.txt:3661
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3661
+#: user-manual.txt:3662
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3663
+#: user-manual.txt:3664
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3665
+#: user-manual.txt:3666
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr "images/icons/divingloglogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3674
+#: user-manual.txt:3675
 msgid ""
 "Unfortunately DivingLog XML files give us no indication on the preferences "
 "set on one's system. So in order for _Subsurface_ to be able to successfully "
@@ -7537,28 +7541,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3676
+#: user-manual.txt:3677
 msgid "In DivingLog open the 'File -> Export -> XML' menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3677
+#: user-manual.txt:3678
 msgid "Select the dives to export"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3678
+#: user-manual.txt:3679
 msgid "Click on the export button and select the filename"
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3680
+#: user-manual.txt:3681
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3689
+#: user-manual.txt:3690
 msgid ""
 "Many divers keep a diving log in some form of a digital file, commonly a "
 "spreadsheet with various fields of information. These logs can be easily "
@@ -7571,7 +7575,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3695
+#: user-manual.txt:3696
 msgid ""
 "The first step is to organize the diving data in the spreadsheet, so that "
 "the first row contains the names (or titles) of each column and the "
@@ -7582,41 +7586,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3697
+#: user-manual.txt:3698
 msgid ""
 "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3698
+#: user-manual.txt:3699
 msgid "Duration: the format should be minutes:seconds."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3699
+#: user-manual.txt:3700
 msgid ""
-"Unit system: only one unit system shold be used (i.e., no mixture between "
+"Unit system: only one unit system should be used (i.e., no mixture between "
 "imperial and metric units)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3700
+#: user-manual.txt:3701
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3701
+#: user-manual.txt:3702
 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3702
+#: user-manual.txt:3703
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3706
+#: user-manual.txt:3707
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -7627,13 +7631,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3707
+#: user-manual.txt:3708
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr "images/LOffice_spreadsheetdata.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3710
+#: user-manual.txt:3711
 msgid ""
 "To export the data as a .CSV file from within LibreOffice click _File -> "
 "Save As_. On the dialogue that comes up, select the _Text CSV (.csv)_ as the "
@@ -7641,13 +7645,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3711
+#: user-manual.txt:3712
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr "images/LOffice_save_as_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3714
+#: user-manual.txt:3715
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -7655,13 +7659,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3715
+#: user-manual.txt:3716
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr "images/LOffice_field_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3718
+#: user-manual.txt:3719
 msgid ""
 "One can double check the .CSV file by opening it with a text editor, and "
 "then import the dive data as explained on the section xref:"
@@ -7669,13 +7673,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3719
+#: user-manual.txt:3720
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3725
+#: user-manual.txt:3726
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -7686,19 +7690,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3727
+#: user-manual.txt:3728
 msgid ""
 "In Microsoft Windows, click the *Start* button, and then select _Control "
 "Panel_ from the list on the right-hand side."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3728
+#: user-manual.txt:3729
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3731
+#: user-manual.txt:3732
 msgid ""
 "Do one of the following: ** In Windows 7, click the _Formats_ tab, and then "
 "click _Customize this format_.  ** In Windows XP, click the _Regional "
@@ -7706,48 +7710,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3732
+#: user-manual.txt:3733
 msgid ""
 "Type a new separator in the _List separator_ box. To use a TAB-delimited "
 "file, type the word TAB in the box."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3733
+#: user-manual.txt:3734
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3735
+#: user-manual.txt:3736
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3736
+#: user-manual.txt:3737
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr "images/Win_SaveCSV2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3739
+#: user-manual.txt:3740
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3741
+#: user-manual.txt:3742
 msgid ""
 "With the dive log opened in _Excel_, select the round Windows button at the "
 "top left, then _Save As_."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3742
+#: user-manual.txt:3743
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr "images/Win_SaveCSV1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3745
+#: user-manual.txt:3746
 msgid ""
 "Click on the left-hand part of the _Save as_ option, NOT on the arrow on the "
 "right-hand. This brings up a dialogue for saving the spreadsheet in an "
@@ -7757,13 +7761,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3746
+#: user-manual.txt:3747
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr "images/Win_SaveCSV3.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3749
+#: user-manual.txt:3750
 msgid ""
 "Select the _Save_ button. The CSV-formatted file is saved into the folder "
 "that was selected. One can double check the .CSV file by opening it with a "
@@ -7772,19 +7776,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3750
+#: user-manual.txt:3751
 #, no-wrap
 msgid "APPENDIX E: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3752
+#: user-manual.txt:3753
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3756
+#: user-manual.txt:3757
 msgid ""
 "'Question': I dived with a 12.2 l tank, starting with 220 bar and ending "
 "with 100 bar, and I calculate a different SAC compared what _Subsurface_ "
@@ -7792,7 +7796,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3762
+#: user-manual.txt:3763
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -7802,7 +7806,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3768
+#: user-manual.txt:3769
 msgid ""
 "and that's true for an ideal gas, and it's what you get taught in dive "
 "theory.  But an \"ideal gas\" doesn't actually exist, and real gases "
@@ -7812,12 +7816,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3770
+#: user-manual.txt:3771
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3776
+#: user-manual.txt:3777
 msgid ""
 "where the amount of air is *not* just \"tank size times pressure in bar\".  "
 "It's a combination of: \"take compressibility into account\" (which is a "
@@ -7828,12 +7832,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3778
+#: user-manual.txt:3779
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3783
+#: user-manual.txt:3784
 msgid ""
 "which is about 1445, not 1464. So there was 19 l too much in your simple "
 "calculation that ignored the difference between 1 bar and one ATM.  The "
@@ -7843,7 +7847,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3789
+#: user-manual.txt:3790
 msgid ""
 "So be happy: your SAC really is better than your calculations indicated.  Or "
 "be sad: your cylinder contains less air than you thought it did.  And as "
@@ -7854,13 +7858,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3790
+#: user-manual.txt:3791
 #, no-wrap
 msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3794
+#: user-manual.txt:3795
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -7868,7 +7872,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3802
+#: user-manual.txt:3803
 msgid ""
 "'Answer': For example, if you end up doing a weight check (deep enough to "
 "trigger the \"dive started\")  but then come back up and wait five minutes "
diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index c7f5609ce..56d4c1ba7 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -521,31 +521,31 @@ plongées du journal (carnet) de plongées de l&#8217;utilisateur. Une plongée
 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>

-<div class="paragraph"><p>Les <strong>informations de plongée</strong> en haut à gauche, fournissent des informations

-détaillées sur la plongée sélectionnée dans la <strong>liste des plongées</strong>, dont

-des statistiques pour la plongée sélectionnée ou pour toutes les plongées

-mises en surbrillance.</p></div>

-<div class="paragraph"><p>Le <strong>profil de plongée</strong> en haut à droite, affiche un profil de plongée

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

-<div class="paragraph"><p>Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la

+<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>
+<div class="paragraph"><p>Les <strong>informations</strong> en haut à gauche, fournissent des informations détaillées
+sur la plongée sélectionnée dans la <strong>liste des plongées</strong>, dont des
+statistiques pour la plongée sélectionnée ou pour toutes les plongées mises
+en surbrillance.</p></div>
+<div class="paragraph"><p>Le <strong>profil de plongée</strong> en haut à droite, affiche un profil de plongée
+graphique de la plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div>
+<div class="paragraph"><p>Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la
 taille de chaque panneau. <em>Subsurface</em> mémorise la position de ces

 séparateurs, pour qu&#8217;au prochain lancement <em>Subsurface</em> utilise ces

 positions.</p></div>

 <div class="paragraph"><p>Si une plongée est sélectionnée dans la <strong>liste des plongées</strong>, l&#8217;emplacement

 de la plongée, les informations détaillées et le profil de la <em>plongée

 sélectionnée</em> sont affichées dans les panneaux respectifs. D&#8217;autre part, si

-plus d&#8217;une plongée est mise en surbrillance seule la dernière mise en

-surbrillance est la <em>plongée sélectionnée</em>, mais les données de <em>toutes les

-plongées mises en surbrillances</em> sont affichées dans l&#8217;onglet <strong>Stats</strong> du

-panneau <strong>informations de plongée</strong> (profondeur maximale, minimale et moyenne,

-les durées, les températures de l&#8217;eau et le SAC (air consommé); temps total

-et nombre de plongées sélectionnées).</p></div>

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

-<div class="content">

-<img src="images/main_window_f20.jpg" alt="The Main Window" />

+plus d&#8217;une plongée est mise en surbrillance seule la dernière mise en
+surbrillance est la <em>plongée sélectionnée</em>, mais les données de <em>toutes les
+plongées mises en surbrillances</em> sont affichées dans l&#8217;onglet <strong>Stats</strong> du
+panneau <strong>informations</strong> (profondeur maximale, minimale et moyenne, les
+durées, les températures de l&#8217;eau et le SAC (air consommé); temps total et
+nombre de plongées sélectionnées).</p></div>
+<div class="imageblock" id="S_ViewPanels" style="text-align:center;">
+<div class="content">
+<img src="images/main_window_f20.jpg" alt="The Main Window" />
 </div>

 </div>

 <div class="paragraph"><p>L&#8217;utilisateur peut déterminer si lesquels des quatre panneaux sont affichés

@@ -636,26 +636,26 @@ Import from spreadsheet or CSV files containing dive profiles.
 record of information within <em>Subsurface</em> is a dive. The most important

 information in a simple dive logbook usually includes dive type, date, time,

 duration, depth, the names of your dive buddy and of the dive master or dive

-guide, and some remarks about the dive. <em>Subsurface</em> can store much more

-information than this for each dive. In order to add a dive to a dive log,

-select <em>Log &#8594; Add Dive</em> from the Main Menu. The program then shows three

-panels to enter information for a dive: two tabs in the <strong>Dive Info</strong> panel

-(<strong>Dive Notes</strong> and <strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that

-displays a graphical profile of each dive. These panels are respectively

-marked <span class="red">A</span>, <span class="red">B</span> and <span class="red">C</span> in the figure below. Each of these

-tabs will now be explained for data entry.</p></div>

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

-<div class="content">

-<img src="images/AddDive1_f20.jpg" alt="FIGURE: Add dive" />

-</div>

-</div>

-<div class="paragraph"><p>When one edits a field in Dive notes or Equipment panels, <em>Subsurface</em>

-enters <strong>Editing Mode</strong>, indicated by the message in the blue box at the top

-of the <em>Dive Notes</em> panel (see the image below). This message is displayed

-in all the panels under Dive notes and Equipment when in <strong>Editing Mode</strong>.</p></div>

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

-<div class="content">

-<img src="images/BlueEditBar_f20.jpg" alt="Blue edit bar" />

+guide, and some remarks about the dive. <em>Subsurface</em> can store much more
+information than this for each dive. In order to add a dive to a dive log,
+select <em>Log &#8594; Add Dive</em> from the Main Menu. The program then shows three
+panels to enter information for a dive: two tabs in the <strong>Info</strong> panel
+(<strong>Notes</strong> and <strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that displays
+a graphical profile of each dive. These panels are respectively marked
+<span class="red">A</span>, <span class="red">B</span> and <span class="red">C</span> in the figure below. Each of these tabs will
+now be explained for data entry.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/AddDive1_f20.jpg" alt="FIGURE: Add dive" />
+</div>
+</div>
+<div class="paragraph"><p>When one edits a field in Notes or Equipment panels, <em>Subsurface</em> enters
+<strong>Editing Mode</strong>, indicated by the message in the blue box at the top of the
+<em>Notes</em> panel (see the image below). This message is displayed in all the
+panels under Notes and Equipment when in <strong>Editing Mode</strong>.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/BlueEditBar_f20.jpg" alt="Blue edit bar" />
 </div>

 </div>

 <div class="paragraph"><p>The <em>Save</em> button should only be selected after all the parts of a dive have

@@ -663,20 +663,20 @@ been entered.  When entering dives by hand, the <em>Info</em>, <em>Equipment</em
 <em>Profile</em> tabs should be completed before saving the information. By

 selecting the <em>Save</em> button, a local copy of the information for this

 specific dive is saved in memory. When one closes Subsurface, the program

-will ask again, this time whether the complete dive log should be saved on

-disk or not.</p></div>

-<div class="sect3">

-<h4 id="_notes_de_plongée">5.1.1. Notes de plongée</h4>

-<div class="paragraph"><p>This panel contains the date, time and place information for a particular

-dive, environmental conditions, co-divers and buddies, as well as some

-descriptive information. If one clicks on the <strong>Dive Notes</strong> tab, the

-following fields are visible:</p></div>

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

-<div class="content">

-<img src="images/AddDive2_f20.jpg" alt="FIGURE: The Dive Notes tab" />

-</div>

-</div>

-<div class="paragraph"><p>The <strong>Time</strong> field reflects the date and the time of the dive. By clicking the

+will ask again, this time whether the complete dive log should be saved on
+disk or not.</p></div>
+<div class="sect3">
+<h4 id="_notes">5.1.1. Notes</h4>
+<div class="paragraph"><p>This panel contains the date, time and place information for a particular
+dive, environmental conditions, co-divers and buddies, as well as some
+descriptive information. If one clicks on the <strong>Notes</strong> tab, the following
+fields are visible:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/AddDive2_f20.jpg" alt="FIGURE: The Notes tab" />
+</div>
+</div>
+<div class="paragraph"><p>The <strong>Time</strong> field reflects the date and the time of the dive. By clicking the
 date, a calendar is displayed from which one can choose the correct

 date. Press ESC to escape from the calendar.  The time values (hour and

 minutes) can also be edited directly by clicking on each of them in the text

@@ -723,9 +723,9 @@ The coordinates can be entered by hand if they are known, using one of four
 minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds,

 e.g. N30° 13' 29.8" , E30° 49' 1.5" Decimal degrees, e.g. 30.22496 ,

 30.821798</code></pre>

-</div></div>

-</li>

-</ol></div>

+</div></div>
+</li>
+</ol></div>
 <div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a
 negative value, e.g. -30.22496. Similarly western longitudes are given with
 a <strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323.</p></div>
@@ -734,9 +734,9 @@ like that: N30d W20d.</p></div>
 <div class="paragraph"><p>Please note that GPS coordinates of a dive site are linked to the Location
 name - so adding coordinates to dives that do not have a location
 description will cause unexpected behaviour (Subsurface will think that all
-of these dives have the same location and try to keep their GPS coordinates

-the same).</p></div>

-<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive

+of these dives have the same location and try to keep their GPS coordinates
+the same).</p></div>
+<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive
 performed. The options are OC (Open Circuit, the default setting, meant for most recreational dives),

 Freedive (dive without SCUBA equipment), CCR (Closed-circuit

 rebreather) and pSCR (Passive semi-closed rebreather).</p></div>

@@ -762,16 +762,16 @@ training, cave etc. <em>Subsurface</em> has many built-in tags. Auto completion
 For instance, if <code>cav</code> was typed, then the tags <strong>cave</strong> and <strong>cavern</strong> are

 shown for the user to choose from.</p></div>

 <div class="paragraph"><p><strong>Notes</strong>: Any additional information can be typed here.</p></div>

-<div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for

-tabs in the info panel and in the dive profile panel, so there&#8217;s no need to

-use them until ALL other information has been added. Here is an example of a

-completed Dive Notes panel:</p></div>

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

-<div class="content">

-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Dive Notes tab" />

-</div>

-</div>

-</div>

+<div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for
+tabs in the info panel and in the dive profile panel, so there&#8217;s no need to
+use them until ALL other information has been added. Here is an example of a
+completed Notes panel:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Notes tab" />
+</div>
+</div>
+</div>
 <div class="sect3">

 <h4 id="_equipment">5.1.2. Equipment</h4>

 <div class="paragraph"><p>The Equipment tab allows the user to enter information about the type of

@@ -911,19 +911,19 @@ EAN50.</p></div>
 <img src="images/DiveProfile4_f20.jpg" alt="FIGURE: Completed dive profile" />

 </div>

 </div>

-</div>

-<div class="sect3">

-<h4 id="_saving_the_hand_entered_dive_information">5.1.4. Saving the hand-entered dive information</h4>

-<div class="paragraph"><p>The information entered in the <strong>Dive Notes</strong> tab, the <strong>Equipment</strong> tab as well

-as the <strong>Dive Profile</strong> can now be saved in the user&#8217;s logbook by using the

-two buttons on the top right hand of the Dive Notes tab. If the <em>Save</em>

-button is clicked, the dive data are saved in the current logbook. If the

-<em>Cancel</em> button is clicked, the newly entered dive data are discarded. When

-exiting <em>Subsurface</em>, the user will be prompted once more to save the

-logbook with the new dive(s).</p></div>

-</div>

-</div>

-<div class="sect2">

+</div>
+<div class="sect3">
+<h4 id="_saving_the_hand_entered_dive_information">5.1.4. Saving the hand-entered dive information</h4>
+<div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab, the <strong>Equipment</strong> tab as well as
+the <strong>Dive Profile</strong> can now be saved in the user&#8217;s logbook by using the two
+buttons on the top right hand of the Notes tab. If the <em>Save</em> button is
+clicked, the dive data are saved in the current logbook. If the <em>Cancel</em>
+button is clicked, the newly entered dive data are discarded. When exiting
+<em>Subsurface</em>, the user will be prompted once more to save the logbook with
+the new dive(s).</p></div>
+</div>
+</div>
+<div class="sect2">
 <h3 id="S_ImportDiveComputer">5.2. Importing new dive information from a Dive Computer</h3>

 <div class="sect3">

 <h4 id="_connecting_and_importing_data_from_a_dive_computer">5.2.1. Connecting and importing data from a dive computer.</h4>

@@ -992,13 +992,13 @@ In <em>Subsurface</em>, from the Main Menu, the user must select <em>Import &#85
 though these dives have already been imported to <em>Subsurface</em>. For that

 reason, if the divecomputer allows this, <em>Subsurface</em> 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,

-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 labelled <em>Force

-download of all dives</em>.</p></div>

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

-<li>

+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,
+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 <em>Force
+download of all dives</em>.</p></div>
+<div class="ulist"><ul>
+<li>
 <p>

 The dialogue has two drop-down lists, <strong>Vendor</strong> and <strong>Dive Computer</strong>. On the

    <strong>vendor</strong> drop-down list select the make of the computer, e.g.  Suunto,

@@ -1191,28 +1191,28 @@ saving the Nickname, the dive logs show the nickname for that particular
 device instead of the model name, allowing easy identification of devices.</p></div>

 </div>

 <div class="sect3">

-<h4 id="S_EditDiveInfo">5.2.3. Updating the dive information imported from the dive computer.</h4>

-<div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive

-computer is not complete and more details must be added in order to have a

-fuller record of the dives. To do this, the <strong>Dive Notes</strong> and the <strong>Equipment</strong>

-tabs on the top left hand of the <em>Subsurface</em> window should be used.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_notes_de_plongée_2">5.2.4. Notes de plongée</h4>

-<div class="paragraph"><p>The date and time of the dive, gas mixture and (often) water temperature are

-usually shown as obtained from the dive computer, but the user needs to add

-additional information by hand in order to have a more complete dive

-record. In a few cases, (e.g. APD rebreathers) one also has to provide the

-date and time of the dive.  If the contents of this tab is changed or edited

-in any way, the message in a blue box at the top of the panel indicates that

-the dive is being edited. If one clicks on the <strong>Dive Notes</strong> tab, the

-following fields are visible:</p></div>

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

-<div class="content">

-<img src="images/AddDive3_f20.jpg" alt="FIGURE: The Dive Notes tab" />

-</div>

-</div>

-<div class="paragraph"><p>The <strong>Time</strong> field reflects the date and time of the dive. By clicking the

+<h4 id="S_EditDiveInfo">5.2.3. Updating the dive information imported from the dive computer.</h4>
+<div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive
+computer is not complete and more details must be added in order to have a
+fuller record of the dives. To do this, the <strong>Notes</strong> and the <strong>Equipment</strong> tabs
+on the top left hand of the <em>Subsurface</em> window should be used.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_notes_2">5.2.4. Notes</h4>
+<div class="paragraph"><p>The date and time of the dive, gas mixture and (often) water temperature are
+usually shown as obtained from the dive computer, but the user needs to add
+additional information by hand in order to have a more complete dive
+record. In a few cases, (e.g. APD rebreathers) one also has to provide the
+date and time of the dive.  If the contents of this tab is changed or edited
+in any way, the message in a blue box at the top of the panel indicates that
+the dive is being edited. If one clicks on the <strong>Notes</strong> tab, the following
+fields are visible:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/AddDive3_f20.jpg" alt="FIGURE: The Notes tab" />
+</div>
+</div>
+<div class="paragraph"><p>The <strong>Time</strong> field reflects the date and time of the dive. By clicking the
 date, a calendar is displayed from which one can choose the correct

 date. Press ESC to close the calendar.  The time values (hour and minutes)

 can also be edited directly by clicking on each of them in the text box and

@@ -1302,16 +1302,16 @@ will list the tags that correspond to the typing. For instance, if the user
 typed

 <code>cav</code>, then the tags <strong>cave</strong> and <strong>cavern</strong> are shown for the user to choose from.</p></div>

 <div class="paragraph"><p><strong>Notes</strong>: Any additional information for the dive can be entered here.</p></div>

-<div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for

-tabs in the info panel and in the dive profile panel, so there&#8217;s no need to

-use them until ALL other information has been added. Here is an example of a

-completed Dive Notes panel:</p></div>

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

-<div class="content">

-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Dive Notes tab" />

-</div>

-</div>

-</div>

+<div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for
+tabs in the info panel and in the dive profile panel, so there&#8217;s no need to
+use them until ALL other information has been added. Here is an example of a
+completed Notes panel:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Notes tab" />
+</div>
+</div>
+</div>
 <div class="sect3">

 <h4 id="_equipment_2">5.2.5. Equipment</h4>

 <div class="paragraph"><p>The Equipment tab allows one to enter information about the type of cylinder

@@ -1319,9 +1319,9 @@ and gas used as well as the weights used for the dive. The message in a blue
 box at the top of the panel:</p></div>

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

 <div class="content">

-<img src="images/BlueEditBar_f20.jpg" alt="FIGURE: Blue edit bar" />

-</div>

-</div>

+<img src="images/BlueEditBar_f20.jpg" alt="FIGURE: Blue edit bar" />
+</div>
+</div>
 <div class="paragraph"><p>indicates that the dive is being edited. This is a highly interactive part
 of <em>Subsurface</em> and the information on cylinders and gases (entered here)
 determines the behaviour of the dive profile (top right-hand panel).</p></div>
@@ -1329,9 +1329,9 @@ determines the behaviour of the dive profile (top right-hand panel).</p></div>
 like this:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURE: Initial cylinder dialogue" />

-</div>

-</div>

+<img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURE: Initial cylinder dialogue" />
+</div>
+</div>
 <div class="paragraph"><p>In most cases <em>Subsurface</em> obtains the gas used from the dive computer and

 automatically inserts the gas composition(% oxygen) in the table. The<br />

 button at the top right allows the user to add more cylinders for this

@@ -1403,43 +1403,43 @@ weights: integrated as well as a weight belt:</p></div>
 </div>

 </div>

 <div class="sect3">

-<h4 id="_editing_several_selected_dives_simultaneously">5.2.6. Editing several selected dives simultaneously</h4>

-<div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of

-the uploaded dives are shown in the <strong>Dive profile</strong> tab, as well as a few

-items of information in the <strong>Dive Notes</strong> tab (e.g. water temperature) and in

-the <strong>Equipment</strong> tab (e.g. gas pressures and gas composition). However the

-other fields remain empty.  It may be useful to simultaneously edit some of

-the fields in the <strong>Dive Notes</strong> and <strong>Equipment</strong> tabs.  For instance, it is

-possible that a diver performed several dives during a single day, using

-identical equipment while diving at the same dive site or with the same dive

-master and/or buddy or tags. Instead of completing the information for each

-of these dives separately, one can select all the dives for that day in the

-<strong>Dive List</strong> and insert the same information in the <strong>Dive Notes</strong> and

-<strong>Equipment</strong> fields that need identical information. This is achieved by

-editing the dive notes or the equipment for any one of the selected dives.</p></div>

-<div class="paragraph"><p>The simultaneous editing only works with fields that do not already contain

-information.  This means that, if some fields have been edited for a

-particular dive among the selected dives, these are not changed while

+<h4 id="_editing_several_selected_dives_simultaneously">5.2.6. Editing several selected dives simultaneously</h4>
+<div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of
+the uploaded dives are shown in the <strong>Dive profile</strong> tab, as well as a few
+items of information in the <strong>Notes</strong> tab (e.g. water temperature) and in the
+<strong>Equipment</strong> tab (e.g. gas pressures and gas composition). However the other
+fields remain empty.  It may be useful to simultaneously edit some of the
+fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs.  For instance, it is possible
+that a diver performed several dives during a single day, using identical
+equipment while diving at the same dive site or with the same dive master
+and/or buddy or tags. Instead of completing the information for each of
+these dives separately, one can select all the dives for that day in the
+<strong>Dive List</strong> and insert the same information in the <strong>Notes</strong> and <strong>Equipment</strong>
+fields that need identical information. This is achieved by editing the dive
+notes or the equipment for any one of the selected dives.</p></div>
+<div class="paragraph"><p>The simultaneous editing only works with fields that do not already contain
+information.  This means that, if some fields have been edited for a
+particular dive among the selected dives, these are not changed while
 editing the dives simultaneously. Technically, the rule for editing several

 dives simultaneously is: if the data field being edited contains <em>exactly

 the same information</em> for all the dives that have been selected, the new,

 edited information is substituted for all the selected dives, otherwise only

 the edited dive is changed, even though several dives have been selected in

-the <strong>Dive List</strong>. This greatly speeds up the completion of the dive log after

-several similar dives.</p></div>

-<div class="paragraph" id="S_CopyComponents"><p><em>METHOD 2</em>:There is a different way of achieving the same goal. Select a

-dive with all the appropriate information typed into the <strong>Dive Notes</strong> and

-<strong>Equipment</strong> tabs. Then, from the main menu, select <em>Log &#8594; Copy dive

-components</em>.  A box is presented with a selection of check boxes for most of

-the fields in the <strong>Dive Notes</strong> and <strong>Equipment</strong> tabs.  Select the fields to

-be copied from the currently selected dive, then select <em>OK</em>. Now, in the

-<strong>Dive List</strong>, select the dives into which this information is to be

-pasted. Then, from the main menu, select <em>Log &#8594; Paste dive components</em>.

-All the selected dives now contain the data initially selected in the

-original source dive log.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_adding_bookmarks_to_a_dive">5.2.7. Adding Bookmarks to a dive</h4>

+the <strong>Dive List</strong>. This greatly speeds up the completion of the dive log after
+several similar dives.</p></div>
+<div class="paragraph" id="S_CopyComponents"><p><em>METHOD 2</em>:There is a different way of achieving the same goal. Select a
+dive with all the appropriate information typed into the <strong>Notes</strong> and
+<strong>Equipment</strong> tabs. Then, from the main menu, select <em>Log &#8594; Copy dive
+components</em>.  A box is presented with a selection of check boxes for most of
+the fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs.  Select the fields to be
+copied from the currently selected dive, then select <em>OK</em>. Now, in the <strong>Dive
+List</strong>, select the dives into which this information is to be pasted. Then,
+from the main menu, select <em>Log &#8594; Paste dive components</em>.  All the selected
+dives now contain the data initially selected in the original source dive
+log.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_adding_bookmarks_to_a_dive">5.2.7. Adding Bookmarks to a dive</h4>
 <div class="paragraph"><p>Many divers wish to annotate their dives with text that indicate particular

 events during the dive, e.g. "Saw dolphins", or "Released surface

 buoy". This is easily done:</p></div>

@@ -1476,19 +1476,19 @@ If one hovers using the mouse over the red bookmark, the appropriate text is
 <img src="images/Bookmarks.jpg" alt="FIGURE: Bookmark dialog" />

 </div>

 </div>

-</div>

-<div class="sect3">

-<h4 id="_saving_the_updated_dive_information">5.2.8. Saving the updated dive information</h4>

-<div class="paragraph"><p>The information entered in the <strong>Dive Notes</strong> tab and the <strong>Equipment</strong> tab can

-be saved by using the two buttons on the top right hand of the <strong>Dive Notes</strong>

-tab. If the <em>Save</em> button is clicked, the dive data are saved. If the

-<em>Cancel</em> button is clicked, then the newly entered dive data are deleted,

-although the dive profile obtained from the dive computer will be

-retained. When the user exits <em>Subsurface</em> there is a final prompt to

-confirm that the new data should be saved.</p></div>

-</div>

-</div>

-<div class="sect2">

+</div>
+<div class="sect3">
+<h4 id="_saving_the_updated_dive_information">5.2.8. Saving the updated dive information</h4>
+<div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab and the <strong>Equipment</strong> tab can be
+saved by using the two buttons on the top right hand of the <strong>Notes</strong> tab. If
+the <em>Save</em> button is clicked, the dive data are saved. If the <em>Cancel</em>
+button is clicked, then the newly entered dive data are deleted, although
+the dive profile obtained from the dive computer will be retained. When the
+user exits <em>Subsurface</em> there is a final prompt to confirm that the new data
+should be saved.</p></div>
+</div>
+</div>
+<div class="sect2">
 <h3 id="_importing_dive_information_from_other_digital_data_sources_or_other_data_formats">5.3. Importing dive information from other digital data sources or other data formats</h3>

 <div class="paragraph" id="S_ImportingAlienDiveLogs"><p>If a user has been diving for some time, it is possible that several dives

 were logged using other dive log software. This information does not need

@@ -1717,18 +1717,18 @@ successful import of the data.</p></div>
 <div class="paragraph"><p>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

 table contains the column headings found in the <em>CSV</em> data file. The blue

-row of cells immediately above these contains the names understood by

-<em>Subsurface</em>. The white area below the dropdown lists contains all the field

-names that <em>Subsurface</em> recognises. These names are in blue balloons and can

-be moved using a drag-and-frop action. For instance, <em>Subsurface</em> expects

-the column heading for Dive number (" # ") to be "Dive # ". If the column

-heading that <em>Subsurface</em> 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 labelled "Dive # " and drop it

-in the blue cell immediately above the white cell containing " # ". This is

-depicted in the image below.</p></div>

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

+row of cells immediately above these contains the names understood by
+<em>Subsurface</em>. The white area below the dropdown lists contains all the field
+names that <em>Subsurface</em> recognises. These names are in blue balloons and can
+be moved using a drag-and-drop action. For instance, <em>Subsurface</em> expects
+the column heading for Dive number (" # ") to be "Dive # ". If the column
+heading that <em>Subsurface</em> 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
+depicted in the image below.</p></div>
+<div class="imageblock" style="text-align:center;">
 <div class="content">

 <img src="images/csv_import2_f20.jpg" alt="FIGURE: CSV download dialogue 2" />

 </div>

@@ -1744,14 +1744,14 @@ in the <strong>Dive List</strong> panel.</p></div>
 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

-<img src="images/icons/important.png" alt="Important" />

-</td>

-<td class="content"><em>CSV</em> is an abbreviation for a data file format: <em>Comma-Separated

-Variables</em>. It is a file format allowing someone to view or edit the

-information using a text editor such as Notebook (Windows), gedit (Linux) or

-TextWrangler (OS/X). The two main advantages of the <em>CSV</em> format is that the

-data are easily editable as text without any proprietary software and

-ensuring all information is human-readable, not being obscured by any custom

+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content"><em>CSV</em> is an abbreviation for a data file format: <em>Comma-Separated
+Values</em>. It is a file format allowing someone to view or edit the
+information using a text editor such as Notepad (Windows), gedit (Linux) or
+TextWrangler (OS/X). The two main advantages of the <em>CSV</em> format is that the
+data are easily editable as text without any proprietary software and
+ensuring all information is human-readable, not being obscured by any custom
 or proprietary attributes that proprietary software insert into files.

 Because of its simplicity the <em>CSV</em> format is used as an interchange format

 between many software packages, e.g. between spreadsheet, statistical,

@@ -2307,13 +2307,13 @@ button in the tool bar to the left of the dive profile:</p></div>
 </div>

 </div>

 <div class="paragraph"><p>After the images have been loaded, they appear in two places:</p></div>

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

-<li>

-<p>

-the <em>Photos</em> tab of the <strong>Dive Notes</strong> panel.

-</p>

-</li>

-<li>

+<div class="ulist"><ul>
+<li>
+<p>
+the <em>Photos</em> tab of the <strong>Notes</strong> panel.
+</p>
+</li>
+<li>
 <p>

 as tiny icons (stubs) on the dive profile at the appropriate positions

    reflecting the time each photograph was taken. See below:

@@ -2345,15 +2345,15 @@ the <em>Photos</em> tab (see text below).</p></div>
 </div>

 </div>

 </div>

-<div class="sect3">

-<h4 id="_the_em_photos_em_tab">5.5.3. The <em>Photos</em> tab</h4>

-<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em>

-tab of the <em>Dive Notes</em> panel. Photos taken in rapid succession during a

-dive (therefore sometimes with large overlap on the dive profile) can easily

-be accessed in the <em>Photos</em> tab. This tab serves as a tool for individually

-accessing the photos of a dive, while the stubs on the dive profile give an

-indication of when during a dive a photo was taken. By single-clicking on a

-thumbnail in the <em>Photos</em> panel, a photo is selected. By double-clicking a

+<div class="sect3">
+<h4 id="_the_em_photos_em_tab">5.5.3. The <em>Photos</em> tab</h4>
+<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em>
+tab of the <em>Notes</em> panel. Photos taken in rapid succession during a dive
+(therefore sometimes with large overlap on the dive profile) can easily be
+accessed in the <em>Photos</em> tab. This tab serves as a tool for individually
+accessing the photos of a dive, while the stubs on the dive profile give an
+indication of when during a dive a photo was taken. By single-clicking on a
+thumbnail in the <em>Photos</em> panel, a photo is selected. By double-clicking a
 thumbnail, the full-sized image is shown, overlaying the <em>Subsurface</em>

 window. A photo can be deleted from the <em>Photos</em> panel by selecting it

 (single-click) and then by pressing the <em>Del</em> key on the keyboard. This

@@ -2373,9 +2373,9 @@ to the left of the <em>Dive Profile</em>), the program only shows a small white
 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>

+be seen in the normal way.</p></div>
+</div>
+</div>
 <div class="sect2">
 <h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>
 <div class="sect3">
@@ -2391,7 +2391,7 @@ there are only two types of information that need to be provided:</p></div>
 <li>
 <p>
 <strong>Describe the cylinders used during the dive</strong> This is performed in the <strong>Equipment tab</strong> of
-  the <strong>Dive Info</strong> panel, as <a href="#cylinder_definitions">described above</a>. Enter the cylinders one by one,
+  the <strong>Info</strong> panel, as <a href="#cylinder_definitions">described above</a>. Enter the cylinders one by one,
   specifying the characteristics of the cylinder and the gas composition within each cylinder.
 </p>
 </li>
@@ -2410,7 +2410,7 @@ there are only two types of information that need to be provided:</p></div>
   in time on the <strong>Dive Profile</strong> panel and indicating the cylinder to which the change was made. After
   right-clicking, follow the context menu to "Add gas change" and select the appropriate cylinder from
   those defined during the first step, above (see image below). If the
-  <strong>tank bar</strong> button in the ttolbar has been activated, the cylinder switches are also indicated in the
+  <strong>tank bar</strong> button in the toolbar has been activated, the cylinder switches are also indicated in the
   tank bar.
 </p>
 </li>
@@ -2440,19 +2440,19 @@ steps:</p></div>
   cylinders with air or with the same gas mixture, <em>Subsurface</em> distinguishes among these different
   cylinders. In contrast, most dive computers that allow gas switching only distinguish among different
   <em>gases</em> used, not among different <em>cylinders</em> 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 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>

-<li>

-<p>

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

-  specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>Dive Info Panel</strong> (see

-  image below where two 12 litre cylinder were used).

-</p>

-</li>

+<li>
+<p>
+<strong>Within <em>Subsurface</em> describe the cylinders used during the dive</strong>. The diver needs to provide the
+  specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>Info Panel</strong> (see
+  image below where two 12 litre cylinder were used).
+</p>
+</li>
 <li>

 <p>

 <strong>Indicate cylinder change events on the <em>Subsurface</em> dive profile</strong>. Once the dive log has been imported

@@ -2461,19 +2461,19 @@ steps:</p></div>
   selecting <em>Add gas change</em>. A list of the appropriate cylinders is shown with the

   currently used cylinder greyed out. In the image below Tank 1 is greyed out, leaving only Tank 2

   to be selected. Select the appropriate cylinder. The cylinder change is then indicated on the dive

-  profile with a cylinder symbol. If the <strong>Tank Bar</strong> is activated using the toolbar to the left of the

-  profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all

-  the cylinder change events have been recorded on the dive profile, the correct cylinder pressures

-  for both cylinders are shown on the dive profile, as inthe image below.

-</p>

-</li>

-</ul></div>

+  profile with a cylinder symbol. If the <strong>Tank Bar</strong> is activated using the toolbar to the left of the
+  profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all
+  the cylinder change events have been recorded on the dive profile, the correct cylinder pressures
+  for both cylinders are shown on the dive profile, as in the image below.
+</p>
+</li>
+</ul></div>
 <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 give

+<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
 logging tool.</p></div>
 </div>
 <div class="sect3">
@@ -2501,7 +2501,7 @@ outlined above:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Dive Info</strong> panel.
+Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Info</strong> panel.
 </p>
 </li>
 <li>
@@ -2514,7 +2514,7 @@ pSCR diving often involves gas changes, requiring an additional cylinder.
 </li>
 </ul></div>
 <div class="paragraph"><p>If a pSCR <em>Dive Mode</em> has been selected, the dive ceiling for pSCR dives is
-adjusted for the oxygen drop accross the mouthpiece which often requires
+adjusted for the oxygen drop across the mouthpiece which often requires
 longer decompression periods. Below is a dive profile of a pSCR dive using
 EAN36 on the back cylinder and oxygen for decompression. Note that this dive
 lasted over two hours.</p></div>
@@ -2529,9 +2529,9 @@ lasted over two hours.</p></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
-<img src="images/APD.jpg" alt="Note" />

-</td>

-<td class="content">Closed system rebreathers use advanced technology to recirculate gas that

+<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

@@ -2655,13 +2655,13 @@ over a triangle, a description of that event is given as the bottom line in
 the <a href="#S_InfoBox">Information Box</a>.</p></div>

 <div class="paragraph"><p><em>Cylinder pressures</em>: Some CCR dive computers like the Poseidon MkVI record

 the pressures of the oxygen and diluent cylinders. The pressures of these

-two cylinders are shown as green lines overlapping the depth profile. In

-addition, start and end pressures for both oxygen and diluent cylinders are

-shown in the <em>Equipment Tab</em>.  Below is a dive profile for a CCR dive,

-including an overaly of setpoint and oxygen sensor data, as well as the

-cylinder pressure data. In this case there is good agreement from the

-readings of the two oxygen sensors.</p></div>

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

+two cylinders are shown as green lines overlapping the depth profile. In
+addition, start and end pressures for both oxygen and diluent cylinders are
+shown in the <em>Equipment Tab</em>.  Below is a dive profile for a CCR dive,
+including an overlay of setpoint and oxygen sensor data, as well as the
+cylinder pressure data. In this case there is good agreement from the
+readings of the two oxygen sensors.</p></div>
+<div class="imageblock" style="text-align:center;">
 <div class="content">

 <img src="images/CCR_dive_profile_f20.jpg" alt="FIGURE: CCR dive profile" />

 </div>

@@ -2678,18 +2678,18 @@ B</a>.</p></div>
 </div>

 </div>

 <div class="sect1">

-<h2 id="_obtaining_more_information_about_dives_entered_into_the_logbook">6. Obtaining more information about dives entered into the logbook</h2>

-<div class="sectionbody">

-<div class="sect2">

-<h3 id="_the_strong_dive_info_strong_tab_for_individual_dives">6.1. The <strong>Dive Info</strong> tab (for individual dives)</h3>

-<div class="paragraph"><p>The Dive Info tab gives some summary information about a particular dive

-that has been selected in the <strong>Dive List</strong>. Useful information here includes

-the surface interval before the dive, the maximum and mean depths of the

-dive, the gas volume consumed, the surface air consumption (SAC) and the

-number of oxygen toxicity units (OTU) incurred.</p></div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

+<h2 id="_obtaining_more_information_about_dives_entered_into_the_logbook">6. Obtaining more information about dives entered into the logbook</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_the_strong_info_strong_tab_for_individual_dives">6.1. The <strong>Info</strong> tab (for individual dives)</h3>
+<div class="paragraph"><p>The Info tab gives some summary information about a particular dive that has
+been selected in the <strong>Dive List</strong>. Useful information here includes the
+surface interval before the dive, the maximum and mean depths of the dive,
+the gas volume consumed, the surface air consumption (SAC) and the number of
+oxygen toxicity units (OTU) incurred.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
 <img src="images/icons/info.jpg" alt="Note" />

 </td>

 <td class="content">Gas consumption and SAC calculations: <em>Subsurface</em> calculates SAC and Gas

@@ -2778,9 +2778,9 @@ cellspacing="0" cellpadding="4">
 <td align="left" valign="top"><p class="table">Vert foncé</p></td>

 <td align="left" valign="top"><p class="table">&lt; 1.5</p></td>

 <td align="left" valign="top"><p class="table">&lt; 1.5</p></td>

-</tr>

-</tbody>

-</table>

+</tr>
+</tbody>
+</table>
 </div>
 <div class="paragraph"><p>The profile also includes depth readings for the peaks and troughs in the
 graph.  Thus, users should see the depth of the deepest point and other
@@ -2789,9 +2789,9 @@ to a particular moment during the dive.</p></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
-<img src="images/icons/scale.jpg" alt="Note" />

-</td>

-<td class="content">In some cases the dive profile does not fill the whole area of the <strong>Dive

+<img src="images/icons/scale.jpg" alt="Note" />
+</td>
+<td class="content">In some cases the dive profile does not fill the whole area of the <strong>Dive
 Profile</strong> panel. Clicking the <strong>Scale</strong> button in the toolbar on the left of

 the dive profile frequently increases the size of the dive profile to fill

 the area of the panel efficiently.</td>

@@ -3128,17 +3128,17 @@ SAC is litres/min or cub ft/min.</td>
 dives as well as the <strong>Equivalent Narcotic Depth (END)</strong> for trimix

 dives. These are numbers of importance to divers who use breathing gases

 other than air. Their values are dependent on the composition of the

-breathing gas.  The EAD is the depth of a hypothetical air dive that has the

-same partial pressure of nitrogen as the current depth of the nitrox dive at

-hand. A nitrox dive leads to the same decompression obligation as an air

-dive to the depth equalling the EAD. The END is the depth of a hypothetical

-air dive that has the same sum of partial pressures of the narcotic gases

-nitrogen and oxygen as the current trimix dive. A trimix diver can expect

-the same narcotic effect as a diver breathing air diving at a depth

-equalling the END.</td>

-</tr></table>

-</div>

-<div class="paragraph"><p>Figure (<strong>B</strong>) above shows an information box with a nearly complete set of

+breathing gas.  The EAD is the depth of a hypothetical air dive that has the
+same partial pressure of nitrogen as the current depth of the nitrox dive at
+hand. A nitrox dive leads to the same decompression obligation as an air
+dive to the depth equaling the EAD. The END is the depth of a hypothetical
+air dive that has the same sum of partial pressures of the narcotic gases
+nitrogen and oxygen as the current trimix dive. A trimix diver can expect
+the same narcotic effect as a diver breathing air diving at a depth equaling
+the END.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>Figure (<strong>B</strong>) above shows an information box with a nearly complete set of
 data.</p></div>

 <div class="sect3">

 <h4 id="S_gas_pressure_graph">6.6.1. The Gas Pressure Bar Graph</h4>

@@ -3321,20 +3321,20 @@ having to scan a long lists of dives. In order to group the dives in a dive
 list, (from the Main Menu) users must select <em>Log &#8594; Autogroup</em>. The <strong>Dive

 List</strong> panel 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>Dive

-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 select <strong>Save</strong> from the buttons at the top right of the <strong>Trip Notes</strong>

-tab. The trip title in the <strong>Dive List</strong> panel should now reflect some of the

-edited information.</p></div>

-</div>

-<div class="sect3">

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

+<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
+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
+select <strong>Save</strong> from the buttons at the top right of the <strong>Trip Notes</strong> tab. The
+trip title in the <strong>Dive List</strong> panel should now reflect some of the edited
+information.</p></div>
+</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

@@ -3409,15 +3409,15 @@ should be forwards or backwards.</p></div>
 <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>Dive 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" />

+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>

 </div>

 </div>

@@ -3493,16 +3493,16 @@ connexion <em>Facebook</em>.</p></div>
 <div class="imageblock" style="text-align:center;">

 <div class="content">

 <img src="images/facebook1_f20.jpg" alt="Figure: Facebook login" />

-</div>

-</div>

-<div class="paragraph"><p>Having established a login to <em>Facebook</em>, transfer of a dive profile to

-one&#8217;s <em>Facebook</em> timeline is easy.  A <em>Facebook</em> icon appears in the <strong>Dive

-Notes</strong> panel of <em>Subsurface</em> (See image <strong>A</strong> below). Ensure that the dive

-that you want to transfer to the timeline is depicted in the <em>Subsurface</em>

-<strong>Dive Profile</strong> panel. Select the <em>Facebook</em> icon, and a dialogue is shown,

-determining the amount of additional information transferred with the dive

-profile (see image <strong>B</strong>, below). In order to transfer a dive profile to

-<em>Facebook</em>, the name of a <em>Facebook</em> album needs to be provided. The

+</div>
+</div>
+<div class="paragraph"><p>Having established a login to <em>Facebook</em>, transfer of a dive profile to
+one&#8217;s <em>Facebook</em> timeline is easy.  A <em>Facebook</em> icon appears in the <strong>Notes</strong>
+panel of <em>Subsurface</em> (See image <strong>A</strong> below). Ensure that the dive that you
+want to transfer to the timeline is depicted in the <em>Subsurface</em> <strong>Dive
+Profile</strong> panel. Select the <em>Facebook</em> icon, and a dialogue is shown,
+determining the amount of additional information transferred with the dive
+profile (see image <strong>B</strong>, below). In order to transfer a dive profile to
+<em>Facebook</em>, the name of a <em>Facebook</em> album needs to be provided. The
 checkboxes on the lefthand side allow one to determine how much additional

 information should be transferred with the dive profile. This information is

 shown in the text box on the right hand side of the panel (see image <strong>B</strong>,

@@ -3558,13 +3558,13 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo
   <em>Divelogs.de</em>. Log into <em>http://en.divelogs.de</em> and subscribe to this

   service in order to upload dive log data from <em>Subsurface</em>.

 </p>

-</li>

-<li>

-<p>

-<em>DiveShare</em> is also a dive log repostory on the Internet focusing on the

-  recreational dives. In order to upload dives one has to provide a used ID,

-  so registration with <em>http://scubadiveshare.com</em> is required.

-</p>

+</li>
+<li>
+<p>
+<em>DiveShare</em> is also a dive log repository on the Internet focusing on the
+  recreational dives. In order to upload dives one has to provide a used ID,
+  so registration with <em>http://scubadiveshare.com</em> is required.
+</p>
 </li>

 <li>

 <p>

@@ -3895,13 +3895,13 @@ leave the settings panel by selecting <strong>OK</strong>.</p></div>
      the dive list.

 </p>

 </li>

-<li>

-<p>

-<strong>Default cylinder</strong>: Here users can specify the default cylinder listed in

-     the <strong>Equipment</strong> tab of the <strong>Dive Notes</strong> panel.

-</p>

-</li>

-<li>

+<li>
+<p>
+<strong>Default cylinder</strong>: Here users can specify the default cylinder listed in
+     the <strong>Equipment</strong> tab of the <strong>Notes</strong> panel.
+</p>
+</li>
+<li>
 <p>

 <strong>Animations</strong>: Some actions in showing the dive profile are performed using

      animations. For instance, the axis values for depth and time change from dive to

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

 </li>

 <li>

-<p>

-<em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. Conversely, if this box is not checked, and any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.

-</p>

+<p>
+<em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. Conversely, if this box is not checked, and any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.
+</p>
 </li>
 <li>
 <p>
@@ -3980,9 +3980,9 @@ the dive profile:
 </p>
 <div class="ulist"><ul>
 <li>
-<p>

-<strong>Misc</strong>:

-</p>

+<p>
+<strong>Misc</strong>:
+</p>
 </li>

 </ul></div>

 </li>

@@ -4175,13 +4175,13 @@ A user who is not absolutely sure about any of the above requirements should
 <div class="sect2">

 <h3 id="_the_em_subsurface_em_dive_planner_screen">13.1. The <em>Subsurface</em> dive planner screen</h3>

 <div class="paragraph"><p>Like the <em>Subsurface</em> dive log, the planner screen is divided into several

-sections (see image below). The <strong>setup</strong> parameters for a dive are entered

-into the several sections on the left hand side of the screen.  The setup is

-divided into several sections: Available Gases, Rates, Planning, Gas Options

-and Dive Notes.</p></div>

-<div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> upon which the profile of

-the dive can be manipulated directly by dragging and clicking as explained

-below. This feature makes the <em>Subsurface</em> dive planner unique in ease of

+sections (see image below). The <strong>setup</strong> parameters for a dive are entered
+into the several sections on the left hand side of the screen.  The setup is
+divided into several sections: Available Gases, Rates, Planning, Gas Options
+and Notes.</p></div>
+<div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> upon which the profile of
+the dive can be manipulated directly by dragging and clicking as explained
+below. This feature makes the <em>Subsurface</em> dive planner unique in ease of
 use.</p></div>

 <div class="paragraph"><p>At the bottom right is a text panel with a heading of <em>Dive Plan

 Details</em>. This is where the details of the dive plan are provided in a way

@@ -4227,21 +4227,20 @@ In the top left-hand area of the planning screen, ensure that the constant
   atmospheric pressure can also be entered as an altitude in metres, assuming

   an atmospheric pressure of 1.013 bar.

 </p>

-</li>

-<li>

-<p>

-In the table labelled <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>

-</li>

-<li>

+</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
+  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>
+</li>
+<li>
 <p>

 The dialogue indicating <em>Dive Planner Points</em> is usually not used at this

   stage of the dive planning.

@@ -4323,13 +4322,13 @@ BLUE to RED.</p></div>
 table on the left of the dive planner panel. Ensure that the <em>Used Gas</em>

 value in each row of that table corresponds to one of the gas mixtures

 specified in the <em>Available Gases</em> table.  Add new waypoints until the main

-features of the dive have been completed, e.g. the bottom time segment and

-deep stops (if these are implemented). Leave the remaining waypoints on the

-ascent to <em>Subsurface</em>. In most cases <em>Subsurface</em> computes additional way

-points in order to fulfil decompression requirements for that dive. A

-waypoint can be moved by selecting that waypoint and by using the arrow

-keys.  The waypoints listed in the <em>Dive Planner Points</em> dialogue can be

-edited by hand in order to obtain a precise presentation of the dive

+features of the dive have been completed, e.g. the bottom time segment and
+deep stops (if these are implemented). Leave the remaining waypoints on the
+ascent to <em>Subsurface</em>. In most cases <em>Subsurface</em> computes additional way
+points in order to fulfill decompression requirements for that dive. A
+waypoint can be moved by selecting that waypoint and by using the arrow
+keys.  The waypoints listed in the <em>Dive Planner Points</em> dialogue can be
+edited by hand in order to obtain a precise presentation of the dive
 plan. In fact, one can create the whole dive profile by editing the <em>Dive

 Planner Points</em> dialog.</p></div>

 <div class="paragraph"><p>Indicate any changes in gas cylinder used by indicating gas changes as

@@ -4357,13 +4356,13 @@ using EAN50 and using the settings as described above.</p></div>
 <div class="paragraph"><p>Once the above has been completed, one can save it by clicking the <em>Save</em>

 button towards the top middle of the planner. The saved dive plan will

 appear in the <strong>Dive List</strong> panel of <em>Subsurface</em>.</p></div>

-<div class="paragraph"><p><strong>The dive plan details</strong></p></div>

-<div class="paragraph"><p>On the bottom right of the dive planner, under <em>Dive Plan Details</em>, the

-exact details of the dive plan are provided. These details may be modified

-by checking any of the options under the <em>Dive Notes</em> section of the dive

-planner, immediately to the left of the <em>Dive Plan Details</em>. If a <em>Verbatim

-diveplan</em> is requested, a detailed sentence-level explanation of the dive

-plan is given. If any of the management specifications have been exceeded

+<div class="paragraph"><p><strong>The dive plan details</strong></p></div>
+<div class="paragraph"><p>On the bottom right of the dive planner, under <em>Dive Plan Details</em>, the
+exact details of the dive plan are provided. These details may be modified
+by checking any of the options under the <em>Notes</em> section of the dive
+planner, immediately to the left of the <em>Dive Plan Details</em>. If a <em>Verbatim
+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

@@ -4400,19 +4399,19 @@ is not calculated, so gas consumptions of 0 litres are the norm.</p></div>
 <div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than

 <em>Open circuit</em> in the dropdown list.

 The parameters of the pSCR diver can be set by selecting  <em>File &#8594;   Preferences &#8594;   Graph</em>

-from the main menu, where the gas consumption calculation takes into account the pSCR dump

-ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop

-accross the mouthpiece of the rebreather into account. If the

-pO<sub>2</sub> drops below what is considered a save value, a warning apears in the <em>Dive plan

-details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out

-cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables

-are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints

-are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable

-to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen

-in the loop due to the oxygen drop accross the mouthpiece of the pSCR equipment.</p></div>

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

-<div class="content">

-<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" />

+from the main menu, where the gas consumption calculation takes into account the pSCR dump
+ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
+accross the mouthpiece of the rebreather into account. If the
+pO<sub>2</sub> drops below what is considered a save value, a warning appears in the <em>Dive plan
+details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out
+cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables
+are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints
+are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable
+to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen
+in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" />
 </div>

 </div>

 </div>

@@ -4451,14 +4450,14 @@ into account the configuration in the highlighted dive.</p></div>
 <h3 id="_printing_the_dive_plan">13.7. Printing the dive plan</h3>

 <div class="paragraph"><p>Selecting the <em>Print</em> button in the planner allows printing of the <em>Dive

 Plan Details</em> for wet notes. Alternatively one can cut and paste the <em>Dive

-Plan Details</em> for inclusion in a text file or word processing document.</p></div>

-<div class="paragraph"><p>Dive plans have many characteristics in common with dive logs (dive profile,

-dive notes, etc).  After a dive plan has been saved, the dive details and

-gas calculations are saved in the <strong>Dive Notes</strong> tab. While a dive plan is

-being designed, it can be printed using the <em>Print</em> button in the dive

-planner. This prints the dive details and gas calculations in the <em>Dive Plan

-Details</em> panel of the dive planner. However, after the plan has been saved,

-it is represented in a way very similar to a dive log and the gas

+Plan Details</em> for inclusion in a text file or word processing document.</p></div>
+<div class="paragraph"><p>Dive plans have many characteristics in common with dive logs (dive profile,
+dive notes, etc).  After a dive plan has been saved, the dive details and
+gas calculations are saved in the <strong>Notes</strong> tab. While a dive plan is being
+designed, it can be printed using the <em>Print</em> button in the dive
+planner. This prints the dive details and gas calculations in the <em>Dive Plan
+Details</em> panel of the dive planner. However, after the plan has been saved,
+it is represented in a way very similar to a dive log and the gas
 calculations cannot be accessed in the same way as during the planning

 process. The only way to print the dive plan is to use the <em>File &#8594; Print</em>

 facility on the main menu in the same way as for dive logs or by copy and

@@ -4646,14 +4645,13 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <a href="#S_ViewPanels"><em>Profil</em></a> - Affiche uniquement le panneau du <strong>profil de la

   plongée</strong>.

 </p>

-</li>

-<li>

-<p>

-<a href="#S_ViewPanels"><em>Info</em></a> - Affiche uniquement le panneau des <strong>notes de

-  plongée</strong>.

-</p>

-</li>

-<li>

+</li>
+<li>
+<p>
+<a href="#S_ViewPanels"><em>Info</em></a> - Affiche uniquement le panneau des <strong>notes</strong>.
+</p>
+</li>
+<li>
 <p>

 <a href="#S_ViewPanels"><em>Globe</em></a> - Affiche uniquement le panneau de la <strong>carte

   mondiale</strong>.

@@ -4694,9 +4692,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <li>

 <p>

 <em>Vérifier les mises à jour</em>  - Vérifier si une nouvelle version de

-  Subsurface est disponible sur le <a href="http://subsurface-divelog.org/">site web de

-  <em>Subsurface</em> </a>.

-</p>

+  Subsurface est disponible sur le <a href="http://subsurface-divelog.org/">site web de
+  <em>Subsurface</em> </a>.
+</p>
 </li>
 <li>
 <p>
@@ -4705,12 +4703,12 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 </p>
 </li>
 <li>
-<p>

-<em>Manuel utilisateur</em>  - Ouvre une fenêtre affichant ce manuel utilisateur.

-</p>

-</li>

-</ul></div>

-</div>

+<p>
+<em>Manuel utilisateur</em>  - Ouvre une fenêtre affichant ce manuel utilisateur.
+</p>
+</li>
+</ul></div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -4770,9 +4768,9 @@ nom de votre périphérique ;</td>
 </tr></table>
 </div>
 <div class="paragraph"><div class="title">Sur Windows :</div><p>Essayez simplement COM1, COM2, etc. La liste déroulante devrait contenir
-tous les périphériques COM connectés.</p></div>

-<div class="paragraph"><div class="title">Sur MacOS :</div><p>La liste déroulante devrait contenir tous les ordinateurs de plongée

-connectés.</p></div>

+tous les périphériques COM connectés.</p></div>
+<div class="paragraph"><div class="title">Sur MacOS :</div><p>La liste déroulante devrait contenir tous les ordinateurs de plongée
+connectés.</p></div>
 <div class="paragraph"><div class="title">Sur Linux :</div><p>Il existe un moyen sûr de trouver le port :</p></div>

 <div class="ulist"><ul>

 <li>

@@ -4818,9 +4816,9 @@ usb 2-1.1: Endpoint 2 MaxPacketSize 64
 usb 2-1.1: Setting MaxPacketSize 64

 usb 2-1.1: FTDI USB Serial Device converter now attached to ttyUSB3

 usbcore: registered new interface driver ftdi_sio

-ftdi_sio: v1.6.0:USB FTDI Serial Converters Driver</code></pre>

-</div></div>

-<div class="paragraph"><p>La troisième ligne en partant du bas montre que l&#8217;adaptateur FTDI USB est

+ftdi_sio: v1.6.0:USB FTDI Serial Converters Driver</code></pre>
+</div></div>
+<div class="paragraph"><p>La troisième ligne en partant du bas montre que l&#8217;adaptateur FTDI USB est
 détecté et connecté sur <code>ttyUSB3</code>. Cette information peut à présent être
 utilisée pour les paramètres d&#8217;importation en tant que <code>/dev/ttyUSB3</code> pour
 que Subsurface utilise le bon port USB.</p></div>
@@ -4845,9 +4843,9 @@ vous devriez pouvoir importer vos plongées.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_HowFindBluetoothDeviceName">15.3. Setting up bluetooth enabled devices</h3>
-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
 <img src="images/icons/bluetooth.jpg" alt="Note" />

 </td>

 <td class="content">For dive computers communicating through bluetooth like the Heinrichs

@@ -5176,13 +5174,13 @@ In the dropdown list towards the bottom right of the dialogue, select "<em>CSV
 On the list of file names select the .CSV file that has been created

   above. An import dialogue opens.

 </p>

-</li>

-<li>

-<p>

-In the dropdown list on the middle right labeled '<em>Pre-configured imports</em>",

-  select <em>APD Log Viewer</em>.

-</p>

-</li>

+</li>
+<li>
+<p>
+In the dropdown list on the top left labeled '<em>Pre-configured imports</em>",
+  select <em>APD Log Viewer</em>.
+</p>
+</li>
 <li>

 <p>

 Ensure the other settings for the ADP dive log are appropriate, then select

@@ -5390,17 +5388,17 @@ The dives are now exported to the file DM4.bak (or DM5.bak)
 </div>

 <div class="sect2">

 <h3 id="_exporting_from_atomic_logbook">17.2. Exporting from Atomic Logbook</h3>

-<div class="admonitionblock" id="Atomic_Export">

-<table><tr>

-<td class="icon">

-<img src="./images/icons/note.png" alt="Note" />

-</td>

-<td class="content">Atomic Logbook is a Windows software by Atomic Aquatics. It allows

-downloading of dive information from Cobalt and Cobalt 2 dive computers.

-The divelog is kept in a SQlite database at

-C:\ProgramData\AtomicsAquatics\Cobalt-Logbook\Cobalt.db. This file can be

-directly imported to Subsurface.</td>

-</tr></table>

+<div class="admonitionblock" id="Atomic_Export">
+<table><tr>
+<td class="icon">
+<img src="images/icons/atomiclogo.jpg" alt="Note" />
+</td>
+<td class="content">Atomic Logbook is a Windows software by Atomic Aquatics. It allows
+downloading of dive information from Cobalt and Cobalt 2 dive computers.
+The divelog is kept in a SQLite database at
+C:\ProgramData\AtomicsAquatics\Cobalt-Logbook\Cobalt.db. This file can be
+directly imported to Subsurface.</td>
+</tr></table>
 </div>

 </div>

 <div class="sect2">

@@ -5506,13 +5504,13 @@ Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy
 <p>

 Duration: the format should be minutes:seconds.

 </p>

-</li>

-<li>

-<p>

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

-   imperial and metric units)

-</p>

-</li>

+</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.

@@ -5680,14 +5678,14 @@ 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>

-</div>

-</div>

-</div>

+</div>
+</div>
+</div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-02-06 14:30:55 CET
+Last updated 2015-02-15 14:28:51 CET
 </div>
 </div>
 </body>
-</html>

+</html>
diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt
index f21d7928a..6fbcdabc3 100644
--- a/Documentation/user-manual_fr.txt
+++ b/Documentation/user-manual_fr.txt
@@ -108,10 +108,10 @@ La *carte de plongée* en bas à droite, affiche les sites de plongées de
 l'utilisateur, sur une carte mondiale et centrée sur le site de la dernière
 plongée sélectionnée dans la *liste des plongées*.
 
-Les *informations de plongée* en haut à gauche, fournissent des informations
-détaillées sur la plongée sélectionnée dans la *liste des plongées*, dont
-des statistiques pour la plongée sélectionnée ou pour toutes les plongées
-mises en surbrillance.
+Les *informations* en haut à gauche, fournissent des informations détaillées
+sur la plongée sélectionnée dans la *liste des plongées*, dont des
+statistiques pour la plongée sélectionnée ou pour toutes les plongées mises
+en surbrillance.
 
 Le *profil de plongée* en haut à droite, affiche un profil de plongée
 graphique de la plongée sélectionnée dans la *liste des plongées*.
@@ -127,9 +127,9 @@ sélectionnée_ sont affichées dans les panneaux respectifs. D'autre part, si
 plus d'une plongée est mise en surbrillance seule 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 de plongée* (profondeur maximale, minimale et moyenne,
-les durées, les températures de l'eau et le SAC (air consommé); temps total
-et nombre de plongées sélectionnées).
+panneau *informations* (profondeur maximale, minimale et moyenne, les
+durées, les températures de l'eau et le SAC (air consommé); temps total et
+nombre de plongées sélectionnées).
 
 [[S_ViewPanels]]
 
@@ -218,17 +218,17 @@ guide, and some remarks about the dive. _Subsurface_ can store much more
 information than this for each dive. In order to add a dive to a dive log,
 select _Log -> Add Dive_ from the Main Menu. The program then shows three
 panels to enter information for a dive: two tabs in the *Info* panel
-(*Notes* and *Equipment*), as well as the *Dive Profile* panel that
-displays a graphical profile of each dive. These panels are respectively
-marked [red]#A#, [red]#B# and [red]#C# in the figure below. Each of these
-tabs will now be explained for data entry.
+(*Notes* and *Equipment*), as well as the *Dive Profile* panel that displays
+a graphical profile of each dive. These panels are respectively marked
+[red]#A#, [red]#B# and [red]#C# in the figure below. Each of these tabs will
+now be explained for data entry.
 
 image::images/AddDive1_f20.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 panels under Notes and Equipment when in *Editing Mode*.
+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
+panels under Notes and Equipment when in *Editing Mode*.
 
 image::images/BlueEditBar_f20.jpg["Blue edit bar", align="center"]
 
@@ -240,12 +240,12 @@ specific dive is saved in memory. When one closes Subsurface, the program
 will ask again, this time whether the complete dive log should be saved on
 disk or not.
 
-==== Notes de plongée
+==== Notes
 
 This panel contains the date, time and place information for a particular
 dive, environmental conditions, co-divers and buddies, as well as some
-descriptive information. If one clicks on the *Notes* tab, the
-following fields are visible:
+descriptive information. If one clicks on the *Notes* tab, the following
+fields are visible:
 
 image::images/AddDive2_f20.jpg["FIGURE: The Notes tab", align="center"]
 
@@ -471,13 +471,13 @@ image::images/DiveProfile4_f20.jpg["FIGURE: Completed dive profile", align="cent
 
 ==== Saving the hand-entered dive information
 
-The information entered in the *Notes* tab, the *Equipment* tab as well
-as the *Dive Profile* can now be saved in the user's logbook by using the
-two buttons on the top right hand of the Notes tab. If the _Save_
-button is clicked, the dive data are saved in the current logbook. If the
-_Cancel_ button is clicked, the newly entered dive data are discarded. When
-exiting _Subsurface_, the user will be prompted once more to save the
-logbook with the new dive(s).
+The information entered in the *Notes* tab, the *Equipment* tab as well as
+the *Dive Profile* can now be saved in the user's logbook by using the two
+buttons on the top right hand of the Notes tab. If the _Save_ button is
+clicked, the dive data are saved in the current logbook. If the _Cancel_
+button is clicked, the newly entered dive data are discarded. When exiting
+_Subsurface_, the user will be prompted once more to save the logbook with
+the new dive(s).
 
 [[S_ImportDiveComputer]]
 === Importing new dive information from a Dive Computer
@@ -538,7 +538,7 @@ 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,
 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 labelled _Force
+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
@@ -690,10 +690,10 @@ device instead of the model name, allowing easy identification of devices.
 
 With the uploaded dives in the *Dive List*, the information from the dive
 computer is not complete and more details must be added in order to have a
-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.
+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.
 
-==== Notes de plongée
+==== Notes
 
 The date and time of the dive, gas mixture and (often) water temperature are
 usually shown as obtained from the dive computer, but the user needs to add
@@ -701,8 +701,8 @@ additional information by hand in order to have a more complete dive
 record. In a few cases, (e.g. APD rebreathers) one also has to provide the
 date and time of the dive.  If the contents of this tab is changed or edited
 in any way, the message in a blue box at the top of the panel indicates that
-the dive is being edited. If one clicks on the *Notes* tab, the
-following fields are visible:
+the dive is being edited. If one clicks on the *Notes* tab, the following
+fields are visible:
 
 image::images/AddDive3_f20.jpg["FIGURE: The Notes tab", align="center"]
 
@@ -888,17 +888,17 @@ image::images/WeightsDataEntry3_f20.jpg["FIGURE: A completed weights information
 
 _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
-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 fields in the *Notes* and *Equipment* tabs.  For instance, it is
-possible that a diver performed several dives during a single day, using
-identical equipment while diving at the same dive site or with the same dive
-master and/or buddy or tags. Instead of completing the information for each
-of these dives separately, one can select all the dives for that day in the
-*Dive List* and insert the same information in the *Notes* and
-*Equipment* fields that need identical information. This is achieved by
-editing the dive notes or the equipment for any one of the selected dives.
+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
+fields in the *Notes* and *Equipment* tabs.  For instance, it is possible
+that a diver performed several dives during a single day, using identical
+equipment while diving at the same dive site or with the same dive master
+and/or buddy or tags. Instead of completing the information for each of
+these dives separately, one can select all the dives for that day in the
+*Dive List* and insert the same information in the *Notes* and *Equipment*
+fields that need identical information. This is achieved by editing the dive
+notes or the equipment for any one of the selected dives.
 
 The simultaneous editing only works with fields that do not already contain
 information.  This means that, if some fields have been edited for a
@@ -916,12 +916,12 @@ _METHOD 2_:There is a different way of achieving the same goal. Select a
 dive with all the appropriate information typed into the *Notes* and
 *Equipment* tabs. Then, from the main menu, select _Log -> Copy dive
 components_.  A box is presented with a selection of check boxes for most of
-the fields in the *Notes* and *Equipment* tabs.  Select the fields to
-be copied from the currently selected dive, then select _OK_. Now, in the
-*Dive List*, select the dives into which this information is to be
-pasted. Then, from the main menu, select _Log -> Paste dive components_.
-All the selected dives now contain the data initially selected in the
-original source dive log.
+the fields in the *Notes* and *Equipment* tabs.  Select the fields to be
+copied from the currently selected dive, then select _OK_. Now, in the *Dive
+List*, select the dives into which this information is to be pasted. Then,
+from the main menu, select _Log -> Paste dive components_.  All the selected
+dives now contain the data initially selected in the original source dive
+log.
 
 ==== Adding Bookmarks to a dive
 
@@ -948,13 +948,13 @@ image::images/Bookmarks.jpg["FIGURE: Bookmark dialog", align="center"]
 
 ==== Saving the updated dive information
 
-The information entered in the *Notes* tab and the *Equipment* tab can
-be saved by using the two buttons on the top right hand of the *Notes*
-tab. If the _Save_ button is clicked, the dive data are saved. If the
-_Cancel_ button is clicked, then the newly entered dive data are deleted,
-although the dive profile obtained from the dive computer will be
-retained. When the user exits _Subsurface_ there is a final prompt to
-confirm that the new data should be saved.
+The information entered in the *Notes* tab and the *Equipment* tab can be
+saved by using the two buttons on the top right hand of the *Notes* tab. If
+the _Save_ button is clicked, the dive data are saved. If the _Cancel_
+button is clicked, then the newly entered dive data are deleted, although
+the dive profile obtained from the dive computer will be retained. When the
+user exits _Subsurface_ there is a final prompt to confirm that the new data
+should be saved.
 
 === Importing dive information from other digital data sources or other data formats
 
@@ -1135,12 +1135,12 @@ table contains the column headings found in the _CSV_ data file. The blue
 row of cells immediately above these contains the names understood by
 _Subsurface_. The white area below the dropdown lists contains all the field
 names that _Subsurface_ recognises. These names are in blue balloons and can
-be moved using a drag-and-frop action. For instance, _Subsurface_ expects
+be moved using a drag-and-drop action. For instance, _Subsurface_ expects
 the column heading for Dive number (" # ") to be "Dive # ". If the column
 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 labelled "Dive # " and drop it
+column for "Dive #", drag the ballooned item labeled "Dive # " and drop it
 in the blue cell immediately above the white cell containing " # ". This is
 depicted in the image below.
 
@@ -1159,8 +1159,8 @@ in the *Dive List* panel.
 [IMPORTANT]
 
 _CSV_ is an abbreviation for a data file format: _Comma-Separated
-Variables_. It is a file format allowing someone to view or edit the
-information using a text editor such as Notebook (Windows), gedit (Linux) or
+Values_. It is a file format allowing someone to view or edit the
+information using a text editor such as Notepad (Windows), gedit (Linux) or
 TextWrangler (OS/X). The two main advantages of the _CSV_ format is that the
 data are easily editable as text without any proprietary software and
 ensuring all information is human-readable, not being obscured by any custom
@@ -1625,9 +1625,9 @@ image::images/LoadImage6_f20.jpg["FIGURE: Full-screen photo on dive profile", al
 ==== The _Photos_ tab
 
 Photographs associated with a dive are shown as thumbnails in the _Photos_
-tab of the _Notes_ panel. Photos taken in rapid succession during a
-dive (therefore sometimes with large overlap on the dive profile) can easily
-be accessed in the _Photos_ tab. This tab serves as a tool for individually
+tab of the _Notes_ panel. Photos taken in rapid succession during a dive
+(therefore sometimes with large overlap on the dive profile) can easily be
+accessed in the _Photos_ tab. This tab serves as a tool for individually
 accessing the photos of a dive, while the stubs on the dive profile give an
 indication of when during a dive a photo was taken. By single-clicking on a
 thumbnail in the _Photos_ panel, a photo is selected. By double-clicking a
@@ -1680,7 +1680,7 @@ there are only two types of information that need to be provided:
   in time on the *Dive Profile* panel and indicating the cylinder to which the change was made. After
   right-clicking, follow the context menu to "Add gas change" and select the appropriate cylinder from
   those defined during the first step, above (see image below). If the
-  *tank bar* button in the ttolbar has been activated, the cylinder switches are also indicated in the
+  *tank bar* button in the toolbar has been activated, the cylinder switches are also indicated in the
   tank bar.
 
 Having performed these tasks, _Subsurface_ indicates the appropriate use of
@@ -1719,11 +1719,11 @@ steps:
   profile with a cylinder symbol. If the *Tank Bar* is activated using the toolbar to the left of the
   profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all
   the cylinder change events have been recorded on the dive profile, the correct cylinder pressures
-  for both cylinders are shown on the dive profile, as inthe image below.
+  for both cylinders are shown on the dive profile, as in the image below.
 
 image::images/sidemount1.jpg["FIGURE: Sidemount profile", align="center"]
 
-This section gives an example of the versatility of _Subsurface_ as a give
+This section gives an example of the versatility of _Subsurface_ as a dive
 logging tool.
 
 
@@ -1755,7 +1755,7 @@ outlined above:
   xref:S_MulticylinderDives[multicylinder dives].
 
 If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is
-adjusted for the oxygen drop accross the mouthpiece which often requires
+adjusted for the oxygen drop across the mouthpiece which often requires
 longer decompression periods. Below is a dive profile of a pSCR dive using
 EAN36 on the back cylinder and oxygen for decompression. Note that this dive
 lasted over two hours.
@@ -1870,7 +1870,7 @@ the pressures of the oxygen and diluent cylinders. The pressures of these
 two cylinders are shown as green lines overlapping the depth profile. In
 addition, start and end pressures for both oxygen and diluent cylinders are
 shown in the _Equipment Tab_.  Below is a dive profile for a CCR dive,
-including an overaly of setpoint and oxygen sensor data, as well as the
+including an overlay of setpoint and oxygen sensor data, as well as the
 cylinder pressure data. In this case there is good agreement from the
 readings of the two oxygen sensors.
 
@@ -1888,11 +1888,11 @@ B].
 
 === The *Info* tab (for individual dives)
 
-The Info tab gives some summary information about a particular dive
-that has been selected in the *Dive List*. Useful information here includes
-the surface interval before the dive, the maximum and mean depths of the
-dive, the gas volume consumed, the surface air consumption (SAC) and the
-number of oxygen toxicity units (OTU) incurred.
+The Info tab gives some summary information about a particular dive that has
+been selected in the *Dive List*. Useful information here includes the
+surface interval before the dive, the maximum and mean depths of the dive,
+the gas volume consumed, the surface air consumption (SAC) and the number of
+oxygen toxicity units (OTU) incurred.
 
 [icon="images/icons/info.jpg"]
 [NOTE]
@@ -2220,11 +2220,11 @@ other than air. Their values are dependent on the composition of the
 breathing gas.  The EAD is the depth of a hypothetical air dive that has the
 same partial pressure of nitrogen as the current depth of the nitrox dive at
 hand. A nitrox dive leads to the same decompression obligation as an air
-dive to the depth equalling the EAD. The END is the depth of a hypothetical
+dive to the depth equaling the EAD. The END is the depth of a hypothetical
 air dive that has the same sum of partial pressures of the narcotic gases
 nitrogen and oxygen as the current trimix dive. A trimix diver can expect
-the same narcotic effect as a diver breathing air diving at a depth
-equalling the END.
+the same narcotic effect as a diver breathing air diving at a depth equaling
+the END.
 
 Figure (*B*) above shows an information box with a nearly complete set of
 data.
@@ -2372,14 +2372,14 @@ List* panel now shows only the titles for the trips.
 
 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 *Dive List*. This shows a *Trip Notes* tab in the *Dive
-Notes* 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 select *Save* from the buttons at the top right of the *Trip Notes*
-tab. The trip title in the *Dive List* panel should now reflect some of the
-edited information.
+title from the *Dive List*. This shows a *Trip Notes* tab in the *Notes*
+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
+select *Save* from the buttons at the top right of the *Trip Notes* tab. The
+trip title in the *Dive List* panel should now reflect some of the edited
+information.
 
 ==== Viewing the dives during a particular trip
 
@@ -2456,9 +2456,9 @@ the dive computer and appearing as different dives in the *Dive List*
 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 *Merge selected dives*. It may be necessary to edit the dive
-information in the *Notes* 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:
+information in the *Notes* 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:
 
 image::images/MergedDive.png["Example: Merged dive", align="center"]
 
@@ -2527,10 +2527,10 @@ connexion _Facebook_.
 image::images/facebook1_f20.jpg["Figure: Facebook login", align="center"]
 
 Having established a login to _Facebook_, transfer of a dive profile to
-one's _Facebook_ timeline is easy.  A _Facebook_ icon appears in the *Dive
-Notes* panel of _Subsurface_ (See image *A* below). Ensure that the dive
-that you want to transfer to the timeline is depicted in the _Subsurface_
-*Dive Profile* panel. Select the _Facebook_ icon, and a dialogue is shown,
+one's _Facebook_ timeline is easy.  A _Facebook_ icon appears in the *Notes*
+panel of _Subsurface_ (See image *A* below). Ensure that the dive that you
+want to transfer to the timeline is depicted in the _Subsurface_ *Dive
+Profile* panel. Select the _Facebook_ icon, and a dialogue is shown,
 determining the amount of additional information transferred with the dive
 profile (see image *B*, below). In order to transfer a dive profile to
 _Facebook_, the name of a _Facebook_ album needs to be provided. The
@@ -2578,7 +2578,7 @@ A dive log or part of it can be saved in three formats:
   _Divelogs.de_. Log into _http://en.divelogs.de_ and subscribe to this
   service in order to upload dive log data from _Subsurface_.
 
-* _DiveShare_ is also a dive log repostory on the Internet focusing on the
+* _DiveShare_ is also a dive log repository on the Internet focusing on the
   recreational dives. In order to upload dives one has to provide a used ID,
   so registration with _http://scubadiveshare.com_ is required.
 
@@ -3012,16 +3012,15 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig
   atmospheric pressure can also be entered as an altitude in metres, assuming
   an atmospheric pressure of 1.013 bar.
 
-- In the table labelled _Available Gases_, 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 <<S_CylinderData,providing
-  cylinder data for dive logs>>. 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.
+- In the table labeled _Available Gases_, 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 <<S_CylinderData,providing cylinder data for dive
+  logs>>. 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.
 
 - The dialogue indicating _Dive Planner Points_ is usually not used at this
   stage of the dive planning.
@@ -3102,7 +3101,7 @@ specified in the _Available Gases_ table.  Add new waypoints until the main
 features of the dive have been completed, e.g. the bottom time segment and
 deep stops (if these are implemented). Leave the remaining waypoints on the
 ascent to _Subsurface_. In most cases _Subsurface_ computes additional way
-points in order to fulfil decompression requirements for that dive. A
+points in order to fulfill decompression requirements for that dive. A
 waypoint can be moved by selecting that waypoint and by using the arrow
 keys.  The waypoints listed in the _Dive Planner Points_ dialogue can be
 edited by hand in order to obtain a precise presentation of the dive
@@ -3185,13 +3184,13 @@ The parameters of the pSCR diver can be set by selecting  _File ->   Preferences
 from the main menu, where the gas consumption calculation takes into account the pSCR dump
 ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
 accross the mouthpiece of the rebreather into account. If the
-pO~2~ drops below what is considered a save value, a warning apears in the _Dive plan
+pO~2~ drops below what is considered a save value, a warning appears in the _Dive plan
 details_. A typical pSCR configuration is with a single cylinder and one or more bail-out
 cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables
 are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints
 are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable
 to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen
-in the loop due to the oxygen drop accross the mouthpiece of the pSCR equipment.
+in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.
 
 image::images/Planner_pSCR1_f20.jpg["FIGURE: Planning a pSCR dive: setup", align="center"]
 
@@ -3239,8 +3238,8 @@ Plan Details_ for inclusion in a text file or word processing document.
 
 Dive plans have many characteristics in common with dive logs (dive profile,
 dive notes, etc).  After a dive plan has been saved, the dive details and
-gas calculations are saved in the *Notes* tab. While a dive plan is
-being designed, it can be printed using the _Print_ button in the dive
+gas calculations are saved in the *Notes* tab. While a dive plan is being
+designed, it can be printed using the _Print_ button in the dive
 planner. This prints the dive details and gas calculations in the _Dive Plan
 Details_ panel of the dive planner. However, after the plan has been saved,
 it is represented in a way very similar to a dive log and the gas
@@ -3315,8 +3314,7 @@ des sections de ce manuel traitant des opérations relatives.
   *liste des plongées*.
 - <<S_ViewPanels,_Profil_>> - Affiche uniquement le panneau du *profil de la
   plongée*.
-- <<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes de
-  plongée*.
+- <<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes*.
 - <<S_ViewPanels,_Globe_>> - Affiche uniquement le panneau de la *carte
   mondiale*.
 - _Statistiques annuelles_  - Affiche par année le résumé des statistiques des
@@ -3677,7 +3675,7 @@ _Subsurface_ as follows:
   files_".
 - On the list of file names select the .CSV file that has been created
   above. An import dialogue opens.
-- In the dropdown list on the middle right labeled '_Pre-configured imports_",
+- In the dropdown list on the top left labeled '_Pre-configured imports_",
   select _APD Log Viewer_.
 - Ensure the other settings for the ADP dive log are appropriate, then select
   _OK_.
@@ -3766,7 +3764,7 @@ Making a backup copy of the Suunto DM4/DM5 database:
 [NOTE]
 Atomic Logbook is a Windows software by Atomic Aquatics. It allows
 downloading of dive information from Cobalt and Cobalt 2 dive computers.
-The divelog is kept in a SQlite database at
+The divelog is kept in a SQLite database at
 C:\ProgramData\AtomicsAquatics\Cobalt-Logbook\Cobalt.db. This file can be
 directly imported to Subsurface.
 
@@ -3828,7 +3826,7 @@ following a few simple rules:
 
 1. Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy
 2. Duration: the format should be minutes:seconds.
-3. Unit system: only one unit system shold be used (i.e., no mixture between
+3. Unit system: only one unit system should be used (i.e., no mixture between
    imperial and metric units)
 4. Tags and buddies: values should be separated using a comma.
 5. GPS position: users must use decimal degrees, e.g. 30.22496 30.821798